summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-01-06 19:58:33 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2010-01-06 19:58:33 -0800
commitf10938718643bf38470c33e9428e5fbf7240a530 (patch)
treec2e9f2663591a281e78b13bccd25d1d888dbff58 /src
parentb4f047fc7af40f40149a84b58d8f3ad1632a48d5 (diff)
downloadDotNetOpenAuth-f10938718643bf38470c33e9428e5fbf7240a530.zip
DotNetOpenAuth-f10938718643bf38470c33e9428e5fbf7240a530.tar.gz
DotNetOpenAuth-f10938718643bf38470c33e9428e5fbf7240a530.tar.bz2
Fixed ASP.NET hosting tests.
Diffstat (limited to 'src')
-rw-r--r--src/DotNetOpenAuth.Test/Hosting/HostingTests.cs4
-rw-r--r--src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs2
-rw-r--r--src/DotNetOpenAuth.Test/TestBase.cs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs b/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs
index 7a725a7..b7e04f7 100644
--- a/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs
+++ b/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs
@@ -14,7 +14,7 @@ namespace DotNetOpenAuth.Test.Hosting {
using DotNetOpenAuth.Test.OpenId;
using NUnit.Framework;
- [TestFixture]
+ [TestFixture, Category("HostASPNET")]
public class HostingTests : TestBase {
[TestCase]
public void AspHostBasicTest() {
@@ -25,7 +25,7 @@ namespace DotNetOpenAuth.Test.Hosting {
Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
using (StreamReader sr = new StreamReader(response.GetResponseStream())) {
string content = sr.ReadToEnd();
- StringAssert.Contains(content, "Test home page");
+ StringAssert.Contains("Test home page", content);
}
}
}
diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
index 10d4115..7507081 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
@@ -127,7 +127,7 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
coordinator.Run();
}
- [TestCase]
+ [TestCase, Category("HostASPNET")]
public void BadRequestsGenerateValidErrorResponsesHosted() {
try {
using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
diff --git a/src/DotNetOpenAuth.Test/TestBase.cs b/src/DotNetOpenAuth.Test/TestBase.cs
index df52d0a..510e13a 100644
--- a/src/DotNetOpenAuth.Test/TestBase.cs
+++ b/src/DotNetOpenAuth.Test/TestBase.cs
@@ -5,6 +5,7 @@
//-----------------------------------------------------------------------
namespace DotNetOpenAuth.Test {
+ using System;
using System.IO;
using System.Reflection;
using System.Web;
@@ -12,7 +13,6 @@ namespace DotNetOpenAuth.Test {
using DotNetOpenAuth.OAuth.Messages;
using log4net;
using NUnit.Framework;
- using NUnit.Framework;
/// <summary>
/// The base class that all test classes inherit from.
@@ -21,7 +21,7 @@ namespace DotNetOpenAuth.Test {
/// <summary>
/// The full path to the directory that contains the test ASP.NET site.
/// </summary>
- internal static readonly string TestWebDirectory = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), @"..\..\..\..\src\DotNetOpenAuth.TestWeb"));
+ internal static readonly string TestWebDirectory = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, @"..\..\src\DotNetOpenAuth.TestWeb"));
private MessageDescriptionCollection messageDescriptions = new MessageDescriptionCollection();