diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-02-27 18:01:07 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2017-02-27 18:01:07 -0800 |
| commit | ffde972ac705e70f597267537b033d7c00ea54c5 (patch) | |
| tree | 1bb2daf5f5771970b8b6a4d4f29b44ce7d4ddc06 /src/google/protobuf/util/json_util_test.cc | |
| parent | b4b0e304be5a68de3d0ee1af9b286f958750f5e4 (diff) | |
Remove the use of C++11 features.
Diffstat (limited to 'src/google/protobuf/util/json_util_test.cc')
| -rw-r--r-- | src/google/protobuf/util/json_util_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/google/protobuf/util/json_util_test.cc b/src/google/protobuf/util/json_util_test.cc index 796718d5..b0c2f494 100644 --- a/src/google/protobuf/util/json_util_test.cc +++ b/src/google/protobuf/util/json_util_test.cc @@ -162,9 +162,9 @@ TEST_F(JsonUtilTest, TestDefaultValues) { TEST_F(JsonUtilTest, TestAlwaysPrintEnumsAsInts) { TestMessage orig; - orig.set_enum_value(proto3::EnumType::BAR); - orig.add_repeated_enum_value(proto3::EnumType::FOO); - orig.add_repeated_enum_value(proto3::EnumType::BAR); + orig.set_enum_value(proto3::BAR); + orig.add_repeated_enum_value(proto3::FOO); + orig.add_repeated_enum_value(proto3::BAR); JsonPrintOptions print_options; print_options.always_print_enums_as_ints = true; @@ -177,10 +177,10 @@ TEST_F(JsonUtilTest, TestAlwaysPrintEnumsAsInts) { JsonParseOptions parse_options; ASSERT_TRUE(FromJson(expected_json, &parsed, parse_options)); - EXPECT_EQ(proto3::EnumType::BAR, parsed.enum_value()); + EXPECT_EQ(proto3::BAR, parsed.enum_value()); EXPECT_EQ(2, parsed.repeated_enum_value_size()); - EXPECT_EQ(proto3::EnumType::FOO, parsed.repeated_enum_value(0)); - EXPECT_EQ(proto3::EnumType::BAR, parsed.repeated_enum_value(1)); + EXPECT_EQ(proto3::FOO, parsed.repeated_enum_value(0)); + EXPECT_EQ(proto3::BAR, parsed.repeated_enum_value(1)); } TEST_F(JsonUtilTest, ParseMessage) { |