From 7f421a0403497d2fca0b0f9a44faaecd9aa83abd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 20 Apr 2017 16:50:15 -0700 Subject: [PATCH] Update tests --- .../IdentityBuilderTest.cs | 2 +- .../SecurityStampValidatorTest.cs | 8 ++++---- .../SignInManagerTest.cs | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/Microsoft.AspNetCore.Identity.Test/IdentityBuilderTest.cs b/test/Microsoft.AspNetCore.Identity.Test/IdentityBuilderTest.cs index 83804c9490..e0ea1ca46e 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/IdentityBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/IdentityBuilderTest.cs @@ -303,7 +303,7 @@ namespace Microsoft.AspNetCore.Identity.Test private class MySignInManager : SignInManager { - public MySignInManager(UserManager manager, IHttpContextAccessor context, IUserClaimsPrincipalFactory claimsFactory) : base(manager, context, claimsFactory, null, null) { } + public MySignInManager(UserManager manager, IHttpContextAccessor context, IUserClaimsPrincipalFactory claimsFactory) : base(manager, context, claimsFactory, null, null, null) { } } private class MyUserManager : UserManager diff --git a/test/Microsoft.AspNetCore.Identity.Test/SecurityStampValidatorTest.cs b/test/Microsoft.AspNetCore.Identity.Test/SecurityStampValidatorTest.cs index 0ca44183c7..793fabd211 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/SecurityStampValidatorTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/SecurityStampValidatorTest.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Identity.Test var properties = new AuthenticationProperties { IssuedUtc = DateTimeOffset.UtcNow.AddSeconds(-1), IsPersistent = isPersistent }; var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, options.Object, null); + contextAccessor.Object, claimsManager.Object, options.Object, null, new Mock().Object); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).ReturnsAsync(user).Verifiable(); signInManager.Setup(s => s.CreateUserPrincipalAsync(user)).ReturnsAsync(principal).Verifiable(); var services = new ServiceCollection(); @@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.Identity.Test var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, options.Object, null); + contextAccessor.Object, claimsManager.Object, options.Object, null, new Mock().Object); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).ReturnsAsync(default(TestUser)).Verifiable(); var services = new ServiceCollection(); services.AddSingleton(options.Object); @@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Identity.Test var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, options.Object, null); + contextAccessor.Object, claimsManager.Object, options.Object, null, new Mock().Object); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).ReturnsAsync(default(TestUser)).Verifiable(); var services = new ServiceCollection(); services.AddSingleton(options.Object); @@ -186,7 +186,7 @@ namespace Microsoft.AspNetCore.Identity.Test var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, options.Object, null); + contextAccessor.Object, claimsManager.Object, options.Object, null, new Mock().Object); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).Throws(new Exception("Shouldn't be called")); signInManager.Setup(s => s.SignInAsync(user, false, null)).Throws(new Exception("Shouldn't be called")); var services = new ServiceCollection(); diff --git a/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs b/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs index 8a6bc204bd..328925d6a8 100644 --- a/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs +++ b/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs @@ -68,13 +68,13 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public void ConstructorNullChecks() { - Assert.Throws("userManager", () => new SignInManager(null, null, null, null, null)); + Assert.Throws("userManager", () => new SignInManager(null, null, null, null, null, null)); var userManager = MockHelpers.MockUserManager().Object; - Assert.Throws("contextAccessor", () => new SignInManager(userManager, null, null, null, null)); + Assert.Throws("contextAccessor", () => new SignInManager(userManager, null, null, null, null, null)); var contextAccessor = new Mock(); var context = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); - Assert.Throws("claimsFactory", () => new SignInManager(userManager, contextAccessor.Object, null, null, null)); + Assert.Throws("claimsFactory", () => new SignInManager(userManager, contextAccessor.Object, null, null, null, null)); } //[Fact] @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Identity.Test var claimsFactory = new UserClaimsPrincipalFactory(manager.Object, roleManager.Object, options.Object); var logStore = new StringBuilder(); var logger = MockHelpers.MockILogger>(logStore); - var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); + var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object, new Mock().Object); // Act var result = await helper.PasswordSignInAsync(user.UserName, "bogus", false, false); @@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Identity.Test var claimsFactory = new UserClaimsPrincipalFactory(manager.Object, roleManager.Object, options.Object); var logStore = new StringBuilder(); var logger = MockHelpers.MockILogger>(logStore); - var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); + var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object, new Mock().Object); // Act var result = await helper.CheckPasswordSignInAsync(user, "bogus", false); @@ -186,7 +186,7 @@ namespace Microsoft.AspNetCore.Identity.Test var options = new Mock>(); options.Setup(a => a.Value).Returns(identityOptions); var claimsFactory = new UserClaimsPrincipalFactory(manager, roleManager.Object, options.Object); - var sm = new SignInManager(manager, contextAccessor.Object, claimsFactory, options.Object, null); + var sm = new SignInManager(manager, contextAccessor.Object, claimsFactory, options.Object, null, new Mock().Object); sm.Logger = MockHelpers.MockILogger>(logStore ?? new StringBuilder()).Object; return sm; } @@ -514,7 +514,7 @@ namespace Microsoft.AspNetCore.Identity.Test var signInManager = new Mock>(manager.Object, new HttpContextAccessor { HttpContext = context }, new Mock>().Object, - null, null) + null, null, new Mock().Object) { CallBase = true }; //signInManager.Setup(s => s.SignInAsync(user, It.Is(p => p.IsPersistent == isPersistent), //externalLogin? loginProvider : null)).Returns(Task.FromResult(0)).Verifiable();