From e315a545cb37c6a1a410313dc19c4908eff2ff30 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 10 Oct 2014 12:05:34 -0700 Subject: [PATCH] #61 - Unit test cleanup. --- .../Google/GoogleMiddlewareTests.cs | 26 ++++++++--------- .../MicrosoftAccountMiddlewareTests.cs | 18 ++++++------ .../Twitter/TwitterMiddlewareTests.cs | 28 +++++++------------ 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs index c7c931067a..564935496c 100644 --- a/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs @@ -223,11 +223,11 @@ namespace Microsoft.AspNet.Security.Google options.StateDataFormat = stateFormat; options.BackchannelHttpHandler = new TestHttpMessageHandler { - Sender = async req => + Sender = req => { if (req.RequestUri.AbsoluteUri == "https://accounts.google.com/o/oauth2/token") { - return await ReturnJsonResponse(new + return ReturnJsonResponse(new { access_token = "Test Access Token", expire_in = 3600, @@ -236,7 +236,7 @@ namespace Microsoft.AspNet.Security.Google } else if (req.RequestUri.GetLeftPart(UriPartial.Path) == "https://www.googleapis.com/plus/v1/people/me") { - return await ReturnJsonResponse(new + return ReturnJsonResponse(new { id = "Test User ID", displayName = "Test Name", @@ -299,7 +299,7 @@ namespace Microsoft.AspNet.Security.Google { Sender = req => { - return Task.FromResult(new HttpResponseMessage(HttpStatusCode.BadRequest)); + return new HttpResponseMessage(HttpStatusCode.BadRequest); } }; }); @@ -357,11 +357,11 @@ namespace Microsoft.AspNet.Security.Google options.StateDataFormat = stateFormat; options.BackchannelHttpHandler = new TestHttpMessageHandler { - Sender = async req => + Sender = req => { if (req.RequestUri.AbsoluteUri == "https://accounts.google.com/o/oauth2/token") { - return await ReturnJsonResponse(new + return ReturnJsonResponse(new { access_token = "Test Access Token", expire_in = 3600, @@ -371,7 +371,7 @@ namespace Microsoft.AspNet.Security.Google } else if (req.RequestUri.GetLeftPart(UriPartial.Path) == "https://www.googleapis.com/plus/v1/people/me") { - return await ReturnJsonResponse(new + return ReturnJsonResponse(new { id = "Test User ID", displayName = "Test Name", @@ -426,10 +426,10 @@ namespace Microsoft.AspNet.Security.Google transaction.FindClaimValue("RefreshToken").ShouldBe("Test Refresh Token"); } - private static async Task ReturnJsonResponse(object content) + private static HttpResponseMessage ReturnJsonResponse(object content) { var res = new HttpResponseMessage(HttpStatusCode.OK); - var text = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(content)); + var text = JsonConvert.SerializeObject(content); res.Content = new StringContent(text, Encoding.UTF8, "application/json"); return res; } @@ -524,16 +524,16 @@ namespace Microsoft.AspNet.Security.Google private class TestHttpMessageHandler : HttpMessageHandler { - public Func> Sender { get; set; } + public Func Sender { get; set; } - protected override async Task SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) + protected override Task SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { if (Sender != null) { - return await Sender(request); + return Task.FromResult(Sender(request)); } - return null; + return Task.FromResult(null); } } diff --git a/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs index 2b39e43525..c42ec18513 100644 --- a/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs @@ -93,11 +93,11 @@ namespace Microsoft.AspNet.Security.Tests.MicrosoftAccount options.StateDataFormat = stateFormat; options.BackchannelHttpHandler = new TestHttpMessageHandler { - Sender = async req => + Sender = req => { if (req.RequestUri.AbsoluteUri == "https://login.live.com/oauth20_token.srf") { - return await ReturnJsonResponse(new + return ReturnJsonResponse(new { access_token = "Test Access Token", expire_in = 3600, @@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Security.Tests.MicrosoftAccount } else if (req.RequestUri.GetLeftPart(UriPartial.Path) == "https://apis.live.net/v5.0/me") { - return await ReturnJsonResponse(new + return ReturnJsonResponse(new { id = "Test User ID", name = "Test Name", @@ -209,10 +209,10 @@ namespace Microsoft.AspNet.Security.Tests.MicrosoftAccount return transaction; } - private static async Task ReturnJsonResponse(object content) + private static HttpResponseMessage ReturnJsonResponse(object content) { var res = new HttpResponseMessage(HttpStatusCode.OK); - var text = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(content)); + var text = JsonConvert.SerializeObject(content); res.Content = new StringContent(text, Encoding.UTF8, "application/json"); return res; } @@ -238,16 +238,16 @@ namespace Microsoft.AspNet.Security.Tests.MicrosoftAccount private class TestHttpMessageHandler : HttpMessageHandler { - public Func> Sender { get; set; } + public Func Sender { get; set; } - protected override async Task SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) + protected override Task SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { if (Sender != null) { - return await Sender(request); + return Task.FromResult(Sender(request)); } - return null; + return Task.FromResult(null); } } diff --git a/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs index 0fe4a82300..e9b54e4bc3 100644 --- a/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs @@ -43,15 +43,15 @@ namespace Microsoft.AspNet.Security.Twitter { if (req.RequestUri.AbsoluteUri == "https://api.twitter.com/oauth/request_token") { - return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK) + return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent("oauth_callback_confirmed=true&oauth_token=test_oauth_token&oauth_token_secret=test_oauth_token_secret", Encoding.UTF8, "application/x-www-form-urlencoded") - }); + }; } - return Task.FromResult(null); + return null; } }; options.BackchannelCertificateValidator = null; @@ -81,15 +81,15 @@ namespace Microsoft.AspNet.Security.Twitter { if (req.RequestUri.AbsoluteUri == "https://api.twitter.com/oauth/request_token") { - return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK) + return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent("oauth_callback_confirmed=true&oauth_token=test_oauth_token&oauth_token_secret=test_oauth_token_secret", Encoding.UTF8, "application/x-www-form-urlencoded") - }); + }; } - return Task.FromResult(null); + return null; } }; options.BackchannelCertificateValidator = null; @@ -155,26 +155,18 @@ namespace Microsoft.AspNet.Security.Twitter return transaction; } - private static async Task ReturnJsonResponse(object content) - { - var res = new HttpResponseMessage(HttpStatusCode.OK); - var text = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(content)); - res.Content = new StringContent(text, Encoding.UTF8, "application/json"); - return res; - } - private class TestHttpMessageHandler : HttpMessageHandler { - public Func> Sender { get; set; } + public Func Sender { get; set; } - protected override async Task SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) + protected override Task SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { if (Sender != null) { - return await Sender(request); + return Task.FromResult(Sender(request)); } - return null; + return Task.FromResult(null); } }