grpc_json_transcoder: Switch tests to compare JSON objects

test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc

@@ -163,8 +163,15 @@ class GrpcJsonTranscoderIntegrationTest
           return Http::HeaderMap::Iterate::Continue;
         });
     if (!expected_response_body.empty()) {
-      if (full_response) {
-        EXPECT_EQ(expected_response_body, response->body());
+      const bool isJsonResponse = response->headers().getContentTypeValue() == "application/json";
+      if (full_response && isJsonResponse) {
+        const bool isStreamingResponse = response->body()[0] == '[';
+        EXPECT_TRUE(TestUtility::jsonStringEqual(response->body(), expected_response_body,
+                                                 isStreamingResponse))
+            << "Response mismatch. \nGot : " << response->body()
+            << "\nWant: " << expected_response_body;
+      } else if (full_response) {
+        EXPECT_EQ(response->body(), expected_response_body);
       } else {
         EXPECT_TRUE(absl::StartsWith(response->body(), expected_response_body));
       }
@@ -1191,7 +1198,7 @@ TEST_P(GrpcJsonTranscoderIntegrationTest, ServerStreamingGetExceedsBufferLimit)
       Status(),
       Http::TestResponseHeaderMapImpl{{":status", "200"}, {"content-type", "application/json"}},
       // Incomplete response, not valid JSON.
-      R"([{"id":"1","author":"Neal Stephenson","title":"Readme"})", true, false, "", true,
+      R"([{"id":"1","author":"Neal Stephenson","title":"Readme"})", false, false, "", true,
       /*expect_response_complete=*/false);
 }
 

test/test_common/utility.h

@@ -362,10 +362,16 @@ class TestUtility {
    *
    * @param lhs JSON string on LHS.
    * @param rhs JSON string on RHS.
+   * @param support_root_array Whether to support parsing JSON arrays.
    * @return bool indicating whether the JSON strings are equal.
    */
-  static bool jsonStringEqual(const std::string& lhs, const std::string& rhs) {
-    return protoEqual(jsonToStruct(lhs), jsonToStruct(rhs));
+  static bool jsonStringEqual(const std::string& lhs, const std::string& rhs,
+                              bool support_root_array = false) {
+    if (!support_root_array) {
+      return protoEqual(jsonToStruct(lhs), jsonToStruct(rhs));
+    }
+
+    return protoEqual(jsonArrayToStruct(lhs), jsonArrayToStruct(rhs));
   }
 
   /**
@@ -640,6 +646,15 @@ class TestUtility {
     return message;
   }
 
+  static ProtobufWkt::Struct jsonArrayToStruct(const std::string& json) {
+    // Hacky: add a surrounding root message, allowing JSON to be parsed into a struct.
+    std::string root_message = absl::StrCat("{ \"testOnlyArrayRoot\": ", json, "}");
+
+    ProtobufWkt::Struct message;
+    MessageUtil::loadFromJson(root_message, message);
+    return message;
+  }
+
   /**
    * Extract the Protobuf binary format of a google.protobuf.Message as a string.
    * @param message message of type type.googleapis.com/google.protobuf.Message.

test/test_common/utility_test.cc

@@ -149,4 +149,16 @@ TEST(BuffersEqual, NonAligned) {
   EXPECT_TRUE(TestUtility::buffersEqual(buffer1, buffer2));
 }
 
+TEST(JsonEquals, RootMessage) {
+  EXPECT_TRUE(TestUtility::jsonStringEqual(R"({ "a" : "b" })", R"({ "a" : "b" })"));
+  EXPECT_TRUE(TestUtility::jsonStringEqual(R"({ "a" : "b" })", R"({"a":"b"})"));
+}
+
+TEST(JsonEquals, RootArray) {
+  EXPECT_TRUE(TestUtility::jsonStringEqual(R"([{ "a" : "b" }, { "c" : "d" }])",
+                                           R"([{ "a" : "b" }, { "c" : "d" }])", true));
+  EXPECT_TRUE(TestUtility::jsonStringEqual(R"([{ "a" : "b" }, { "c" : "d" }])",
+                                           R"([{"a":"b"},{"c":"d"}])", true));
+}
+
 } // namespace Envoy