From 0f5bc9dac824d8de5f4bf8c14b184522802e7ee2 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 23 Aug 2017 14:51:39 -0700 Subject: [PATCH] Upgrade to xunit 2.3.0-beta4 (#1393) --- build/dependencies.props | 5 +++-- ...etCore.Identity.EntityFrameworkCore.Test.csproj | 1 + .../SqlStoreTestBase.cs | 10 +++++----- ...ft.AspNetCore.Identity.Service.Core.Test.csproj | 1 + ...ervice.EntityFrameworkCore.InMemory.Test.csproj | 3 ++- ...dentity.Service.EntityFrameworkCore.Test.csproj | 1 + .../IdentityResultTest.cs | 6 +++--- .../PasswordValidatorTest.cs | 2 +- .../SignInManagerTest.cs | 14 ++++++++++---- .../UserClaimsPrincipalFactoryTest.cs | 8 ++++---- 10 files changed, 31 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 19c554c167..a7ade93b2d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -12,8 +12,9 @@ 2.0.0-* 3.0.1 2.0.0-* - 15.3.0-* - 2.3.0-beta2-* + 15.3.0 + 0.6.1 + 2.3.0-beta4-build3742 2.2.0 diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj index 146f87fedc..20c4c6d9f0 100644 --- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj @@ -31,6 +31,7 @@ + diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs index 9a5b3edabc..01360fd421 100644 --- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs +++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs @@ -205,14 +205,14 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test IdentityResultAssert.IsSuccess(await userMgr.CreateAsync(user)); IdentityResultAssert.IsSuccess(await userMgr.AddToRoleAsync(user, roleName)); var roles = await userMgr.GetRolesAsync(user); - Assert.Equal(1, roles.Count()); + Assert.Single(roles); IdentityResultAssert.IsSuccess(await roleMgr.DeleteAsync(role)); Assert.Null(await roleMgr.FindByNameAsync(roleName)); Assert.False(await roleMgr.RoleExistsAsync(roleName)); // REVIEW: We should throw if deleteing a non empty role? roles = await userMgr.GetRolesAsync(user); - Assert.Equal(0, roles.Count()); + Assert.Empty(roles); } [ConditionalFact] @@ -233,12 +233,12 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test IdentityResultAssert.IsSuccess(await userMgr.AddToRoleAsync(user, roleName)); var roles = await userMgr.GetRolesAsync(user); - Assert.Equal(1, roles.Count()); + Assert.Single(roles); IdentityResultAssert.IsSuccess(await userMgr.DeleteAsync(user)); roles = await userMgr.GetRolesAsync(user); - Assert.Equal(0, roles.Count()); + Assert.Empty(roles); } [ConditionalFact] @@ -387,4 +387,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test Assert.Equal(2, (await manager.GetRolesAsync(userByEmail)).Count); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj index 68623b6b39..8cce28ad73 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj @@ -16,6 +16,7 @@ + diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj index 8bd9f282e3..34834e83a1 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj @@ -26,7 +26,8 @@ + - \ No newline at end of file + diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj index 8d46aaba55..6cd81ab932 100644 --- a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj +++ b/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj @@ -34,6 +34,7 @@ + diff --git a/test/Microsoft.AspNetCore.Identity.Test/IdentityResultTest.cs b/test/Microsoft.AspNetCore.Identity.Test/IdentityResultTest.cs index 19d2c727ad..cfb04b5b62 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/IdentityResultTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/IdentityResultTest.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Identity.Test { var result = new IdentityResult(); Assert.False(result.Succeeded); - Assert.Equal(0, result.Errors.Count()); + Assert.Empty(result.Errors); } [Fact] @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Identity.Test { var result = IdentityResult.Failed(); Assert.False(result.Succeeded); - Assert.Equal(0, result.Errors.Count()); + Assert.Empty(result.Errors); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNetCore.Identity.Test/PasswordValidatorTest.cs b/test/Microsoft.AspNetCore.Identity.Test/PasswordValidatorTest.cs index 80fd04506f..36897ad437 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/PasswordValidatorTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/PasswordValidatorTest.cs @@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Identity.Test IdentityResultAssert.IsFailure(result); foreach (var error in errors) { - Assert.True(result.Errors.Any(e => e.Description == error)); + Assert.Contains(result.Errors, e => e.Description == error); } } } diff --git a/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs b/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs index 9336bcc5e5..cfec3620cb 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs @@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Identity.Test // Assert Assert.False(result.Succeeded); Assert.True(result.IsLockedOut); - Assert.True(logStore.ToString().Contains($"User {user.Id} is currently locked out.")); + Assert.Contains($"User {user.Id} is currently locked out.", logStore.ToString()); manager.Verify(); } @@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Identity.Test // Assert Assert.False(result.Succeeded); Assert.True(result.IsLockedOut); - Assert.True(logStore.ToString().Contains($"User {user.Id} is currently locked out.")); + Assert.Contains($"User {user.Id} is currently locked out.", logStore.ToString()); manager.Verify(); } @@ -493,7 +493,13 @@ namespace Microsoft.AspNetCore.Identity.Test [InlineData(true, false)] [InlineData(false, true)] [InlineData(false, false)] - public async Task CanResignIn(bool isPersistent, bool externalLogin) + public async Task CanResignIn( + // Suppress warning that says theory methods should use all of their parameters. + // See comments below about why this isn't used. +#pragma warning disable xUnit1026 + bool isPersistent, +#pragma warning restore xUnit1026 + bool externalLogin) { // Setup var user = new TestUser { UserName = "Foo" }; @@ -707,7 +713,7 @@ namespace Microsoft.AspNetCore.Identity.Test // Assert Assert.False(result.Succeeded); Assert.False(checkResult.Succeeded); - Assert.True(logStore.ToString().Contains($"User {user.Id} failed to provide the correct password.")); + Assert.Contains($"User {user.Id} failed to provide the correct password.", logStore.ToString()); manager.Verify(); context.Verify(); } diff --git a/test/Microsoft.AspNetCore.Identity.Test/UserClaimsPrincipalFactoryTest.cs b/test/Microsoft.AspNetCore.Identity.Test/UserClaimsPrincipalFactoryTest.cs index cbd8ba62d0..3af673d10d 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/UserClaimsPrincipalFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/UserClaimsPrincipalFactoryTest.cs @@ -83,13 +83,13 @@ namespace Microsoft.AspNetCore.Identity.Test // Assert var manager = userManager.Object; Assert.NotNull(identity); - Assert.Equal(1, principal.Identities.Count()); + Assert.Single(principal.Identities); Assert.Equal(IdentityConstants.ApplicationScheme, identity.AuthenticationType); var claims = identity.Claims.ToList(); Assert.NotNull(claims); - Assert.True( - claims.Any(c => c.Type == manager.Options.ClaimsIdentity.UserNameClaimType && c.Value == user.UserName)); - Assert.True(claims.Any(c => c.Type == manager.Options.ClaimsIdentity.UserIdClaimType && c.Value == user.Id)); + Assert.Contains( + claims, c => c.Type == manager.Options.ClaimsIdentity.UserNameClaimType && c.Value == user.UserName); + Assert.Contains(claims, c => c.Type == manager.Options.ClaimsIdentity.UserIdClaimType && c.Value == user.Id); Assert.Equal(supportRoles, claims.Any(c => c.Type == manager.Options.ClaimsIdentity.RoleClaimType && c.Value == "Admin")); Assert.Equal(supportRoles, claims.Any(c => c.Type == manager.Options.ClaimsIdentity.RoleClaimType && c.Value == "Local")); foreach (var cl in userClaims)