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

Make changes to test code to fix warnings from xunit.analyzers

This commit is contained in:
Nate McMaster 2017-08-29 14:22:36 -07:00
parent 55a5001c03
commit dce4f48e73
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs
View File

@ -465,7 +465,7 @@ namespace Microsoft.AspNetCore.Identity.Test
foreach (var r in roles) foreach (var r in roles)
{ {
var expectedRoleName = await roleManager.GetRoleNameAsync(r); var expectedRoleName = await roleManager.GetRoleNameAsync(r);
Assert.True(rs.Any(role => role == expectedRoleName)); Assert.Contains(rs, role => role == expectedRoleName);
} }
} }
} }

16
src/Microsoft.AspNetCore.Identity.Specification.Tests/UserManagerSpecificationTests.cs
View File

@ -563,7 +563,7 @@ namespace Microsoft.AspNetCore.Identity.Test
Assert.False(await manager.CheckPasswordAsync(user, "whatever")); Assert.False(await manager.CheckPasswordAsync(user, "whatever"));
var logins = await manager.GetLoginsAsync(user); var logins = await manager.GetLoginsAsync(user);
Assert.NotNull(logins); Assert.NotNull(logins);
Assert.Equal(0, logins.Count()); Assert.Empty(logins);
} }
/// <summary> /// <summary>
@ -586,7 +586,7 @@ namespace Microsoft.AspNetCore.Identity.Test
IdentityResultAssert.IsSuccess(await manager.AddLoginAsync(user, new UserLoginInfo(provider, providerKey, display))); IdentityResultAssert.IsSuccess(await manager.AddLoginAsync(user, new UserLoginInfo(provider, providerKey, display)));
var logins = await manager.GetLoginsAsync(user); var logins = await manager.GetLoginsAsync(user);
Assert.NotNull(logins); Assert.NotNull(logins);
Assert.Equal(1, logins.Count()); Assert.Single(logins);
Assert.Equal(provider, logins.First().LoginProvider); Assert.Equal(provider, logins.First().LoginProvider);
Assert.Equal(providerKey, logins.First().ProviderKey); Assert.Equal(providerKey, logins.First().ProviderKey);
Assert.Equal(display, logins.First().ProviderDisplayName); Assert.Equal(display, logins.First().ProviderDisplayName);
@ -614,7 +614,7 @@ namespace Microsoft.AspNetCore.Identity.Test
Assert.True(await manager.HasPasswordAsync(user)); Assert.True(await manager.HasPasswordAsync(user));
var logins = await manager.GetLoginsAsync(user); var logins = await manager.GetLoginsAsync(user);
Assert.NotNull(logins); Assert.NotNull(logins);
Assert.Equal(1, logins.Count()); Assert.Single(logins);
Assert.Equal(user, await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey)); Assert.Equal(user, await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey));
Assert.True(await manager.CheckPasswordAsync(user, "password")); Assert.True(await manager.CheckPasswordAsync(user, "password"));
} }
@ -661,7 +661,7 @@ namespace Microsoft.AspNetCore.Identity.Test
Assert.Equal(user, await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey)); Assert.Equal(user, await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey));
var logins = await manager.GetLoginsAsync(user); var logins = await manager.GetLoginsAsync(user);
Assert.NotNull(logins); Assert.NotNull(logins);
Assert.Equal(1, logins.Count()); Assert.Single(logins);
Assert.Equal(login.LoginProvider, logins.Last().LoginProvider); Assert.Equal(login.LoginProvider, logins.Last().LoginProvider);
Assert.Equal(login.ProviderKey, logins.Last().ProviderKey); Assert.Equal(login.ProviderKey, logins.Last().ProviderKey);
Assert.Equal(login.ProviderDisplayName, logins.Last().ProviderDisplayName); Assert.Equal(login.ProviderDisplayName, logins.Last().ProviderDisplayName);
@ -670,7 +670,7 @@ namespace Microsoft.AspNetCore.Identity.Test
Assert.Null(await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey)); Assert.Null(await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey));
logins = await manager.GetLoginsAsync(user); logins = await manager.GetLoginsAsync(user);
Assert.NotNull(logins); Assert.NotNull(logins);
Assert.Equal(0, logins.Count()); Assert.Empty(logins);
Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user)); Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user));
} }
@ -1972,7 +1972,7 @@ namespace Microsoft.AspNetCore.Identity.Test
await manager.UpdateAsync(user); await manager.UpdateAsync(user);
factors = await manager.GetValidTwoFactorProvidersAsync(user); factors = await manager.GetValidTwoFactorProvidersAsync(user);
Assert.NotNull(factors); Assert.NotNull(factors);
Assert.Equal(1, factors.Count()); Assert.Single(factors);
Assert.Equal("Phone", factors[0]); Assert.Equal("Phone", factors[0]);
IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, "test@test.com")); IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, "test@test.com"));
token = await manager.GenerateEmailConfirmationTokenAsync(user); token = await manager.GenerateEmailConfirmationTokenAsync(user);
@ -1983,7 +1983,7 @@ namespace Microsoft.AspNetCore.Identity.Test
IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, null)); IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, null));
factors = await manager.GetValidTwoFactorProvidersAsync(user); factors = await manager.GetValidTwoFactorProvidersAsync(user);
Assert.NotNull(factors); Assert.NotNull(factors);
Assert.Equal(1, factors.Count()); Assert.Single(factors);
Assert.Equal("Phone", factors[0]); Assert.Equal("Phone", factors[0]);
IdentityResultAssert.IsSuccess(await manager.ResetAuthenticatorKeyAsync(user)); IdentityResultAssert.IsSuccess(await manager.ResetAuthenticatorKeyAsync(user));
factors = await manager.GetValidTwoFactorProvidersAsync(user); factors = await manager.GetValidTwoFactorProvidersAsync(user);
@ -2125,4 +2125,4 @@ namespace Microsoft.AspNetCore.Identity.Test
return users; return users;
} }
} }
} }