third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/util/field_comparator.cc ('k') | third_party/protobuf/src/google/protobuf/util/field_mask_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc

diff --git a/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc b/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc

index 6fd631d860c8fc63e0279ed817e1941f2597e162..249b8d54632ae4595b361aa032117da5634e4506 100644

--- a/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc

+++ b/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc

@@ -365,10 +365,10 @@ TEST_F(DefaultFieldComparatorTest,

// +inf should be equal even though they are not technically within margin or

// fraction.

- message_1_.set_optional_float(numeric_limits<float>::infinity());

- message_2_.set_optional_float(numeric_limits<float>::infinity());

- message_1_.set_optional_double(numeric_limits<double>::infinity());

- message_2_.set_optional_double(numeric_limits<double>::infinity());

+ message_1_.set_optional_float(std::numeric_limits<float>::infinity());

+ message_2_.set_optional_float(std::numeric_limits<float>::infinity());

+ message_1_.set_optional_double(std::numeric_limits<double>::infinity());

+ message_2_.set_optional_double(std::numeric_limits<double>::infinity());

comparator_.SetFractionAndMargin(field_float, 0.0, 0.0);

comparator_.SetFractionAndMargin(field_double, 0.0, 0.0);

EXPECT_EQ(FieldComparator::SAME,

@@ -380,10 +380,10 @@ TEST_F(DefaultFieldComparatorTest,

// -inf should be equal even though they are not technically within margin or

// fraction.

- message_1_.set_optional_float(-numeric_limits<float>::infinity());

- message_2_.set_optional_float(-numeric_limits<float>::infinity());

- message_1_.set_optional_double(-numeric_limits<double>::infinity());

- message_2_.set_optional_double(-numeric_limits<double>::infinity());

+ message_1_.set_optional_float(-std::numeric_limits<float>::infinity());

+ message_2_.set_optional_float(-std::numeric_limits<float>::infinity());

+ message_1_.set_optional_double(-std::numeric_limits<double>::infinity());

+ message_2_.set_optional_double(-std::numeric_limits<double>::infinity());

comparator_.SetFractionAndMargin(field_float, 0.0, 0.0);

comparator_.SetFractionAndMargin(field_double, 0.0, 0.0);

EXPECT_EQ(FieldComparator::SAME,