Change to using xUnit for all unit tests, and fetch that via NuGet.

This includes fetching the VS unit test runner package, so that tests can be run from Visual Studio's Test Explorer.

7 files changed, 40 insertions, 59 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs
index 9707f8e8..30d257ad 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs
@@ -1,9 +1,7 @@
 using System;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestClass]

     public class BinaryCompatibilityTests : CompatibilityTests

     {

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

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

 using Google.ProtocolBuffers.TestProtos;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

+using Xunit;

 

 

 namespace Google.ProtocolBuffers.Compatibility

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

         protected virtual void AssertOutputEquals(object lhs, object rhs)

         {

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

         #region Test message builders

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

         #endregion

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

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

         }

 

-        [TestMethod]

+        [Fact]

         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.AreEqual(msg, copy);

+            Assert.Equal(msg, copy);

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

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

+            Assert.Equal(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 73037cce..f555b101 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs
@@ -1,13 +1,10 @@
 using System;

 using System.Collections.Generic;

-using System.IO;

-using System.Text;

 using Google.ProtocolBuffers.Serialization;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

+using Xunit;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestClass]

     public class DictionaryCompatibilityTests : CompatibilityTests

     {

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

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

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

 

-            Assert.AreEqual(

+            Assert.Equal(

                 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 74603108..3c943d33 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs
@@ -1,11 +1,8 @@
 using System.IO;

-using System.Text;

 using Google.ProtocolBuffers.Serialization;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestClass]

     public class JsonCompatibilityTests : CompatibilityTests

     {

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

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

     }

 

-    [TestClass]

     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 c3ce5883..4d1187a4 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs
@@ -1,8 +1,5 @@
-using System;

-using System.Collections.Generic;

-using System.IO;

-using System.Text;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

+using System.IO;

+using Xunit;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

@@ -15,11 +12,11 @@ namespace Google.ProtocolBuffers.Compatibility
                 Stream resource = typeof(TestResources).Assembly.GetManifestResourceStream(

                     typeof(TestResources).Namespace + ".google_message1.dat");

 

-                Assert.IsNotNull(resource, "Unable to the locate resource: google_message1");

+                Assert.NotNull(resource);

 

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

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

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

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

                 return bytes;

             }

         }

@@ -30,11 +27,10 @@ namespace Google.ProtocolBuffers.Compatibility
                 Stream resource = typeof(TestResources).Assembly.GetManifestResourceStream(

                     typeof(TestResources).Namespace + ".google_message2.dat");

 

-                Assert.IsNotNull(resource, "Unable to the locate resource: google_message2");

-

+                Assert.NotNull(resource);

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

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

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

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

                 return bytes;

             }

         }

diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
index c2eaadf6..2d74cf9f 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
@@ -1,10 +1,8 @@
-using System.ComponentModel;

 using System.IO;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

+using Xunit;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestClass]

     public class TextCompatibilityTests : CompatibilityTests

     {

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

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

         }

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

-        [TestMethod]

+        [Fact]

         public override void RoundTripMessage2OptimizeSize()

         {

             //base.RoundTripMessage2OptimizeSize();

         }

 

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

-        [TestMethod]

+        [Fact]

         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 70614744..313523eb 100644
--- a/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
+++ b/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs
@@ -1,12 +1,9 @@
 using System.IO;

 using System.Xml;

 using Google.ProtocolBuffers.Serialization;

-using Google.ProtocolBuffers.TestProtos;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 namespace Google.ProtocolBuffers.Compatibility

 {

-    [TestClass]

     public class XmlCompatibilityTests : CompatibilityTests

     {

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

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

     }

 

-    [TestClass]

     public class XmlCompatibilityFormattedTests : CompatibilityTests

     {

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