- Upgraded NUnit

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/ProtocolBuffersLite.Test/TestLiteByApi.cs b/src/ProtocolBuffersLite.Test/TestLiteByApi.cs
index 5fee2ecb..ce373028 100644
--- a/src/ProtocolBuffersLite.Test/TestLiteByApi.cs
+++ b/src/ProtocolBuffersLite.Test/TestLiteByApi.cs
@@ -35,14 +35,14 @@
 #endregion

 

 using Google.ProtocolBuffers.TestProtos;

-using NUnit.Framework;

+using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 namespace Google.ProtocolBuffers

 {

-    [TestFixture]

+    [TestClass]

     public class TestLiteByApi

     {

-        [Test]

+        [TestMethod]

         public void TestAllTypesEquality()

         {

             TestAllTypesLite msg = TestAllTypesLite.DefaultInstance;

@@ -57,7 +57,7 @@ namespace Google.ProtocolBuffers
             Assert.IsTrue(msg.Equals(copy));

         }

 

-        [Test]

+        [TestMethod]

         public void TestEqualityOnExtensions()

         {

             TestAllExtensionsLite msg = TestAllExtensionsLite.DefaultInstance;

@@ -72,13 +72,13 @@ namespace Google.ProtocolBuffers
             Assert.IsTrue(msg.Equals(copy));

         }

 

-        [Test]

+        [TestMethod]

         public void TestAllTypesToString()

         {

             TestAllTypesLite msg = TestAllTypesLite.DefaultInstance;

             TestAllTypesLite copy = msg.ToBuilder().Build();

             Assert.AreEqual(msg.ToString(), copy.ToString());

-            Assert.IsEmpty(msg.ToString());

+            Assert.AreEqual(0, msg.ToString().Length);

             msg = msg.ToBuilder().SetOptionalInt32(-1).Build();

             Assert.AreEqual("optional_int32: -1", msg.ToString().TrimEnd());

             msg = msg.ToBuilder().SetOptionalString("abc123").Build();

@@ -86,16 +86,16 @@ namespace Google.ProtocolBuffers
                             msg.ToString().Replace("\r", "").TrimEnd());

         }

 

-        [Test]

+        [TestMethod]

         public void TestAllTypesDefaultedRoundTrip()

         {

             TestAllTypesLite msg = TestAllTypesLite.DefaultInstance;

             Assert.IsTrue(msg.IsInitialized);

             TestAllTypesLite copy = TestAllTypesLite.CreateBuilder().MergeFrom(msg.ToByteArray()).Build();

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

+            TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray());

         }

 

-        [Test]

+        [TestMethod]

         public void TestAllTypesModifiedRoundTrip()

         {

             TestAllTypesLite msg = TestAllTypesLite.DefaultInstance;

@@ -115,7 +115,7 @@ namespace Google.ProtocolBuffers
                 .AddRepeatedGroup(TestAllTypesLite.Types.RepeatedGroup.CreateBuilder().SetA('A').Build())

                 ;

             TestAllTypesLite copy = TestAllTypesLite.CreateBuilder().MergeFrom(msg.ToByteArray()).Build();

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

+            TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray());

         }

     }

 }
\ No newline at end of file