2 files changed, 46 insertions, 4 deletions
diff --git a/src/ProtocolBuffers.Test/CompatTests/CompatibilityTests.cs b/src/ProtocolBuffers.Test/CompatTests/CompatibilityTests.cs
index 49c56290..0306c41e 100644
--- a/src/ProtocolBuffers.Test/CompatTests/CompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/CompatTests/CompatibilityTests.cs
@@ -14,6 +14,11 @@ namespace Google.ProtocolBuffers.CompatTests
             where TMessage : IMessageLite<TMessage, TBuilder>
             where TBuilder : IBuilderLite<TMessage, TBuilder>;
 
+        protected virtual void AssertOutputEquals(object lhs, object rhs)
+        {
+            Assert.AreEqual(lhs, rhs);
+        }
+
         [Test]
         public virtual void RoundTripMessage1OptimizeSize()
         {
@@ -23,7 +28,7 @@ namespace Google.ProtocolBuffers.CompatTests
             SizeMessage1 copy = DeerializeMessage<SizeMessage1, SizeMessage1.Builder>(content, SizeMessage1.CreateBuilder(), ExtensionRegistry.Empty).Build();
 
             Assert.AreEqual(msg, copy);
-            Assert.AreEqual(content, SerializeMessage<SizeMessage1,SizeMessage1.Builder>(copy));
+            AssertOutputEquals(content, SerializeMessage<SizeMessage1, SizeMessage1.Builder>(copy));
             Assert.AreEqual(TestResources.google_message1, copy.ToByteArray());
         }
 
@@ -36,7 +41,7 @@ namespace Google.ProtocolBuffers.CompatTests
             SizeMessage2 copy = DeerializeMessage<SizeMessage2, SizeMessage2.Builder>(content, SizeMessage2.CreateBuilder(), ExtensionRegistry.Empty).Build();
 
             Assert.AreEqual(msg, copy);
-            Assert.AreEqual(content, SerializeMessage<SizeMessage2, SizeMessage2.Builder>(copy));
+            AssertOutputEquals(content, SerializeMessage<SizeMessage2, SizeMessage2.Builder>(copy));
             Assert.AreEqual(TestResources.google_message2, copy.ToByteArray());
         }
 
@@ -49,7 +54,7 @@ namespace Google.ProtocolBuffers.CompatTests
             SpeedMessage1 copy = DeerializeMessage<SpeedMessage1, SpeedMessage1.Builder>(content, SpeedMessage1.CreateBuilder(), ExtensionRegistry.Empty).Build();
 
             Assert.AreEqual(msg, copy);
-            Assert.AreEqual(content, SerializeMessage<SpeedMessage1, SpeedMessage1.Builder>(copy));
+            AssertOutputEquals(content, SerializeMessage<SpeedMessage1, SpeedMessage1.Builder>(copy));
             Assert.AreEqual(TestResources.google_message1, copy.ToByteArray());
         }
 
@@ -62,7 +67,7 @@ namespace Google.ProtocolBuffers.CompatTests
             SpeedMessage2 copy = DeerializeMessage<SpeedMessage2, SpeedMessage2.Builder>(content, SpeedMessage2.CreateBuilder(), ExtensionRegistry.Empty).Build();
 
             Assert.AreEqual(msg, copy);
-            Assert.AreEqual(content, SerializeMessage<SpeedMessage2, SpeedMessage2.Builder>(copy));
+            AssertOutputEquals(content, SerializeMessage<SpeedMessage2, SpeedMessage2.Builder>(copy));
             Assert.AreEqual(TestResources.google_message2, copy.ToByteArray());
         }
 
diff --git a/src/ProtocolBuffers.Test/CompatTests/DictionaryCompatibilityTests.cs b/src/ProtocolBuffers.Test/CompatTests/DictionaryCompatibilityTests.cs
new file mode 100644
index 00000000..8de82ea9
--- /dev/null
+++ b/src/ProtocolBuffers.Test/CompatTests/DictionaryCompatibilityTests.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Google.ProtocolBuffers.Serialization;
+using NUnit.Framework;
+
+namespace Google.ProtocolBuffers.CompatTests
+{
+    [TestFixture]
+    public class DictionaryCompatibilityTests : CompatibilityTests
+    {
+        protected override object SerializeMessage<TMessage, TBuilder>(TMessage message)
+        {
+            DictionaryWriter writer = new DictionaryWriter();
+            writer.WriteMessage(message);
+            return writer.ToDictionary();
+        }
+
+        protected override TBuilder DeerializeMessage<TMessage, TBuilder>(object message, TBuilder builder, ExtensionRegistry registry)
+        {
+            new DictionaryReader((IDictionary<string, object>)message).Merge(builder);
+            return builder;
+        }
+
+        protected override void AssertOutputEquals(object lhs, object rhs)
+        {
+            IDictionary<string, object> left = (IDictionary<string, object>)lhs;
+            IDictionary<string, object> right = (IDictionary<string, object>)rhs;
+
+            Assert.AreEqual(
+                String.Join(",", new List<string>(left.Keys).ToArray()),
+                String.Join(",", new List<string>(right.Keys).ToArray())
+            );
+        }
+    }
+}
+\ No newline at end of file