React to changes in Logging

This commit is contained in:
jacalvar 2016-03-01 14:53:24 -08:00
parent 76a4a75de5
commit 6715d0a645
2 changed files with 9 additions and 6 deletions

View File

@ -24,7 +24,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
var services = new ServiceCollection(); var services = new ServiceCollection();
services services
.AddLogging()
.AddEntityFramework() .AddEntityFramework()
.AddSqlServer() .AddSqlServer()
.AddDbContext<IdentityDbContext>(o => o.UseSqlServer(fixture.ConnectionString)) .AddDbContext<IdentityDbContext>(o => o.UseSqlServer(fixture.ConnectionString))
@ -32,6 +31,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
.AddIdentity<IdentityUser, IdentityRole>() .AddIdentity<IdentityUser, IdentityRole>()
.AddEntityFrameworkStores<IdentityDbContext>(); .AddEntityFrameworkStores<IdentityDbContext>();
services.AddLogging();
var provider = services.BuildServiceProvider(); var provider = services.BuildServiceProvider();
_builder = new ApplicationBuilder(provider); _builder = new ApplicationBuilder(provider);

View File

@ -36,13 +36,15 @@ namespace Microsoft.AspNetCore.Identity.Test
{ {
var services = new ServiceCollection() var services = new ServiceCollection()
.AddTransient<IUserStore<TestUser>, NoopUserStore>() .AddTransient<IUserStore<TestUser>, NoopUserStore>()
.AddSingleton<IHttpContextAccessor, HttpContextAccessor>() .AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
.AddLogging();
services.AddLogging();
services.AddIdentity<TestUser, TestRole>() services.AddIdentity<TestUser, TestRole>()
.AddUserManager<CustomUserManager>() .AddUserManager<CustomUserManager>()
.AddRoleManager<CustomRoleManager>(); .AddRoleManager<CustomRoleManager>();
var provider = services.BuildServiceProvider(); var provider = services.BuildServiceProvider();
Assert.Same(provider.GetRequiredService<UserManager<TestUser>>(), Assert.Same(provider.GetRequiredService<UserManager<TestUser>>(),
provider.GetRequiredService<CustomUserManager>()); provider.GetRequiredService<CustomUserManager>());
Assert.Same(provider.GetRequiredService<RoleManager<TestRole>>(), Assert.Same(provider.GetRequiredService<RoleManager<TestRole>>(),
provider.GetRequiredService<CustomRoleManager>()); provider.GetRequiredService<CustomRoleManager>());
@ -461,7 +463,7 @@ namespace Microsoft.AspNetCore.Identity.Test
var pwd = "password"; var pwd = "password";
var hashed = "hashed"; var hashed = "hashed";
var rehashed = "rehashed"; var rehashed = "rehashed";
store.Setup(s => s.GetPasswordHashAsync(user, CancellationToken.None)) store.Setup(s => s.GetPasswordHashAsync(user, CancellationToken.None))
.ReturnsAsync(hashed) .ReturnsAsync(hashed)
.Verifiable(); .Verifiable();
@ -679,7 +681,7 @@ namespace Microsoft.AspNetCore.Identity.Test
[Fact] [Fact]
public async Task ResetTokenCallNoopForTokenValueZero() public async Task ResetTokenCallNoopForTokenValueZero()
{ {
var user = new TestUser() { UserName = Guid.NewGuid().ToString()}; var user = new TestUser() { UserName = Guid.NewGuid().ToString() };
var store = new Mock<IUserLockoutStore<TestUser>>(); var store = new Mock<IUserLockoutStore<TestUser>>();
store.Setup(x => x.ResetAccessFailedCountAsync(user, It.IsAny<CancellationToken>())).Returns(() => store.Setup(x => x.ResetAccessFailedCountAsync(user, It.IsAny<CancellationToken>())).Returns(() =>
{ {