Convert back to using NUnit, which is now loaded via NuGet.

This includes the NUnit test adapter which allows NUnit tests to be run under VS without any extra plugins.
Unfortunate the compatibility tests using the abstract test fixture class show up as "external" tests, and aren't well presented - but they do run.

6 files changed, 46 insertions, 38 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs
index d918c926..a050827e 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs
@@ -1,13 +1,13 @@
 using System;

 using Google.ProtocolBuffers.TestProtos;

-using Xunit;

+using NUnit.Framework;

 

 

 namespace Google.ProtocolBuffers.Compatibility

 {

     /// <summary>

     /// This abstract base implements several tests to ensure that well-known messages can be written

-    /// and read to/from various formats without losing data.  Implementations overload the two serailization

+    /// and read to/from various formats without losing data.  Implementations override the two serialization

     /// methods to provide the tests with the means to read and write for a given format.

     /// </summary>

     public abstract class CompatibilityTests

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

         protected virtual void AssertOutputEquals(object lhs, object rhs)

         {

-            Assert.Equal<object>(lhs, rhs);

+            Assert.AreEqual(lhs, rhs);

         }

 

-        [Fact]

+        [Test]

         public virtual void RoundTripWithEmptyChildMessageSize()

         {

             SizeMessage1 msg = SizeMessage1.CreateBuilder()

@@ -37,12 +37,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             SizeMessage1 copy = DeserializeMessage<SizeMessage1, SizeMessage1.Builder>(content, SizeMessage1.CreateBuilder(), ExtensionRegistry.Empty).BuildPartial();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(contents), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public virtual void RoundTripWithEmptyChildMessageSpeed()

         {

             SpeedMessage1 msg = SpeedMessage1.CreateBuilder()

@@ -54,12 +54,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             SpeedMessage1 copy = DeserializeMessage<SpeedMessage1, SpeedMessage1.Builder>(content, SpeedMessage1.CreateBuilder(), ExtensionRegistry.Empty).BuildPartial();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(contents), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public virtual void RoundTripMessage1OptimizeSize()

         {

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

@@ -67,12 +67,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             SizeMessage1 copy = DeserializeMessage<SizeMessage1, SizeMessage1.Builder>(content, SizeMessage1.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public virtual void RoundTripMessage2OptimizeSize()

         {

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

@@ -80,12 +80,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             SizeMessage2 copy = DeserializeMessage<SizeMessage2, SizeMessage2.Builder>(content, SizeMessage2.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public virtual void RoundTripMessage1OptimizeSpeed()

         {

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

@@ -93,12 +93,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             SpeedMessage1 copy = DeserializeMessage<SpeedMessage1, SpeedMessage1.Builder>(content, SpeedMessage1.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public virtual void RoundTripMessage2OptimizeSpeed()

         {

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

@@ -106,9 +106,9 @@ namespace Google.ProtocolBuffers.Compatibility
 

             SpeedMessage2 copy = DeserializeMessage<SpeedMessage2, SpeedMessage2.Builder>(content, SpeedMessage2.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

         #region Test message builders

@@ -185,7 +185,7 @@ namespace Google.ProtocolBuffers.Compatibility
 

         #endregion

 

-        [Fact]

+        [Test]

         public void TestRoundTripAllTypes()

         {

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

@@ -193,12 +193,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             TestAllTypes copy = DeserializeMessage<TestAllTypes, TestAllTypes.Builder>(content, TestAllTypes.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public void TestRoundTripRepeatedTypes()

         {

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

@@ -206,12 +206,12 @@ namespace Google.ProtocolBuffers.Compatibility
 

             TestAllTypes copy = DeserializeMessage<TestAllTypes, TestAllTypes.Builder>(content, TestAllTypes.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray()));

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

         }

 

-        [Fact]

+        [Test]

         public void TestRoundTripPackedTypes()

         {

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

@@ -219,9 +219,9 @@ namespace Google.ProtocolBuffers.Compatibility
 

             TestPackedTypes copy = DeserializeMessage<TestPackedTypes, TestPackedTypes.Builder>(content, TestPackedTypes.CreateBuilder(), ExtensionRegistry.Empty).Build();

 

-            Assert.Equal(msg, copy);

+            Assert.AreEqual(msg, copy);

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

-            Assert.Equal(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray()));

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

         }

     }

 }

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
index f555b101..299bb1a6 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
@@ -1,10 +1,11 @@
 using System;

 using System.Collections.Generic;

 using Google.ProtocolBuffers.Serialization;

-using Xunit;

+using NUnit.Framework;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

+    [TestFixture]

     public class DictionaryCompatibilityTests : CompatibilityTests

     {

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

@@ -25,7 +26,7 @@ namespace Google.ProtocolBuffers.Compatibility
             IDictionary<string, object> left = (IDictionary<string, object>)lhs;

             IDictionary<string, object> right = (IDictionary<string, object>)rhs;

 

-            Assert.Equal(

+            Assert.AreEqual(

                 String.Join(",", new List<string>(left.Keys).ToArray()),

                 String.Join(",", new List<string>(right.Keys).ToArray())

             );

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
index 3c943d33..a1e0ed33 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
@@ -1,8 +1,10 @@
 using System.IO;

 using Google.ProtocolBuffers.Serialization;

+using NUnit.Framework;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

+    [TestFixture]

     public class JsonCompatibilityTests : CompatibilityTests

     {

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

@@ -20,6 +22,7 @@ namespace Google.ProtocolBuffers.Compatibility
         }

     }

 

+    [TestFixture]

     public class JsonCompatibilityFormattedTests : CompatibilityTests

     {

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

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
index 4d1187a4..2282d61f 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
@@ -1,5 +1,5 @@
 using System.IO;

-using Xunit;

+using NUnit.Framework;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

@@ -16,7 +16,7 @@ namespace Google.ProtocolBuffers.Compatibility
 

                 byte[] bytes = new byte[resource.Length];

                 int amtRead = resource.Read(bytes, 0, bytes.Length);

-                Assert.Equal(bytes.Length, amtRead);

+                Assert.AreEqual(bytes.Length, amtRead);

                 return bytes;

             }

         }

@@ -30,7 +30,7 @@ namespace Google.ProtocolBuffers.Compatibility
                 Assert.NotNull(resource);

                 byte[] bytes = new byte[resource.Length];

                 int amtRead = resource.Read(bytes, 0, bytes.Length);

-                Assert.Equal(bytes.Length, amtRead);

+                Assert.AreEqual(bytes.Length, amtRead);

                 return bytes;

             }

         }

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
index 2d74cf9f..89d6e260 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
@@ -1,8 +1,9 @@
 using System.IO;

-using Xunit;

+using NUnit.Framework;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

+    [TestFixture]

     public class TextCompatibilityTests : CompatibilityTests

     {

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

@@ -18,14 +19,14 @@ namespace Google.ProtocolBuffers.Compatibility
             return builder;

         }

         //This test can take a very long time to run.

-        [Fact]

+        [Test]

         public override void RoundTripMessage2OptimizeSize()

         {

             //base.RoundTripMessage2OptimizeSize();

         }

 

         //This test can take a very long time to run.

-        [Fact]

+        [Test]

         public override void RoundTripMessage2OptimizeSpeed()

         {

             //base.RoundTripMessage2OptimizeSpeed();

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
index 313523eb..91d40d83 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
@@ -1,9 +1,11 @@
 using System.IO;

 using System.Xml;

 using Google.ProtocolBuffers.Serialization;

+using NUnit.Framework;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

+    [TestFixture]

     public class XmlCompatibilityTests : CompatibilityTests

     {

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

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

     }

 

+    [TestFixture]

     public class XmlCompatibilityFormattedTests : CompatibilityTests

     {

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