diff options
Diffstat (limited to 'src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs')
| -rw-r--r-- | src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs b/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs index 3b72b9e..5016de2 100644 --- a/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs +++ b/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs @@ -13,6 +13,9 @@ namespace DotNetOpenAuth.AspNet.Test { using DotNetOpenAuth.OAuth.Messages; using Moq; using NUnit.Framework; + using DotNetOpenAuth.OAuth; + using System.Threading; + using System.Threading.Tasks; [TestFixture] public class OAuthClientTest { @@ -29,11 +32,11 @@ namespace DotNetOpenAuth.AspNet.Test { } [TestCase] - public void RequestAuthenticationInvokeMethodOnWebWorker() { + public async Task RequestAuthenticationInvokeMethodOnWebWorker() { // Arrange var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict); webWorker - .Setup(w => w.RequestAuthentication(It.Is<Uri>(u => u.ToString().Equals("http://live.com/my/path.cshtml?q=one")))) + .Setup(w => w.RequestAuthenticationAsync(It.Is<Uri>(u => u.ToString().Equals("http://live.com/my/path.cshtml?q=one")), It.IsAny<CancellationToken>())) .Verifiable(); var client = new MockOAuthClient(webWorker.Object); @@ -41,45 +44,42 @@ namespace DotNetOpenAuth.AspNet.Test { var context = new Mock<HttpContextBase>(); // Act - client.RequestAuthentication(context.Object, returnUri); + await client.RequestAuthenticationAsync(context.Object, returnUri); // Assert webWorker.Verify(); } [TestCase] - public void VerifyAuthenticationFailsIfResponseTokenIsNull() { + public async Task VerifyAuthenticationFailsIfResponseTokenIsNull() { // Arrange var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict); - webWorker.Setup(w => w.ProcessUserAuthorization()).Returns((AuthorizedTokenResponse)null); + webWorker.Setup(w => w.ProcessUserAuthorizationAsync(It.IsAny<HttpContextBase>(), CancellationToken.None)).Returns(Task.FromResult<AccessTokenResponse>(null)); var client = new MockOAuthClient(webWorker.Object); var context = new Mock<HttpContextBase>(); // Act - client.VerifyAuthentication(context.Object); + await client.VerifyAuthenticationAsync(context.Object); // Assert webWorker.Verify(); } [TestCase] - public void VerifyAuthenticationFailsIfAccessTokenIsInvalid() { + public async Task VerifyAuthenticationFailsIfAccessTokenIsInvalid() { // Arrange var endpoint = new MessageReceivingEndpoint("http://live.com/path/?a=b", HttpDeliveryMethods.GetRequest); var request = new AuthorizedTokenRequest(endpoint, new Version("1.0")); - var response = new AuthorizedTokenResponse(request) { - AccessToken = "invalid token" - }; var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict); - webWorker.Setup(w => w.ProcessUserAuthorization()).Returns(response).Verifiable(); + webWorker.Setup(w => w.ProcessUserAuthorizationAsync(It.IsAny<HttpContextBase>(), CancellationToken.None)).Returns(Task.FromResult<AccessTokenResponse>(null)).Verifiable(); var client = new MockOAuthClient(webWorker.Object); var context = new Mock<HttpContextBase>(); // Act - AuthenticationResult result = client.VerifyAuthentication(context.Object); + AuthenticationResult result = await client.VerifyAuthenticationAsync(context.Object); // Assert webWorker.Verify(); @@ -88,22 +88,19 @@ namespace DotNetOpenAuth.AspNet.Test { } [TestCase] - public void VerifyAuthenticationSucceeds() { + public async Task VerifyAuthenticationSucceeds() { // Arrange var endpoint = new MessageReceivingEndpoint("http://live.com/path/?a=b", HttpDeliveryMethods.GetRequest); var request = new AuthorizedTokenRequest(endpoint, new Version("1.0")); - var response = new AuthorizedTokenResponse(request) { - AccessToken = "ok" - }; var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict); - webWorker.Setup(w => w.ProcessUserAuthorization()).Returns(response).Verifiable(); + webWorker.Setup(w => w.ProcessUserAuthorizationAsync(It.IsAny<HttpContextBase>(), CancellationToken.None)).Returns(Task.FromResult<AccessTokenResponse>(null)).Verifiable(); var client = new MockOAuthClient(webWorker.Object); var context = new Mock<HttpContextBase>(); // Act - AuthenticationResult result = client.VerifyAuthentication(context.Object); + AuthenticationResult result = await client.VerifyAuthenticationAsync(context.Object); // Assert webWorker.Verify(); @@ -113,7 +110,6 @@ namespace DotNetOpenAuth.AspNet.Test { Assert.AreEqual("12345", result.ProviderUserId); Assert.AreEqual("super", result.UserName); Assert.IsNotNull(result.ExtraData); - Assert.IsTrue(result.ExtraData.ContainsKey("accesstoken")); Assert.AreEqual("ok", result.ExtraData["accesstoken"]); } @@ -133,12 +129,12 @@ namespace DotNetOpenAuth.AspNet.Test { : base("mockoauth", worker) { } - protected override AuthenticationResult VerifyAuthenticationCore(AuthorizedTokenResponse response) { - if (response.AccessToken == "ok") { - return new AuthenticationResult(true, "mockoauth", "12345", "super", response.ExtraData); + protected override Task<AuthenticationResult> VerifyAuthenticationCoreAsync(AccessTokenResponse response, CancellationToken cancellationToken) { + if (response.AccessToken.Token == "ok") { + return Task.FromResult(new AuthenticationResult(true, "mockoauth", "12345", "super", response.ExtraData)); } - return AuthenticationResult.Failed; + return Task.FromResult(AuthenticationResult.Failed); } } } |