Refactoring around Provider's IRequest to process responses differently.

This is a step toward serializable IRequest objects.

5 files changed, 10 insertions, 11 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/AssociationHandshakeTests.cs b/src/DotNetOpenAuth.Test/OpenId/AssociationHandshakeTests.cs
index 01c2cf5..94c0671 100644
--- a/src/DotNetOpenAuth.Test/OpenId/AssociationHandshakeTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/AssociationHandshakeTests.cs
@@ -87,7 +87,7 @@ namespace DotNetOpenAuth.Test.OpenId {
 					// Ensure that the response is a suggestion that the RP try again with HMAC-SHA1
 					AssociateUnsuccessfulResponse renegotiateResponse = (AssociateUnsuccessfulResponse)reqAccessor.ResponseMessage;
 					Assert.AreEqual(protocol.Args.SignatureAlgorithm.HMAC_SHA1, renegotiateResponse.AssociationType);
-					req.Response.Send();
+					op.SendResponse(req);
 
 					// Receive second attempt request for an HMAC-SHA1 association.
 					req = (AutoResponsiveRequest)op.GetRequest();
@@ -98,7 +98,7 @@ namespace DotNetOpenAuth.Test.OpenId {
 					// Ensure that the response is a success response.
 					AssociateSuccessfulResponse successResponse = (AssociateSuccessfulResponse)reqAccessor.ResponseMessage;
 					Assert.AreEqual(protocol.Args.SignatureAlgorithm.HMAC_SHA1, successResponse.AssociationType);
-					req.Response.Send();
+					op.SendResponse(req);
 				});
 			coordinator.Run();
 		}
@@ -307,8 +307,7 @@ namespace DotNetOpenAuth.Test.OpenId {
 					IRequest req = op.GetRequest();
 					Assert.IsNotNull(req, "Expected incoming request but did not receive it.");
 					Assert.IsTrue(req.IsResponseReady);
-					UserAgentResponse resp = req.Response;
-					resp.Send();
+					op.SendResponse(req);
 				});
 			coordinator.IncomingMessageFilter = message => {
 				Assert.AreSame(opDescription.ProtocolVersion, message.Version, "The message was recognized as version {0} but was expected to be {1}.", message.Version, opDescription.ProtocolVersion);
diff --git a/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs b/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs
index 764e830..a19df2a 100644
--- a/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs
@@ -125,10 +125,10 @@ namespace DotNetOpenAuth.Test.OpenId.ChannelElements {
 				op => {
 					RegisterMockExtension(op.Channel);
 					op.Channel.Send(CreateResponseWithExtensions(protocol));
-					op.GetRequest().Response.Send(); // check_auth
+					op.SendResponse(op.GetRequest()); // check_auth
 					op.SecuritySettings.SignOutgoingExtensions = false;
 					op.Channel.Send(CreateResponseWithExtensions(protocol));
-					op.GetRequest().Response.Send(); // check_auth
+					op.SendResponse(op.GetRequest()); // check_auth
 				});
 			coordinator.Run();
 		}
diff --git a/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs b/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
index b45dc1b..58eb4f4 100644
--- a/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
@@ -154,7 +154,7 @@ namespace DotNetOpenAuth.Test.OpenId {
 					}
 				}
 
-				request.Response.Send();
+				provider.SendResponse(request);
 			}
 		}
 
diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/AuthenticationRequestTest.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/AuthenticationRequestTest.cs
index 078ffb4..cb898be 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/AuthenticationRequestTest.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/AuthenticationRequestTest.cs
@@ -30,7 +30,7 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 
 			// Now simulate the request being rejected and extract the user_setup_url
 			request.IsAuthenticated = false;
-			Uri userSetupUrl = ((NegativeAssertionResponse)request.Response.OriginalMessage).UserSetupUrl;
+			Uri userSetupUrl = ((NegativeAssertionResponse)request.Response).UserSetupUrl;
 			Assert.IsNotNull(userSetupUrl);
 
 			// Now construct a new request as if it had just come in.
@@ -54,11 +54,11 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 			checkIdRequest.Realm = RPRealmUri;
 			checkIdRequest.ReturnTo = RPUri;
 			AuthenticationRequest request = new AuthenticationRequest(provider, checkIdRequest);
-			Assert.IsFalse(request.IsReturnUrlDiscoverable);
+			Assert.IsFalse(request.IsReturnUrlDiscoverable(this.MockResponder.MockWebRequestHandler));
 
 			this.MockResponder.RegisterMockRPDiscovery();
 			request = new AuthenticationRequest(provider, checkIdRequest);
-			Assert.IsTrue(request.IsReturnUrlDiscoverable);
+			Assert.IsTrue(request.IsReturnUrlDiscoverable(this.MockResponder.MockWebRequestHandler));
 		}
 	}
 }
diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
index 114a135..f1994d1 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
@@ -96,7 +96,7 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 				op => {
 					IRequest request = op.GetRequest();
 					Assert.IsInstanceOfType(request, typeof(AutoResponsiveRequest));
-					request.Response.Send();
+					op.SendResponse(request);
 				});
 			coordinator.Run();
 		}