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

Clean up tests 

- Make Facebook test server asynchronous to avoid having to
  block for the result.
- Clean up some formatting.
This commit is contained in:
Patrick Westerhoff 2018-03-19 22:19:57 +01:00
parent 90064ce9df
commit d24fddcf59
2 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
test/Microsoft.AspNetCore.Authentication.Test/FacebookTests.cs
View File

@ -426,15 +426,15 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
{ {
var server = CreateServer( var server = CreateServer(
app => { }, app => { },
services => services.AddAuthentication().AddFacebook(o => { services => services.AddAuthentication().AddFacebook(o =>
{
o.AppId = "whatever"; o.AppId = "whatever";
o.AppSecret = "whatever"; o.AppSecret = "whatever";
o.SignInScheme = FacebookDefaults.AuthenticationScheme; o.SignInScheme = FacebookDefaults.AuthenticationScheme;
}), }),
context => async context =>
{ {
// Gross await context.ChallengeAsync("Facebook");
context.ChallengeAsync("Facebook").GetAwaiter().GetResult();
return true; return true;
}); });
var error = await Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync("https://example.com/challenge")); var error = await Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync("https://example.com/challenge"));
@ -446,14 +446,14 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
{ {
var server = CreateServer( var server = CreateServer(
app => { }, app => { },
services => services.AddAuthentication(o => o.DefaultScheme = FacebookDefaults.AuthenticationScheme).AddFacebook(o => { services => services.AddAuthentication(o => o.DefaultScheme = FacebookDefaults.AuthenticationScheme).AddFacebook(o =>
{
o.AppId = "whatever"; o.AppId = "whatever";
o.AppSecret = "whatever"; o.AppSecret = "whatever";
}), }),
context => async context =>
{ {
// Gross await context.ChallengeAsync("Facebook");
context.ChallengeAsync("Facebook").GetAwaiter().GetResult();
return true; return true;
}); });
var error = await Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync("https://example.com/challenge")); var error = await Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync("https://example.com/challenge"));
@ -465,14 +465,14 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
{ {
var server = CreateServer( var server = CreateServer(
app => { }, app => { },
services => services.AddAuthentication(o => o.DefaultSignInScheme = FacebookDefaults.AuthenticationScheme).AddFacebook(o => { services => services.AddAuthentication(o => o.DefaultSignInScheme = FacebookDefaults.AuthenticationScheme).AddFacebook(o =>
{
o.AppId = "whatever"; o.AppId = "whatever";
o.AppSecret = "whatever"; o.AppSecret = "whatever";
}), }),
context => async context =>
{ {
// Gross await context.ChallengeAsync("Facebook");
context.ChallengeAsync("Facebook").GetAwaiter().GetResult();
return true; return true;
}); });
var error = await Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync("https://example.com/challenge")); var error = await Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync("https://example.com/challenge"));
@ -498,10 +498,9 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
var server = CreateServer( var server = CreateServer(
app => { }, app => { },
services => services.AddAuthentication().AddFacebook(o => o.SignInScheme = "Whatever"), services => services.AddAuthentication().AddFacebook(o => o.SignInScheme = "Whatever"),
context => async context =>
{ {
// REVIEW: Gross. await Assert.ThrowsAsync<ArgumentException>("AppId", () => context.ChallengeAsync("Facebook"));
Assert.Throws<ArgumentException>("AppId", () => context.ChallengeAsync("Facebook").GetAwaiter().GetResult());
return true; return true;
}); });
var transaction = await server.SendAsync("http://example.com/challenge"); var transaction = await server.SendAsync("http://example.com/challenge");
@ -514,10 +513,9 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
var server = CreateServer( var server = CreateServer(
app => { }, app => { },
services => services.AddAuthentication().AddFacebook(o => o.AppId = "Whatever"), services => services.AddAuthentication().AddFacebook(o => o.AppId = "Whatever"),
context => async context =>
{ {
// REVIEW: Gross. await Assert.ThrowsAsync<ArgumentException>("AppSecret", () => context.ChallengeAsync("Facebook"));
Assert.Throws<ArgumentException>("AppSecret", () => context.ChallengeAsync("Facebook").GetAwaiter().GetResult());
return true; return true;
}); });
var transaction = await server.SendAsync("http://example.com/challenge"); var transaction = await server.SendAsync("http://example.com/challenge");
@ -550,10 +548,9 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
}; };
}); });
}, },
context => async context =>
{ {
// REVIEW: Gross. await context.ChallengeAsync("Facebook");
context.ChallengeAsync("Facebook").GetAwaiter().GetResult();
return true; return true;
}); });
var transaction = await server.SendAsync("http://example.com/challenge"); var transaction = await server.SendAsync("http://example.com/challenge");
@ -643,10 +640,9 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
o.AppSecret = "Test App Secret"; o.AppSecret = "Test App Secret";
}); });
}, },
context => async context =>
{ {
// REVIEW: gross await context.ChallengeAsync("Facebook");
context.ChallengeAsync("Facebook").GetAwaiter().GetResult();
return true; return true;
}); });
var transaction = await server.SendAsync("http://example.com/challenge"); var transaction = await server.SendAsync("http://example.com/challenge");
@ -728,7 +724,7 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
Assert.Contains("&access_token=", finalUserInfoEndpoint); Assert.Contains("&access_token=", finalUserInfoEndpoint);
} }
private static TestServer CreateServer(Action<IApplicationBuilder> configure, Action<IServiceCollection> configureServices, Func<HttpContext, bool> handler) private static TestServer CreateServer(Action<IApplicationBuilder> configure, Action<IServiceCollection> configureServices, Func<HttpContext, Task<bool>> handler)
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.Configure(app => .Configure(app =>
@ -736,7 +732,7 @@ namespace Microsoft.AspNetCore.Authentication.Facebook
configure?.Invoke(app); configure?.Invoke(app);
app.Use(async (context, next) => app.Use(async (context, next) =>
{ {
if (handler == null || !handler(context)) if (handler == null || !await handler(context))
{ {
await next(); await next();
} }

4
test/Microsoft.AspNetCore.Authentication.Test/GoogleTests.cs
View File

@ -551,7 +551,6 @@ namespace Microsoft.AspNetCore.Authentication.Google
{ {
o.ClientId = "Test Id"; o.ClientId = "Test Id";
o.ClientSecret = "Test Secret"; o.ClientSecret = "Test Secret";
//AutomaticChallenge = true
}, },
context => context =>
{ {
@ -559,8 +558,7 @@ namespace Microsoft.AspNetCore.Authentication.Google
var res = context.Response; var res = context.Response;
if (req.Path == new PathString("/challenge2")) if (req.Path == new PathString("/challenge2"))
{ {
return context.ChallengeAsync("Google", new AuthenticationProperties( return context.ChallengeAsync("Google", new AuthenticationProperties(new Dictionary<string, string>()
new Dictionary<string, string>()
{ {
{ "scope", "https://www.googleapis.com/auth/plus.login" }, { "scope", "https://www.googleapis.com/auth/plus.login" },
{ "access_type", "offline" }, { "access_type", "offline" },