Fixes remaining build breaks.

1 files changed, 55 insertions, 64 deletions

diff --git a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
index 7b5c32e..2befd35 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
@@ -11,6 +11,7 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 	using System.Net;
 	using System.Net.Http;
 	using System.Text;
+	using System.Threading;
 	using System.Threading.Tasks;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OAuth2;
@@ -23,37 +24,35 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 	public class WebServerClientAuthorizeTests : OAuth2TestBase {
 		[Test]
 		public async Task AuthorizationCodeGrant() {
-			var coordinator = new CoordinatorBase(
-				async (hostFactories, ct) => {
-					var client = new WebServerClient(AuthorizationServerDescription);
-					var authState = new AuthorizationState(TestScopes) {
-						Callback = ClientCallback,
-					};
-					var authRequestRedirect = await client.PrepareRequestUserAuthorizationAsync(authState, ct);
-					Uri authRequestResponse;
-					using (var httpClient = hostFactories.CreateHttpClient()) {
-						using (var httpResponse = await httpClient.GetAsync(authRequestRedirect.Headers.Location, ct)) {
-							authRequestResponse = httpResponse.Headers.Location;
-						}
-					}
+			Handle(AuthorizationServerDescription.AuthorizationEndpoint).By(
+				async (req, ct) => {
+					var server = new AuthorizationServer(AuthorizationServerMock);
+					var request = await server.ReadAuthorizationRequestAsync(req, ct);
+					Assert.That(request, Is.Not.Null);
+					var response = server.PrepareApproveAuthorizationRequest(request, ResourceOwnerUsername);
+					return await server.Channel.PrepareResponseAsync(response, ct);
+				});
+			Handle(AuthorizationServerDescription.TokenEndpoint).By(
+				async (req, ct) => {
+					var server = new AuthorizationServer(AuthorizationServerMock);
+					return await server.HandleTokenRequestAsync(req, ct);
+				});
+
+			var client = new WebServerClient(AuthorizationServerDescription);
+			var authState = new AuthorizationState(TestScopes) {
+				Callback = ClientCallback,
+			};
+			var authRequestRedirect = await client.PrepareRequestUserAuthorizationAsync(authState);
+			Uri authRequestResponse;
+			using (var httpClient = this.HostFactories.CreateHttpClient()) {
+				using (var httpResponse = await httpClient.GetAsync(authRequestRedirect.Headers.Location)) {
+					authRequestResponse = httpResponse.Headers.Location;
+				}
+			}
 
-					var result = await client.ProcessUserAuthorizationAsync(new HttpRequestMessage(HttpMethod.Get, authRequestResponse), ct);
-					Assert.That(result.AccessToken, Is.Not.Null.And.Not.Empty);
-					Assert.That(result.RefreshToken, Is.Not.Null.And.Not.Empty);
-				},
-				Handle(AuthorizationServerDescription.AuthorizationEndpoint).By(
-					async (req, ct) => {
-						var server = new AuthorizationServer(AuthorizationServerMock);
-						var request = await server.ReadAuthorizationRequestAsync(req, ct);
-						Assert.That(request, Is.Not.Null);
-						var response = server.PrepareApproveAuthorizationRequest(request, ResourceOwnerUsername);
-						return await server.Channel.PrepareResponseAsync(response, ct);
-					}),
-					Handle(AuthorizationServerDescription.TokenEndpoint).By(async (req, ct) => {
-						var server = new AuthorizationServer(AuthorizationServerMock);
-						return await server.HandleTokenRequestAsync(req, ct);
-					}));
-			await coordinator.RunAsync();
+			var result = await client.ProcessUserAuthorizationAsync(new HttpRequestMessage(HttpMethod.Get, authRequestResponse), CancellationToken.None);
+			Assert.That(result.AccessToken, Is.Not.Null.And.Not.Empty);
+			Assert.That(result.RefreshToken, Is.Not.Null.And.Not.Empty);
 		}
 
 		[Theory]
@@ -69,22 +68,19 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 							MessagingUtilities.AreEquivalent(d.Scope, TestScopes)))).Returns(true);
 			}
 
