Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit e315a54

Browse files
TratcherTratcher
committed
#61 - Unit test cleanup.
1 parent 3e88f44 commit e315a54

File tree

3 files changed

+32
-40
lines changed

3 files changed

+32
-40
lines changed

‎test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ public async Task ReplyPathWillAuthenticateValidAuthorizeCodeAndState()
223223
options.StateDataFormat = stateFormat;
224224
options.BackchannelHttpHandler = new TestHttpMessageHandler
225225
{
226-
Sender = async req =>
226+
Sender = req =>
227227
{
228228
if (req.RequestUri.AbsoluteUri == "https://accounts.google.com/o/oauth2/token")
229229
{
230-
return await ReturnJsonResponse(new
230+
return ReturnJsonResponse(new
231231
{
232232
access_token = "Test Access Token",
233233
expire_in = 3600,
@@ -236,7 +236,7 @@ public async Task ReplyPathWillAuthenticateValidAuthorizeCodeAndState()
236236
}
237237
else if (req.RequestUri.GetLeftPart(UriPartial.Path) == "https://www.googleapis.com/plus/v1/people/me")
238238
{
239-
return await ReturnJsonResponse(new
239+
return ReturnJsonResponse(new
240240
{
241241
id = "Test User ID",
242242
displayName = "Test Name",
@@ -299,7 +299,7 @@ public async Task ReplyPathWillRejectIfCodeIsInvalid()
299299
{
300300
Sender = req =>
301301
{
302-
return Task.FromResult(new HttpResponseMessage(HttpStatusCode.BadRequest));
302+
return new HttpResponseMessage(HttpStatusCode.BadRequest);
303303
}
304304
};
305305
});
@@ -357,11 +357,11 @@ public async Task AuthenticatedEventCanGetRefreshToken()
357357
options.StateDataFormat = stateFormat;
358358
options.BackchannelHttpHandler = new TestHttpMessageHandler
359359
{
360-
Sender = async req =>
360+
Sender = req =>
361361
{
362362
if (req.RequestUri.AbsoluteUri == "https://accounts.google.com/o/oauth2/token")
363363
{
364-
return await ReturnJsonResponse(new
364+
return ReturnJsonResponse(new
365365
{
366366
access_token = "Test Access Token",
367367
expire_in = 3600,
@@ -371,7 +371,7 @@ public async Task AuthenticatedEventCanGetRefreshToken()
371371
}
372372
else if (req.RequestUri.GetLeftPart(UriPartial.Path) == "https://www.googleapis.com/plus/v1/people/me")
373373
{
374-
return await ReturnJsonResponse(new
374+
return ReturnJsonResponse(new
375375
{
376376
id = "Test User ID",
377377
displayName = "Test Name",
@@ -426,10 +426,10 @@ public async Task AuthenticatedEventCanGetRefreshToken()
426426
transaction.FindClaimValue("RefreshToken").ShouldBe("Test Refresh Token");
427427
}
428428

429-
private static async Task<HttpResponseMessage> ReturnJsonResponse(object content)
429+
private static HttpResponseMessage ReturnJsonResponse(object content)
430430
{
431431
var res = new HttpResponseMessage(HttpStatusCode.OK);
432-
var text = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(content));
432+
var text = JsonConvert.SerializeObject(content);
433433
res.Content = new StringContent(text, Encoding.UTF8, "application/json");
434434
return res;
435435
}
@@ -524,16 +524,16 @@ private static void Describe(HttpResponse res, ClaimsIdentity identity)
524524

525525
private class TestHttpMessageHandler : HttpMessageHandler
526526
{
527-
public Func<HttpRequestMessage, Task<HttpResponseMessage>> Sender { get; set; }
527+
public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
528528

529-
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
529+
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
530530
{
531531
if (Sender != null)
532532
{
533-
return await Sender(request);
533+
return Task.FromResult(Sender(request));
534534
}
535535

536-
return null;
536+
return Task.FromResult<HttpResponseMessage>(null);
537537
}
538538
}
539539

‎test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ public async Task AuthenticatedEventCanGetRefreshToken()
9393
options.StateDataFormat = stateFormat;
9494
options.BackchannelHttpHandler = new TestHttpMessageHandler
9595
{
96-
Sender = async req =>
96+
Sender = req =>
9797
{
9898
if (req.RequestUri.AbsoluteUri == "https://login.live.com/oauth20_token.srf")
9999
{
100-
return await ReturnJsonResponse(new
100+
return ReturnJsonResponse(new
101101
{
102102
access_token = "Test Access Token",
103103
expire_in = 3600,
@@ -107,7 +107,7 @@ public async Task AuthenticatedEventCanGetRefreshToken()
107107
}
108108
else if (req.RequestUri.GetLeftPart(UriPartial.Path) == "https://apis.live.net/v5.0/me")
109109
{
110-
return await ReturnJsonResponse(new
110+
return ReturnJsonResponse(new
111111
{
112112
id = "Test User ID",
113113
name = "Test Name",
@@ -209,10 +209,10 @@ private static async Task<Transaction> SendAsync(TestServer server, string uri,
209209
return transaction;
210210
}
211211

212-
private static async Task<HttpResponseMessage> ReturnJsonResponse(object content)
212+
private static HttpResponseMessage ReturnJsonResponse(object content)
213213
{
214214
var res = new HttpResponseMessage(HttpStatusCode.OK);
215-
var text = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(content));
215+
var text = JsonConvert.SerializeObject(content);
216216
res.Content = new StringContent(text, Encoding.UTF8, "application/json");
217217
return res;
218218
}
@@ -238,16 +238,16 @@ private static void Describe(HttpResponse res, ClaimsIdentity identity)
238238

239239
private class TestHttpMessageHandler : HttpMessageHandler
240240
{
241-
public Func<HttpRequestMessage, Task<HttpResponseMessage>> Sender { get; set; }
241+
public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
242242

243-
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
243+
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
244244
{
245245
if (Sender != null)
246246
{
247-
return await Sender(request);
247+
return Task.FromResult(Sender(request));
248248
}
249249

250-
return null;
250+
return Task.FromResult<HttpResponseMessage>(null);
251251
}
252252
}
253253

‎test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()
4343
{
4444
if (req.RequestUri.AbsoluteUri == "https://api.twitter.com/oauth/request_token")
4545
{
46-
return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK)
46+
return new HttpResponseMessage(HttpStatusCode.OK)
4747
{
4848
Content =
4949
new StringContent("oauth_callback_confirmed=true&oauth_token=test_oauth_token&oauth_token_secret=test_oauth_token_secret",
5050
Encoding.UTF8,
5151
"application/x-www-form-urlencoded")
52-
});
52+
};
5353
}
54-
return Task.FromResult<HttpResponseMessage>(null);
54+
return null;
5555
}
5656
};
5757
options.BackchannelCertificateValidator = null;
@@ -81,15 +81,15 @@ public async Task ChallengeWillTriggerRedirection()
8181
{
8282
if (req.RequestUri.AbsoluteUri == "https://api.twitter.com/oauth/request_token")
8383
{
84-
return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK)
84+
return new HttpResponseMessage(HttpStatusCode.OK)
8585
{
8686
Content =
8787
new StringContent("oauth_callback_confirmed=true&oauth_token=test_oauth_token&oauth_token_secret=test_oauth_token_secret",
8888
Encoding.UTF8,
8989
"application/x-www-form-urlencoded")
90-
});
90+
};
9191
}
92-
return Task.FromResult<HttpResponseMessage>(null);
92+
return null;
9393
}
9494
};
9595
options.BackchannelCertificateValidator = null;
@@ -155,26 +155,18 @@ private static async Task<Transaction> SendAsync(TestServer server, string uri,
155155
return transaction;
156156
}
157157

158-
private static async Task<HttpResponseMessage> ReturnJsonResponse(object content)
159-
{
160-
var res = new HttpResponseMessage(HttpStatusCode.OK);
161-
var text = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(content));
162-
res.Content = new StringContent(text, Encoding.UTF8, "application/json");
163-
return res;
164-
}
165-
166158
private class TestHttpMessageHandler : HttpMessageHandler
167159
{
168-
public Func<HttpRequestMessage, Task<HttpResponseMessage>> Sender { get; set; }
160+
public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
169161

170-
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
162+
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
171163
{
172164
if (Sender != null)
173165
{
174-
return await Sender(request);
166+
return Task.FromResult(Sender(request));
175167
}
176168

177-
return null;
169+
return Task.FromResult<HttpResponseMessage>(null);
178170
}
179171
}
180172

0 commit comments

Comments
 (0)