Merge pull request #324 from jskeet/csharp

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

1 files changed, 6 insertions, 10 deletions

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;

             }

         }