Merged master back into v3.4 for VS2010 support.

Merge branch 'master' into v3.4

1 files changed, 7 insertions, 7 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/RelyingPartySecuritySettingsTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/RelyingPartySecuritySettingsTests.cs
index 851939e..2f6d218 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/RelyingPartySecuritySettingsTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/RelyingPartySecuritySettingsTests.cs
@@ -10,20 +10,20 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.OpenId.RelyingParty;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using NUnit.Framework;
 
-	[TestClass]
+	[TestFixture]
 	public class RelyingPartySecuritySettingsTests : OpenIdTestBase {
 		private RelyingPartySecuritySettings settings;
 
-		[TestInitialize]
+		[SetUp]
 		public override void SetUp() {
 			base.SetUp();
 
 			this.settings = new RelyingPartySecuritySettings();
 		}
 
-		[TestMethod]
+		[TestCase]
 		public void Defaults() {
 			Assert.IsFalse(this.settings.RejectUnsolicitedAssertions);
 			Assert.IsFalse(this.settings.RequireSsl, "Default should be to not require SSL.");
@@ -33,7 +33,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 		/// Verifies that the <see cref="RelyingPartySecuritySettings.RequireSsl"/> property
 		/// getter/setter are implemented correctly.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void RequireSsl() {
 			this.settings.RequireSsl = true;
 			Assert.IsTrue(this.settings.RequireSsl);
@@ -45,7 +45,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 		/// Verifies that the <see cref="RelyingPartySecuritySettings.RequireDirectedIdentity"/>
 		/// property getter/setter are implemented correctly.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void RequireDirectedIdentity() {
 			this.settings.RequireDirectedIdentity = true;
 			Assert.IsTrue(this.settings.RequireDirectedIdentity);
@@ -57,7 +57,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 		/// Verifies that the <see cref="RelyingPartySecuritySettings.RequireAssociation"/>
 		/// property getter/setter are implemented correctly.
 		/// </summary>
-		[TestMethod]
+		[TestCase]
 		public void RequireAssociation() {
 			this.settings.RequireAssociation = true;
 			Assert.IsTrue(this.settings.RequireAssociation);