Merge pull request #324 from jskeet/csharp

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

1 files changed, 31 insertions, 54 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs b/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs
index 1dcb1c21..692bfd11 100644
--- a/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs
+++ b/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs
@@ -1,12 +1,10 @@
 using System;

 using System.Collections.Generic;

-using System.Text;

 using Google.ProtocolBuffers.TestProtos;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

+using Xunit;

 

 namespace Google.ProtocolBuffers

 {

-    [TestClass]

     public class GeneratedBuilderTest

     {

         class OneTimeEnumerator<T> : IEnumerable<T>

@@ -19,107 +17,86 @@ namespace Google.ProtocolBuffers
             }

             public IEnumerator<T> GetEnumerator()

             {

-                Assert.IsFalse(_enumerated, "The collection {0} has already been enumerated", GetType());

+                Assert.False(_enumerated);

                 _enumerated = true;

                 yield return _item;

             }

             System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-            { return GetEnumerator(); }

+            {

+                return GetEnumerator();

+            }

         }

 

-        [TestMethod]

+        [Fact]

         public void DoesNotEnumerateTwiceForMessageList()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

-            b.AddRangeRepeatedForeignMessage(

-                new OneTimeEnumerator<ForeignMessage>(

-                    ForeignMessage.DefaultInstance));

+            b.AddRangeRepeatedForeignMessage(new OneTimeEnumerator<ForeignMessage>(ForeignMessage.DefaultInstance));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotEnumerateTwiceForPrimitiveList()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

             b.AddRangeRepeatedInt32(new OneTimeEnumerator<int>(1));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotEnumerateTwiceForStringList()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

             b.AddRangeRepeatedString(new OneTimeEnumerator<string>("test"));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotEnumerateTwiceForEnumList()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

             b.AddRangeRepeatedForeignEnum(new OneTimeEnumerator<ForeignEnum>(ForeignEnum.FOREIGN_BAR));

         }

-

-        private delegate void TestMethod();

-

-        private static void AssertThrows<T>(TestMethod method) where T : Exception

-        {

-            try

-            {

-                method();

-            }

-            catch (Exception error)

-            {

-                if (error is T)

-                    return;

-                throw;

-            }

-            Assert.Fail("Expected exception of type " + typeof(T));

-        }

-

-        [TestMethod]

+        

+        [Fact]

         public void DoesNotAddNullToMessageListByAddRange()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

-            AssertThrows<ArgumentNullException>(

-                () => b.AddRangeRepeatedForeignMessage(new ForeignMessage[] { null })

-                    );

+            Assert.Throws<ArgumentNullException>(() => b.AddRangeRepeatedForeignMessage(new ForeignMessage[] { null }));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotAddNullToMessageListByAdd()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

-            AssertThrows<ArgumentNullException>(

-                () => b.AddRepeatedForeignMessage((ForeignMessage)null)

-                    );

+            Assert.Throws<ArgumentNullException>(() => b.AddRepeatedForeignMessage((ForeignMessage)null));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotAddNullToMessageListBySet()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

             b.AddRepeatedForeignMessage(ForeignMessage.DefaultInstance);

-            AssertThrows<ArgumentNullException>(

-                () => b.SetRepeatedForeignMessage(0, (ForeignMessage)null)

-                    );

+            Assert.Throws<ArgumentNullException>(() => b.SetRepeatedForeignMessage(0, (ForeignMessage)null));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotAddNullToStringListByAddRange()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

-            AssertThrows<ArgumentNullException>(

-                () => b.AddRangeRepeatedString(new String[] { null })

-                    );

+            Assert.Throws<ArgumentNullException>(() => b.AddRangeRepeatedString(new String[] { null }));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotAddNullToStringListByAdd()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

-            AssertThrows<ArgumentNullException>(

-                () => b.AddRepeatedString(null)

-                    );

+            Assert.Throws<ArgumentNullException>(() => b.AddRepeatedString(null));

         }

-        [TestMethod]

+

+        [Fact]

         public void DoesNotAddNullToStringListBySet()

         {

             TestAllTypes.Builder b = new TestAllTypes.Builder();

             b.AddRepeatedString("one");

-            AssertThrows<ArgumentNullException>(

-                () => b.SetRepeatedString(0, null)

-                    );

+            Assert.Throws<ArgumentNullException>(() => b.SetRepeatedString(0, null));

         }

     }

 }