libjsonpb: fix tests for new protobuf version

Bug: 117607748
Test: atest --host libjsonpbverify_test
Change-Id: I5ce89c330d769fac10d8092734a37c26694587a2
Merged-In: I5ce89c330d769fac10d8092734a37c26694587a2

1 files changed, 12 insertions, 12 deletions

diff --git a/libjsonpb/verify/test.cpp b/libjsonpb/verify/test.cpp
index 2ffc923a..31a734ad 100644
--- a/libjsonpb/verify/test.cpp
+++ b/libjsonpb/verify/test.cpp
@@ -122,9 +122,9 @@ TEST_F(JsonKeyTest, NoJsonNameOk) {
   EXPECT_TRUE(AllFieldsAreKnown(*object, json, &error)) << error;
 }
 
-// JSON field name is lowerCamelCase of Proto field name;
-// AllFieldsAreKnown should return false. Although the lowerCamelCase name is a
-// valid key accepted by Protobuf's JSON parser, we explicitly disallow the
+// JSON field name is lower/UpperCamelCase of Proto field name;
+// AllFieldsAreKnown should return false. Although the lower/UpperCamelCase name
+// is a valid key accepted by Protobuf's JSON parser, we explicitly disallow the
 // behavior.
 TEST_F(JsonKeyTest, NoJsonNameFooBar) {
   EXPECT_EQ("fooBar", GetFieldJsonName<NoJsonName>("foo_bar"));
@@ -137,13 +137,13 @@ TEST_F(JsonKeyTest, NoJsonNameBarBaz) {
 }
 
 TEST_F(JsonKeyTest, NoJsonNameBazQux) {
-  EXPECT_EQ("bazQux", GetFieldJsonName<NoJsonName>("BazQux"));
-  TestParseOkWithUnknownKey<NoJsonName>("BazQux", "bazQux");
+  EXPECT_EQ("BazQux", GetFieldJsonName<NoJsonName>("BazQux"));
+  // No test for BazQux because its JSON name is the same as field_name
 }
 
 TEST_F(JsonKeyTest, NoJsonNameQuxQuux) {
-  EXPECT_EQ("qUXQUUX", GetFieldJsonName<NoJsonName>("QUX_QUUX"));
-  TestParseOkWithUnknownKey<NoJsonName>("QUX_QUUX", "qUXQUUX");
+  EXPECT_EQ("QUXQUUX", GetFieldJsonName<NoJsonName>("QUX_QUUX"));
+  TestParseOkWithUnknownKey<NoJsonName>("QUX_QUUX", "QUXQUUX");
 }
 
 class EmbeddedJsonKeyTest : public LibJsonpbVerifyTest {
@@ -198,16 +198,16 @@ TEST_F(EmbeddedJsonKeyTest, BarBaz) {
   EXPECT_EQ("test", object->repeated_with_json_name().begin()->barbaz());
 }
 
-TEST_F(EmbeddedJsonKeyTest, BazQux) {
-  auto object =
-      TestEmbeddedError("{\"no_json_name\": {\"bazQux\": \"test\"}}", "bazQux");
+TEST_F(EmbeddedJsonKeyTest, NoJsonName) {
+  auto object = TestEmbeddedError(
+      "{\"no_json_name\": {\"QUXQUUX\": \"test\"}}", "QUXQUUX");
   ASSERT_TRUE(object.ok()) << object.error();
-  EXPECT_EQ("test", object->no_json_name().bazqux());
+  EXPECT_EQ("test", object->no_json_name().qux_quux());
 }
 
 TEST_F(EmbeddedJsonKeyTest, QuxQuux) {
   auto object = TestEmbeddedError(
-      "{\"repeated_no_json_name\": [{\"qUXQUUX\": \"test\"}]}", "qUXQUUX");
+      "{\"repeated_no_json_name\": [{\"QUXQUUX\": \"test\"}]}", "QUXQUUX");
   ASSERT_TRUE(object.ok()) << object.error();
   ASSERT_EQ(1u, object->repeated_no_json_name().size());
   EXPECT_EQ("test", object->repeated_no_json_name().begin()->qux_quux());