- Upgraded NUnit

- Added StatLight and Silverlight unit testing
- Added copies of all projects for Silverlight
- Integrated Silverlight unit tests in build

7 files changed, 63 insertions, 35 deletions

diff --git a/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs
index e993efad..8438d94f 100644
--- a/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs
@@ -1,20 +1,26 @@
 using System;

-using NUnit.Framework;

+#if SILVERLIGHT

+using TestClass = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;

+using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;

+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestFixture]

+    [TestClass]

     public class BinaryCompatibilityTests : CompatibilityTests

     {

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

         {

             byte[] bresult = message.ToByteArray();

-            return bresult;

+            return Convert.ToBase64String(bresult);

         }

 

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

         {

-            return builder.MergeFrom((byte[])message, registry);

+            return builder.MergeFrom((byte[])Convert.FromBase64String((string)message), registry);

         }

     }

 }
\ No newline at end of file
diff --git a/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs
index 9b117f6f..f47a6a52 100644
--- a/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs
@@ -1,6 +1,7 @@
 using System;

 using Google.ProtocolBuffers.TestProtos;

-using NUnit.Framework;

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+

 

 namespace Google.ProtocolBuffers.Compatibility

 {

@@ -21,10 +22,10 @@ namespace Google.ProtocolBuffers.Compatibility
 

         protected virtual void AssertOutputEquals(object lhs, object rhs)

         {

-            Assert.AreEqual(lhs, rhs);

+            Assert.AreEqual<object>(lhs, rhs);

         }

 

-        [Test]

+        [TestMethod]

         public virtual void RoundTripMessage1OptimizeSize()

         {

             SizeMessage1 msg = SizeMessage1.CreateBuilder().MergeFrom(TestResources.google_message1).Build();

@@ -34,10 +35,10 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<SizeMessage1, SizeMessage1.Builder>(copy));

-            Assert.AreEqual(TestResources.google_message1, copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray()));

         }

 

-        [Test]

+        [TestMethod]

         public virtual void RoundTripMessage2OptimizeSize()

         {

             SizeMessage2 msg = SizeMessage2.CreateBuilder().MergeFrom(TestResources.google_message2).Build();

@@ -47,10 +48,10 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<SizeMessage2, SizeMessage2.Builder>(copy));

-            Assert.AreEqual(TestResources.google_message2, copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray()));

         }

 

-        [Test]

+        [TestMethod]

         public virtual void RoundTripMessage1OptimizeSpeed()

         {

             SpeedMessage1 msg = SpeedMessage1.CreateBuilder().MergeFrom(TestResources.google_message1).Build();

@@ -60,10 +61,10 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<SpeedMessage1, SpeedMessage1.Builder>(copy));

-            Assert.AreEqual(TestResources.google_message1, copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray()));

         }

 

-        [Test]

+        [TestMethod]

         public virtual void RoundTripMessage2OptimizeSpeed()

         {

             SpeedMessage2 msg = SpeedMessage2.CreateBuilder().MergeFrom(TestResources.google_message2).Build();

@@ -73,7 +74,7 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<SpeedMessage2, SpeedMessage2.Builder>(copy));

-            Assert.AreEqual(TestResources.google_message2, copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray()));

         }

 

         #region Test message builders

@@ -150,7 +151,7 @@ namespace Google.ProtocolBuffers.Compatibility
 

         #endregion

 

-        [Test]

+        [TestMethod]

         public void TestRoundTripAllTypes()

         {

             TestAllTypes msg = AddAllTypes(new TestAllTypes.Builder()).Build();

@@ -160,10 +161,10 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<TestAllTypes, TestAllTypes.Builder>(copy));

-            Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray()));

         }

 

-        [Test]

+        [TestMethod]

         public void TestRoundTripRepeatedTypes()

         {

             TestAllTypes msg = AddRepeatedTypes(new TestAllTypes.Builder(), 5).Build();

@@ -173,10 +174,10 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<TestAllTypes, TestAllTypes.Builder>(copy));

