Move to HttpClient throughout library.

1 files changed, 13 insertions, 12 deletions

diff --git a/src/DotNetOpenAuth.AspNet.Test/OAuth2ClientTest.cs b/src/DotNetOpenAuth.AspNet.Test/OAuth2ClientTest.cs
index e60df01..ad5a69d 100644
--- a/src/DotNetOpenAuth.AspNet.Test/OAuth2ClientTest.cs
+++ b/src/DotNetOpenAuth.AspNet.Test/OAuth2ClientTest.cs
@@ -12,6 +12,7 @@ namespace DotNetOpenAuth.AspNet.Test {
 	using DotNetOpenAuth.AspNet.Clients;
 	using Moq;
 	using NUnit.Framework;
+	using System.Threading.Tasks;
 
 	[TestFixture]
 	public class OAuth2ClientTest {
@@ -28,14 +29,14 @@ namespace DotNetOpenAuth.AspNet.Test {
 		}
 
 		[TestCase]
-		public void RequestAuthenticationIssueCorrectRedirect() {
+		public async Task RequestAuthenticationIssueCorrectRedirect() {
 			// Arrange
 			var client = new MockOAuth2Client();
 			var context = new Mock<HttpContextBase>(MockBehavior.Strict);
 			context.Setup(c => c.Response.Redirect("http://live.com/?q=http://return.to.me/", true)).Verifiable();
 
 			// Act
-			client.RequestAuthentication(context.Object, new Uri("http://return.to.me"));
+			await client.RequestAuthenticationAsync(context.Object, new Uri("http://return.to.me"));
 
 			// Assert
 			context.Verify();
@@ -47,7 +48,7 @@ namespace DotNetOpenAuth.AspNet.Test {
 			var client = new MockOAuth2Client();
 
 			// Act && Assert
-			Assert.Throws<ArgumentNullException>(() => client.VerifyAuthentication(null, new Uri("http://me.com")));
+			Assert.Throws<ArgumentNullException>(() => client.VerifyAuthenticationAsync(null, new Uri("http://me.com")).GetAwaiter().GetResult());
 		}
 
 		[TestCase]
@@ -56,11 +57,11 @@ namespace DotNetOpenAuth.AspNet.Test {
 			var client = new MockOAuth2Client();
 
 			// Act && Assert
-			Assert.Throws<InvalidOperationException>(() => client.VerifyAuthentication(new Mock<HttpContextBase>().Object));
+			Assert.Throws<InvalidOperationException>(() => client.VerifyAuthenticationAsync(new Mock<HttpContextBase>().Object).GetAwaiter().GetResult());
 		}
 
 		[TestCase]
-		public void VerifyAuthenticationFailsIfCodeIsNotPresent() {
+		public async Task VerifyAuthenticationFailsIfCodeIsNotPresent() {
 			// Arrange
 			var client = new MockOAuth2Client();
 			var context = new Mock<HttpContextBase>(MockBehavior.Strict);
@@ -68,14 +69,14 @@ namespace DotNetOpenAuth.AspNet.Test {
 			context.Setup(c => c.Request.QueryString).Returns(queryStrings);
 
 			// Act 
-			AuthenticationResult result = client.VerifyAuthentication(context.Object, new Uri("http://me.com"));
+			AuthenticationResult result = await client.VerifyAuthenticationAsync(context.Object, new Uri("http://me.com"));
 
 			// Assert
 			Assert.IsFalse(result.IsSuccessful);
 		}
 
 		[TestCase]
-		public void VerifyAuthenticationFailsIfAccessTokenIsNull() {
+		public async Task VerifyAuthenticationFailsIfAccessTokenIsNull() {
 			// Arrange
 			var client = new MockOAuth2Client();
 			var context = new Mock<HttpContextBase>(MockBehavior.Strict);
@@ -84,14 +85,14 @@ namespace DotNetOpenAuth.AspNet.Test {
 			context.Setup(c => c.Request.QueryString).Returns(queryStrings);
 
 			// Act 
-			AuthenticationResult result = client.VerifyAuthentication(context.Object, new Uri("http://me.com"));
+			AuthenticationResult result = await client.VerifyAuthenticationAsync(context.Object, new Uri("http://me.com"));
 
 			// Assert
 			Assert.IsFalse(result.IsSuccessful);
 		}
 
 		[TestCase]
-		public void VerifyAuthenticationSucceeds() {
+		public async Task VerifyAuthenticationSucceeds() {
 			// Arrange
 			var client = new MockOAuth2Client();
 			var context = new Mock<HttpContextBase>(MockBehavior.Strict);
@@ -100,7 +101,7 @@ namespace DotNetOpenAuth.AspNet.Test {
 			context.Setup(c => c.Request.QueryString).Returns(queryStrings);
 
 			// Act 
-			AuthenticationResult result = client.VerifyAuthentication(context.Object, new Uri("http://me.com"));
+			AuthenticationResult result = await client.VerifyAuthenticationAsync(context.Object, new Uri("http://me.com"));
 
 			// Assert
 			Assert.True(result.IsSuccessful);
@@ -125,9 +126,9 @@ namespace DotNetOpenAuth.AspNet.Test {
 				return (authorizationCode == "secret") ? "abcde" : null;
 			}
 
-			protected override IDictionary<string, string> GetUserData(string accessToken) {
+			protected override NameValueCollection GetUserData(string accessToken) {
 				if (accessToken == "abcde") {
-					return new Dictionary<string, string>
+					return new NameValueCollection
 					{
 						{ "id", "12345" },
 						{ "name", "John Doe" },