Fix tests broken by logging change aspnet/Logging#480

Author: Nate McMaster

test/Shared/IdentityResultAssert.cs

@@ -42,7 +42,7 @@ public static void VerifyLogMessage(ILogger logger, string expectedLog)
             var testlogger = logger as ITestLogger;
             if (testlogger != null)
             {
-                Assert.True(testlogger.LogMessages.Contains(expectedLog));
+                Assert.Contains(expectedLog, testlogger.LogMessages);
             }
             else
             {

test/Shared/UserManagerTestBase.cs

@@ -28,6 +28,8 @@ public abstract class UserManagerTestBase<TUser, TRole, TKey>
         where TRole : class
         where TKey : IEquatable<TKey>
     {
+        private const string NullValue = "(null)";
+
         private readonly IdentityErrorDescriber _errorDescriber = new IdentityErrorDescriber();
 
         protected virtual bool ShouldSkipDbTests()
@@ -266,7 +268,7 @@ public async Task UserValidatorCanBlockCreate()
             manager.UserValidators.Clear();
             manager.UserValidators.Add(new AlwaysBadValidator());
             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]
@@ -282,7 +284,7 @@ public async Task UserValidatorCanBlockUpdate()
             manager.UserValidators.Clear();
             manager.UserValidators.Add(new AlwaysBadValidator());
             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]
@@ -299,7 +301,7 @@ public async Task CanChainUserValidators()
             manager.UserValidators.Add(new AlwaysBadValidator());
             var result = await manager.CreateAsync(user);
             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());
         }
 
@@ -384,7 +386,7 @@ public async Task PasswordValidatorCanBlockChangePassword()
             manager.PasswordValidators.Add(new AlwaysBadValidator());
             IdentityResultAssert.IsFailure(await manager.ChangePasswordAsync(user, "password", "new"),
                 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]
@@ -399,7 +401,7 @@ public async Task PasswordValidatorCanBlockCreateUser()
             manager.PasswordValidators.Clear();
             manager.PasswordValidators.Add(new AlwaysBadValidator());
             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]
@@ -1248,7 +1250,7 @@ public async Task BadValidatorBlocksCreateRole()
             var role = CreateTestRole("blocked");
             IdentityResultAssert.IsFailure(await manager.CreateAsync(role),
                 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]
@@ -1265,7 +1267,7 @@ public async Task CanChainRoleValidators()
             var role = CreateTestRole("blocked");
             var result = await manager.CreateAsync(role);
             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());
         }
 
@@ -1283,7 +1285,7 @@ public async Task BadValidatorBlocksRoleUpdate()
             manager.RoleValidators.Clear();
             manager.RoleValidators.Add(new AlwaysBadValidator());
             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]