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.

1 files changed, 26 insertions, 26 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs b/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs
index b262667a..f1d2bfad 100644
--- a/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs
@@ -3,13 +3,13 @@ using System.IO;
 using System.Text;

 using Google.ProtocolBuffers.TestProtos;

 using Google.ProtocolBuffers.Serialization.Http;

-using Xunit;

+using NUnit.Framework;

 

 namespace Google.ProtocolBuffers

 {

     public class TestReaderForUrlEncoded

     {

-        [Fact]

+        [Test]

         public void Example_FromQueryString()

         {

             Uri sampleUri = new Uri("http://sample.com/Path/File.ext?text=two+three%20four&valid=true&numbers=1&numbers=2", UriKind.Absolute);

@@ -20,14 +20,14 @@ namespace Google.ProtocolBuffers
             builder.MergeFrom(input);

             

             TestXmlMessage message = builder.Build();

-            Assert.Equal(true, message.Valid);

-            Assert.Equal("two three four", message.Text);

-            Assert.Equal(2, message.NumbersCount);

-            Assert.Equal(1, message.NumbersList[0]);

-            Assert.Equal(2, message.NumbersList[1]);

+            Assert.AreEqual(true, message.Valid);

+            Assert.AreEqual("two three four", message.Text);

+            Assert.AreEqual(2, message.NumbersCount);

+            Assert.AreEqual(1, message.NumbersList[0]);

+            Assert.AreEqual(2, message.NumbersList[1]);

         }

 

-        [Fact]

+        [Test]

         public void Example_FromFormData()

         {

             Stream rawPost = new MemoryStream(Encoding.UTF8.GetBytes("text=two+three%20four&valid=true&numbers=1&numbers=2"), false);

@@ -38,42 +38,42 @@ namespace Google.ProtocolBuffers
             builder.MergeFrom(input);

 

             TestXmlMessage message = builder.Build();

-            Assert.Equal(true, message.Valid);

-            Assert.Equal("two three four", message.Text);

-            Assert.Equal(2, message.NumbersCount);

-            Assert.Equal(1, message.NumbersList[0]);

-            Assert.Equal(2, message.NumbersList[1]);

+            Assert.AreEqual(true, message.Valid);

+            Assert.AreEqual("two three four", message.Text);

+            Assert.AreEqual(2, message.NumbersCount);

+            Assert.AreEqual(1, message.NumbersList[0]);

+            Assert.AreEqual(2, message.NumbersList[1]);

         }

 

-        [Fact]

+        [Test]

         public void TestEmptyValues()

         {

             ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text=&numbers=1");

             TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

             builder.MergeFrom(input);

 

-            Assert.True(builder.Valid);

-            Assert.True(builder.HasText);

-            Assert.Equal("", builder.Text);

-            Assert.Equal(1, builder.NumbersCount);

-            Assert.Equal(1, builder.NumbersList[0]);

+            Assert.IsTrue(builder.Valid);

+            Assert.IsTrue(builder.HasText);

+            Assert.AreEqual("", builder.Text);

+            Assert.AreEqual(1, builder.NumbersCount);

+            Assert.AreEqual(1, builder.NumbersList[0]);

         }

 

-        [Fact]

+        [Test]

         public void TestNoValue()

         {

             ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text&numbers=1");

             TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

             builder.MergeFrom(input);

 

-            Assert.True(builder.Valid);

-            Assert.True(builder.HasText);

-            Assert.Equal("", builder.Text);

-            Assert.Equal(1, builder.NumbersCount);

-            Assert.Equal(1, builder.NumbersList[0]);

+            Assert.IsTrue(builder.Valid);

+            Assert.IsTrue(builder.HasText);

+            Assert.AreEqual("", builder.Text);

+            Assert.AreEqual(1, builder.NumbersCount);

+            Assert.AreEqual(1, builder.NumbersList[0]);

         }

 

-        [Fact]

+        [Test]

         public void FormUrlEncodedReaderDoesNotSupportChildren()

         {

             ICodedInputStream input = FormUrlEncodedReader.CreateInstance("child=uh0");