-			var coordinator = new CoordinatorBase(
-				async (hostFactories, ct) => {
-					var client = new WebServerClient(AuthorizationServerDescription);
-					if (anonymousClient) {
-						client.ClientIdentifier = null;
-					}
+			Handle(AuthorizationServerDescription.TokenEndpoint).By(async (req, ct) => {
+				var server = new AuthorizationServer(authHostMock.Object);
+				return await server.HandleTokenRequestAsync(req, ct);
+			});
 
-					var authState = await client.ExchangeUserCredentialForTokenAsync(ResourceOwnerUsername, ResourceOwnerPassword, TestScopes, ct);
-					Assert.That(authState.AccessToken, Is.Not.Null.And.Not.Empty);
-					Assert.That(authState.RefreshToken, Is.Not.Null.And.Not.Empty);
-				},
-				Handle(AuthorizationServerDescription.TokenEndpoint).By(async (req, ct) => {
-					var server = new AuthorizationServer(authHostMock.Object);
-					return await server.HandleTokenRequestAsync(req, ct);
-				}));
-			await coordinator.RunAsync();
+			var client = new WebServerClient(AuthorizationServerDescription);
+			if (anonymousClient) {
+				client.ClientIdentifier = null;
+			}
+
+			var authState = await client.ExchangeUserCredentialForTokenAsync(ResourceOwnerUsername, ResourceOwnerPassword, TestScopes);
+			Assert.That(authState.AccessToken, Is.Not.Null.And.Not.Empty);
+			Assert.That(authState.RefreshToken, Is.Not.Null.And.Not.Empty);
 		}
 
 		[Test]
@@ -96,18 +92,15 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 			authServer.Setup(
 				a => a.CheckAuthorizeClientCredentialsGrant(It.Is<IAccessTokenRequest>(d => d.ClientIdentifier == ClientId && MessagingUtilities.AreEquivalent(d.Scope, TestScopes))))
 				.Returns<IAccessTokenRequest>(req => new AutomatedAuthorizationCheckResponse(req, true));
-			var coordinator = new CoordinatorBase(
-				async (hostFactories, ct) => {
-					var client = new WebServerClient(AuthorizationServerDescription);
-					var authState = await client.GetClientAccessTokenAsync(TestScopes, ct);
-					Assert.That(authState.AccessToken, Is.Not.Null.And.Not.Empty);
-					Assert.That(authState.RefreshToken, Is.Null);
-				},
-				Handle(AuthorizationServerDescription.TokenEndpoint).By(async (req, ct) => {
+			Handle(AuthorizationServerDescription.TokenEndpoint).By(
+				async (req, ct) => {
 					var server = new AuthorizationServer(authServer.Object);
 					return await server.HandleTokenRequestAsync(req, ct);
-				}));
-			await coordinator.RunAsync();
+				});
+			var client = new WebServerClient(AuthorizationServerDescription);
+			var authState = await client.GetClientAccessTokenAsync(TestScopes);
+			Assert.That(authState.AccessToken, Is.Not.Null.And.Not.Empty);
+			Assert.That(authState.RefreshToken, Is.Null);
 		}
 
 		[Test]
@@ -124,17 +117,15 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 						  response.ApprovedScope.ResetContents(approvedScopes);
 						  return response;
 					  });
-			var coordinator = new CoordinatorBase(
-				async (hostFactories, ct) => {
-					var client = new WebServerClient(AuthorizationServerDescription);
-					var authState = await client.GetClientAccessTokenAsync(TestScopes, ct);
-					Assert.That(authState.Scope, Is.EquivalentTo(approvedScopes));
-				},
-				Handle(AuthorizationServerDescription.TokenEndpoint).By(async (req, ct) => {
+			Handle(AuthorizationServerDescription.TokenEndpoint).By(
+				async (req, ct) => {
 					var server = new AuthorizationServer(authServer.Object);
 					return await server.HandleTokenRequestAsync(req, ct);
-				}));
-			await coordinator.RunAsync();
+				});
+
+			var client = new WebServerClient(AuthorizationServerDescription);
+			var authState = await client.GetClientAccessTokenAsync(TestScopes);
+			Assert.That(authState.Scope, Is.EquivalentTo(approvedScopes));
 		}
 
 		[Test]