Use FastWriter for TlvJson

TlvJson now outputs a more RPC-friendly string, instead of a human-readable string.
project-chip · May 14, 2022 · ad6a1c4 · ad6a1c4
1 parent 9f755f9
commit ad6a1c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/lib/support/jsontlv/TlvJson.cpp b/src/lib/support/jsontlv/TlvJson.cpp
@@ -106,7 +106,8 @@ void InsertKeyValue(Json::Value & json, const KeyContext & keyContext, T val)
 
 std::string JsonToString(Json::Value & json)
 {
-    Json::StyledWriter writer;
+    Json::FastWriter writer;
+    writer.omitEndingLineFeed();
     return writer.write(json);
 }
 

diff --git a/src/lib/support/tests/TestTlvToJson.cpp b/src/lib/support/tests/TestTlvToJson.cpp
@@ -54,10 +54,16 @@ CHIP_ERROR SetupReader()
 
 bool Matches(const char * referenceString, Json::Value & generatedValue)
 {
-    Json::StyledWriter writer;
     auto generatedStr = JsonToString(generatedValue);
 
-    auto matches = (generatedStr == std::string(referenceString));
+    Json::Reader reader;
+    Json::StyledWriter writer;
+    Json::Value reparsedGeneratedValue;
+
+    reader.parse(generatedStr, reparsedGeneratedValue);
+    auto normalizedGeneratedStr = writer.write(reparsedGeneratedValue);
+
+    auto matches = (normalizedGeneratedStr == std::string(referenceString));
 
     if (!matches)
     {
@@ -66,7 +72,7 @@ bool Matches(const char * referenceString, Json::Value & generatedValue)
         printf("%s\n", referenceString);
 
         printf("Generated:\n");
-        printf("%s\n", generatedStr.c_str());
+        printf("%s\n", normalizedGeneratedStr.c_str());
     }
 
     return matches;