diff options
author | Jon Skeet <skeet@pobox.com> | 2015-04-30 14:51:42 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-04-30 14:51:42 +0100 |
commit | 0884b77975146be5d0557b254fbeab940cda641a (patch) | |
tree | eee4106598d0faf92b566f7e03930f25df38a56c /csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs | |
parent | 151018e888927f4e89e325af013613cc1b08196c (diff) | |
parent | c56475088d2d36d29a2640f35b9a8621796c051c (diff) | |
download | protobuf-0884b77975146be5d0557b254fbeab940cda641a.tar.gz protobuf-0884b77975146be5d0557b254fbeab940cda641a.tar.bz2 protobuf-0884b77975146be5d0557b254fbeab940cda641a.zip |
Merge pull request #324 from jskeet/csharp
Change to using xUnit for all unit tests, and fetch that via NuGet.
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs b/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs index 4c33dbbd..186d9399 100644 --- a/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs +++ b/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs @@ -36,52 +36,47 @@ using System;
using Google.ProtocolBuffers.TestProtos;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Xunit;
namespace Google.ProtocolBuffers
{
- [TestClass]
public class MessageUtilTest
{
- [TestMethod]
- [ExpectedException(typeof(ArgumentNullException))]
+ [Fact]
public void NullTypeName()
{
- MessageUtil.GetDefaultMessage((string) null);
+ Assert.Throws<ArgumentNullException>(() => MessageUtil.GetDefaultMessage((string) null));
}
- [TestMethod]
- [ExpectedException(typeof(ArgumentException))]
+ [Fact]
public void InvalidTypeName()
{
- MessageUtil.GetDefaultMessage("invalidtypename");
+ Assert.Throws<ArgumentException>(() => MessageUtil.GetDefaultMessage("invalidtypename"));
}
- [TestMethod]
+ [Fact]
public void ValidTypeName()
{
- Assert.AreSame(TestAllTypes.DefaultInstance,
+ Assert.Same(TestAllTypes.DefaultInstance,
MessageUtil.GetDefaultMessage(typeof(TestAllTypes).AssemblyQualifiedName));
}
- [TestMethod]
- [ExpectedException(typeof(ArgumentNullException))]
+ [Fact]
public void NullType()
{
- MessageUtil.GetDefaultMessage((Type) null);
+ Assert.Throws<ArgumentNullException>(() => MessageUtil.GetDefaultMessage((Type)null));
}
- [TestMethod]
- [ExpectedException(typeof(ArgumentException))]
+ [Fact]
public void NonMessageType()
{
- MessageUtil.GetDefaultMessage(typeof(string));
+ Assert.Throws<ArgumentException>(() => MessageUtil.GetDefaultMessage(typeof(string)));
}
- [TestMethod]
+ [Fact]
public void ValidType()
{
- Assert.AreSame(TestAllTypes.DefaultInstance, MessageUtil.GetDefaultMessage(typeof(TestAllTypes)));
+ Assert.Same(TestAllTypes.DefaultInstance, MessageUtil.GetDefaultMessage(typeof(TestAllTypes)));
}
}
}
\ No newline at end of file |