All 249 enabled tests pass.

1 files changed, 15 insertions, 11 deletions

diff --git a/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs b/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
index a9c6ad4..1473bf0 100644
--- a/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
@@ -14,14 +14,25 @@
 
 	internal class MockHttpRequest {
 		private readonly Dictionary<Uri, DirectWebResponse> registeredMockResponses = new Dictionary<Uri, DirectWebResponse>();
-		private readonly TestWebRequestHandler mockHandler;
 
-		internal MockHttpRequest(TestWebRequestHandler mockHandler) {
+		internal static MockHttpRequest CreateUntrustedMockHttpHandler() {
+			TestWebRequestHandler testHandler = new TestWebRequestHandler();
+			UntrustedWebRequestHandler untrustedHandler = new UntrustedWebRequestHandler(testHandler);
+			if (!untrustedHandler.WhitelistHosts.Contains("localhost")) {
+				untrustedHandler.WhitelistHosts.Add("localhost");
+			}
+			MockHttpRequest mock = new MockHttpRequest(untrustedHandler);
+			testHandler.Callback = mock.GetMockResponse;
+			return mock;
+		}
+
+		private MockHttpRequest(IDirectSslWebRequestHandler mockHandler) {
 			ErrorUtilities.VerifyArgumentNotNull(mockHandler, "mockHandler");
-			this.mockHandler = mockHandler;
-			this.mockHandler.Callback = this.GetMockResponse;
+			this.MockWebRequestHandler = mockHandler;
 		}
 
+		internal IDirectSslWebRequestHandler MockWebRequestHandler { get; private set; }
+
 		private DirectWebResponse GetMockResponse(HttpWebRequest request) {
 			DirectWebResponse response;
 			if (this.registeredMockResponses.TryGetValue(request.RequestUri, out response)) {
@@ -36,13 +47,6 @@
 			}
 		}
 
-		/// <summary>
-		/// Clears all all mock HTTP responses and deactivates HTTP mocking.
-		/// </summary>
-		internal void Reset() {
-			this.registeredMockResponses.Clear();
-		}
-
 		internal void RegisterMockResponse(DirectWebResponse response) {
 			if (response == null) throw new ArgumentNullException("response");
 			if (registeredMockResponses.ContainsKey(response.RequestUri)) {