huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#61 - Unit test cleanup.

This commit is contained in:
Chris Ross 2014-10-10 12:05:34 -07:00
parent 3e88f44552
commit e315a545cb
3 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs
View File

@ -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<HttpResponseMessage> 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<HttpRequestMessage, Task<HttpResponseMessage>> Sender { get; set; }
public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
{
if (Sender != null)
{
return await Sender(request);
return Task.FromResult(Sender(request));
}
return null;
return Task.FromResult<HttpResponseMessage>(null);
}
}

18
test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
View File

@ -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<HttpResponseMessage> 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<HttpRequestMessage, Task<HttpResponseMessage>> Sender { get; set; }
public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
{
if (Sender != null)
{
return await Sender(request);
return Task.FromResult(Sender(request));
}
return null;
return Task.FromResult<HttpResponseMessage>(null);
}
}

28
test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs
View File

@ -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<HttpResponseMessage>(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<HttpResponseMessage>(null);
return null;
}
};
options.BackchannelCertificateValidator = null;
@ -155,26 +155,18 @@ namespace Microsoft.AspNet.Security.Twitter
return transaction;
}
private static async Task<HttpResponseMessage> 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<HttpRequestMessage, Task<HttpResponseMessage>> Sender { get; set; }
public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
{
if (Sender != null)
{
return await Sender(request);
return Task.FromResult(Sender(request));
}
return null;
return Task.FromResult<HttpResponseMessage>(null);
}
}