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

Fix tests broken by logging change aspnet/Logging#480

This commit is contained in:
Nate McMaster 2016-08-26 11:48:00 -07:00
parent eabec2b476
commit c0ce322e71
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Shared/IdentityResultAssert.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Identity.Test
var testlogger = logger as ITestLogger; var testlogger = logger as ITestLogger;
if (testlogger != null) if (testlogger != null)
{ {
Assert.True(testlogger.LogMessages.Contains(expectedLog)); Assert.Contains(expectedLog, testlogger.LogMessages);
} }
else else
{ {

18
test/Shared/UserManagerTestBase.cs
View File

@ -28,6 +28,8 @@ namespace Microsoft.AspNetCore.Identity.Test
where TRole : class where TRole : class
where TKey : IEquatable<TKey> where TKey : IEquatable<TKey>
{ {
private const string NullValue = "(null)";
private readonly IdentityErrorDescriber _errorDescriber = new IdentityErrorDescriber(); private readonly IdentityErrorDescriber _errorDescriber = new IdentityErrorDescriber();
protected virtual bool ShouldSkipDbTests() protected virtual bool ShouldSkipDbTests()
@ -266,7 +268,7 @@ namespace Microsoft.AspNetCore.Identity.Test
manager.UserValidators.Clear(); manager.UserValidators.Clear();
manager.UserValidators.Add(new AlwaysBadValidator()); manager.UserValidators.Add(new AlwaysBadValidator());
IdentityResultAssert.IsFailure(await manager.CreateAsync(user), AlwaysBadValidator.ErrorMessage); IdentityResultAssert.IsFailure(await manager.CreateAsync(user), AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user)} validation failed: {AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user) ?? NullValue} validation failed: {AlwaysBadValidator.ErrorMessage.Code}.");
} }
[Fact] [Fact]
@ -282,7 +284,7 @@ namespace Microsoft.AspNetCore.Identity.Test
manager.UserValidators.Clear(); manager.UserValidators.Clear();
manager.UserValidators.Add(new AlwaysBadValidator()); manager.UserValidators.Add(new AlwaysBadValidator());
IdentityResultAssert.IsFailure(await manager.UpdateAsync(user), AlwaysBadValidator.ErrorMessage); IdentityResultAssert.IsFailure(await manager.UpdateAsync(user), AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user)} validation failed: {AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user) ?? NullValue} validation failed: {AlwaysBadValidator.ErrorMessage.Code}.");
} }
[Fact] [Fact]
@ -299,7 +301,7 @@ namespace Microsoft.AspNetCore.Identity.Test
manager.UserValidators.Add(new AlwaysBadValidator()); manager.UserValidators.Add(new AlwaysBadValidator());
var result = await manager.CreateAsync(user); var result = await manager.CreateAsync(user);
IdentityResultAssert.IsFailure(result, AlwaysBadValidator.ErrorMessage); IdentityResultAssert.IsFailure(result, AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user)} validation failed: {AlwaysBadValidator.ErrorMessage.Code};{AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user) ?? NullValue} validation failed: {AlwaysBadValidator.ErrorMessage.Code};{AlwaysBadValidator.ErrorMessage.Code}.");
Assert.Equal(2, result.Errors.Count()); Assert.Equal(2, result.Errors.Count());
} }
@ -384,7 +386,7 @@ namespace Microsoft.AspNetCore.Identity.Test
manager.PasswordValidators.Add(new AlwaysBadValidator()); manager.PasswordValidators.Add(new AlwaysBadValidator());
IdentityResultAssert.IsFailure(await manager.ChangePasswordAsync(user, "password", "new"), IdentityResultAssert.IsFailure(await manager.ChangePasswordAsync(user, "password", "new"),
AlwaysBadValidator.ErrorMessage); AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user)} password validation failed: {AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user) ?? NullValue} password validation failed: {AlwaysBadValidator.ErrorMessage.Code}.");
} }
[Fact] [Fact]
@ -399,7 +401,7 @@ namespace Microsoft.AspNetCore.Identity.Test
manager.PasswordValidators.Clear(); manager.PasswordValidators.Clear();
manager.PasswordValidators.Add(new AlwaysBadValidator()); manager.PasswordValidators.Add(new AlwaysBadValidator());
IdentityResultAssert.IsFailure(await manager.CreateAsync(user, "password"), AlwaysBadValidator.ErrorMessage); IdentityResultAssert.IsFailure(await manager.CreateAsync(user, "password"), AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user)} password validation failed: {AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"User {await manager.GetUserIdAsync(user) ?? NullValue} password validation failed: {AlwaysBadValidator.ErrorMessage.Code}.");
} }
[Fact] [Fact]
@ -1248,7 +1250,7 @@ namespace Microsoft.AspNetCore.Identity.Test
var role = CreateTestRole("blocked"); var role = CreateTestRole("blocked");
IdentityResultAssert.IsFailure(await manager.CreateAsync(role), IdentityResultAssert.IsFailure(await manager.CreateAsync(role),
AlwaysBadValidator.ErrorMessage); AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"Role {await manager.GetRoleIdAsync(role)} validation failed: {AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"Role {await manager.GetRoleIdAsync(role) ?? NullValue} validation failed: {AlwaysBadValidator.ErrorMessage.Code}.");
} }
[Fact] [Fact]
@ -1265,7 +1267,7 @@ namespace Microsoft.AspNetCore.Identity.Test
var role = CreateTestRole("blocked"); var role = CreateTestRole("blocked");
var result = await manager.CreateAsync(role); var result = await manager.CreateAsync(role);
IdentityResultAssert.IsFailure(result, AlwaysBadValidator.ErrorMessage); IdentityResultAssert.IsFailure(result, AlwaysBadValidator.ErrorMessage);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"Role {await manager.GetRoleIdAsync(role)} validation failed: {AlwaysBadValidator.ErrorMessage.Code};{AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"Role {await manager.GetRoleIdAsync(role) ?? NullValue} validation failed: {AlwaysBadValidator.ErrorMessage.Code};{AlwaysBadValidator.ErrorMessage.Code}.");
Assert.Equal(2, result.Errors.Count()); Assert.Equal(2, result.Errors.Count());
} }
@ -1283,7 +1285,7 @@ namespace Microsoft.AspNetCore.Identity.Test
manager.RoleValidators.Clear(); manager.RoleValidators.Clear();
manager.RoleValidators.Add(new AlwaysBadValidator()); manager.RoleValidators.Add(new AlwaysBadValidator());
IdentityResultAssert.IsFailure(await manager.UpdateAsync(role), error); IdentityResultAssert.IsFailure(await manager.UpdateAsync(role), error);
IdentityResultAssert.VerifyLogMessage(manager.Logger, $"Role {await manager.GetRoleIdAsync(role)} validation failed: {AlwaysBadValidator.ErrorMessage.Code}."); IdentityResultAssert.VerifyLogMessage(manager.Logger, $"Role {await manager.GetRoleIdAsync(role) ?? NullValue} validation failed: {AlwaysBadValidator.ErrorMessage.Code}.");
} }
[Fact] [Fact]