Fix for incorrect handling of Whitespace after an array open in XmlFormatReader

1 files changed, 18 insertions, 0 deletions

diff --git a/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
index fb895040..6b368b7d 100644
--- a/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
@@ -12,6 +12,24 @@ namespace Google.ProtocolBuffers.Compatibility
         {

             StringWriter sw = new StringWriter();

             JsonFormatWriter.CreateInstance(sw)

+                .WriteMessage(message);

+            return sw.ToString();

+        }

+

+        protected override TBuilder DeserializeMessage<TMessage, TBuilder>(object message, TBuilder builder, ExtensionRegistry registry)

+        {

+            JsonFormatReader.CreateInstance((string)message).Merge(builder);

+            return builder;

+        }

+    }

+

+    [TestFixture]

+    public class JsonCompatibilityFormattedTests : CompatibilityTests

+    {

+        protected override object SerializeMessage<TMessage, TBuilder>(TMessage message)

+        {

+            StringWriter sw = new StringWriter();

+            JsonFormatWriter.CreateInstance(sw)

                 .Formatted()

                 .WriteMessage(message);

             return sw.ToString();