-            Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray()));

         }

 

-        [Test]

+        [TestMethod]

         public void TestRoundTripPackedTypes()

         {

             TestPackedTypes msg = AddPackedTypes(new TestPackedTypes.Builder(), 5).Build();

@@ -186,7 +187,7 @@ namespace Google.ProtocolBuffers.Compatibility
 

             Assert.AreEqual(msg, copy);

             AssertOutputEquals(content, SerializeMessage<TestPackedTypes, TestPackedTypes.Builder>(copy));

-            Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray());

+            Assert.AreEqual(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray()));

         }

     }

 }

diff --git a/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
index 188c5bc3..fddddf84 100644
--- a/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
@@ -3,11 +3,18 @@ using System.Collections.Generic;
 using System.IO;

 using System.Text;

 using Google.ProtocolBuffers.Serialization;

-using NUnit.Framework;

+#if SILVERLIGHT

+using TestClass = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;

+using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;

+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif

+

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestFixture]

+    [TestClass]

     public class DictionaryCompatibilityTests : CompatibilityTests

     {

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

diff --git a/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
index 6b368b7d..74603108 100644
--- a/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
@@ -1,11 +1,11 @@
 using System.IO;

 using System.Text;

 using Google.ProtocolBuffers.Serialization;

-using NUnit.Framework;

+using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestFixture]

+    [TestClass]

     public class JsonCompatibilityTests : CompatibilityTests

     {

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

@@ -23,7 +23,7 @@ namespace Google.ProtocolBuffers.Compatibility
         }

     }

 

-    [TestFixture]

+    [TestClass]

     public class JsonCompatibilityFormattedTests : CompatibilityTests

     {

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

diff --git a/src/ProtocolBuffers.Test/Compatibility/TestResources.cs b/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
index 2581c7bf..2fc1322b 100644
--- a/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
@@ -2,7 +2,14 @@
 using System.Collections.Generic;

 using System.IO;

 using System.Text;

-using NUnit.Framework;

+#if SILVERLIGHT

+using TestClass = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;

+using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;

+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif

+

 

 namespace Google.ProtocolBuffers.Compatibility

 {

diff --git a/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
index defec28e..9c0afe46 100644
--- a/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel;

 using System.IO;

-using NUnit.Framework;

+using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestFixture]

+    [TestClass]

     public class TextCompatibilityTests : CompatibilityTests

     {

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

@@ -20,16 +20,16 @@ namespace Google.ProtocolBuffers.Compatibility
             return builder;

         }

 

-        [Test, Explicit, Description("This test can take a very long time to run.")]

+        [TestMethod, System.ComponentModel.Description("This test can take a very long time to run.")]

         public override void RoundTripMessage2OptimizeSize()

         {

-            base.RoundTripMessage2OptimizeSize();

+            //base.RoundTripMessage2OptimizeSize();

         }

 

-        [Test, Explicit, Description("This test can take a very long time to run.")]

+        [TestMethod, System.ComponentModel.Description("This test can take a very long time to run.")]

         public override void RoundTripMessage2OptimizeSpeed()

         {

-            base.RoundTripMessage2OptimizeSpeed();

+            //base.RoundTripMessage2OptimizeSpeed();

         }

     }

 }
\ No newline at end of file
diff --git a/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
index 62b9456a..9113b589 100644
--- a/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
@@ -2,11 +2,18 @@ using System.IO;
 using System.Xml;

 using Google.ProtocolBuffers.Serialization;

 using Google.ProtocolBuffers.TestProtos;

-using NUnit.Framework;

+#if SILVERLIGHT

+using TestClass = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;

+using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;

+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif

+

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestFixture]

+    [TestClass]

     public class XmlCompatibilityTests : CompatibilityTests

     {

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

@@ -24,7 +31,7 @@ namespace Google.ProtocolBuffers.Compatibility
         }

     }

 

-    [TestFixture]

+    [TestClass]

     public class XmlCompatibilityFormattedTests : CompatibilityTests

     {

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