Test Framework - Don't serialize string Json element directly to sess…

…ion (#15007)
Azure · Sep 9, 2020 · e240204 · e240204
1 parent 6609ff9
commit e240204
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sdk/core/Azure.Core.TestFramework/src/RecordEntry.cs b/sdk/core/Azure.Core.TestFramework/src/RecordEntry.cs
@@ -188,8 +188,11 @@ private void SerializeBody(Utf8JsonWriter jsonWriter, string name, byte[] reques
 
                     // We use array as a wrapper for string based serialization
                     // so if the root is an array we can't write it directly
-                    // fallback to generic string writing
-                    if (document.RootElement.ValueKind != JsonValueKind.Array)
+                    // fallback to generic string writing. Also, if the root is a string
+                    // we don't want to write it directly, as this would make matching
+                    // not won't work in libraries that allow passing JSON as a string.
+                    if (document.RootElement.ValueKind != JsonValueKind.Array &&
+                        document.RootElement.ValueKind != JsonValueKind.String)
                     {
                         // Make sure we can replay JSON is exactly the same as the source
                         // for the case where service response was pre-formatted

diff --git a/sdk/core/Azure.Core/tests/RecordSessionTests.cs b/sdk/core/Azure.Core/tests/RecordSessionTests.cs
@@ -23,6 +23,7 @@ public class RecordSessionTests
         [TestCase("{\"json\" :\"value\"}", "application/json")]
         [TestCase("[\"json\", \"value\"]", "application/json")]
         [TestCase("[{\"json\":\"value\"}, {\"json\":\"value\"}]", "application/json")]
+        [TestCase("\"\"", "application/json")]
         [TestCase("invalid json", "application/json")]
         [TestCase("{ \"json\": \"value\" }", "unknown")]
         [TestCase("multi\rline", "application/xml")]