summaryrefslogtreecommitdiffstats
path: root/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-01-31 21:35:48 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2010-01-31 21:35:48 -0800
commit6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186 (patch)
tree976c28423d229e313e968fbf56d950411fc106df /src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
parentdaf0b05fba9cae039ee631bbe008f8225c065ffc (diff)
parent17e1e88e7f75c86a6d4494dd2cb59eb9a7e75280 (diff)
downloadDotNetOpenAuth-6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186.zip
DotNetOpenAuth-6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186.tar.gz
DotNetOpenAuth-6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186.tar.bz2
Merged master back into v3.4 for VS2010 support.
Merge branch 'master' into v3.4
Diffstat (limited to 'src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs')
-rw-r--r--src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs b/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
index d8f5674..c7df99a 100644
--- a/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
@@ -16,7 +16,7 @@ namespace DotNetOpenAuth.Test.OpenId {
using DotNetOpenAuth.OpenId.Provider;
using DotNetOpenAuth.OpenId.RelyingParty;
using DotNetOpenAuth.Test.Mocks;
- using Microsoft.VisualStudio.TestTools.UnitTesting;
+ using NUnit.Framework;
public class OpenIdTestBase : TestBase {
internal IDirectWebRequestHandler RequestHandler;
@@ -62,7 +62,7 @@ namespace DotNetOpenAuth.Test.OpenId {
protected ProviderSecuritySettings ProviderSecuritySettings { get; private set; }
- [TestInitialize]
+ [SetUp]
public override void SetUp() {
base.SetUp();
@@ -75,7 +75,7 @@ namespace DotNetOpenAuth.Test.OpenId {
Identifier.EqualityOnStrings = true;
}
- [TestCleanup]
+ [TearDown]
public override void Cleanup() {
base.Cleanup();