Merged master back into v3.4 for VS2010 support.

Merge branch 'master' into v3.4

1 files changed, 8 insertions, 8 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
index 9f849ea..ffbadc8 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
@@ -14,14 +14,14 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
 	using DotNetOpenAuth.OpenId.Messages;
 	using DotNetOpenAuth.OpenId.Provider;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using NUnit.Framework;
 
-	[TestClass]
+	[TestFixture]
 	public class ExtensionsInteropHelperOPTests : OpenIdTestBase {
 		private AuthenticationRequest request;
 		private IList<IExtensionMessage> extensions;
 
-		[TestInitialize]
+		[SetUp]
 		public override void SetUp() {
 			base.SetUp();
 
@@ -36,7 +36,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// <summary>
 		/// Verifies no extensions appear as no extensions
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void NoRequestedExtensions() {
 			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
 			Assert.IsNull(sreg);
@@ -52,7 +52,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// <summary>
 		/// Verifies sreg coming in is seen as sreg.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void UnifyExtensionsAsSregWithSreg() {
 			var sregInjected = new ClaimsRequest {
 				Nickname = DemandLevel.Request,
@@ -73,7 +73,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// <summary>
 		/// Verifies AX coming in looks like sreg.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void UnifyExtensionsAsSregWithAX() {
 			this.ParameterizedAXTest(AXAttributeFormats.AXSchemaOrg);
 		}
@@ -81,7 +81,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// <summary>
 		/// Verifies AX coming in looks like sreg.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void UnifyExtensionsAsSregWithAXSchemaOpenIdNet() {
 			this.ParameterizedAXTest(AXAttributeFormats.SchemaOpenIdNet);
 		}
@@ -89,7 +89,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// <summary>
 		/// Verifies sreg and AX in one request has a preserved sreg request.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void UnifyExtensionsAsSregWithBothSregAndAX() {
 			var sregInjected = new ClaimsRequest {
 				Nickname = DemandLevel.Request,