From 7e4c168f712e6218fad13345e1c30cefdb544a8d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 28 May 2014 12:37:49 -0700 Subject: [PATCH] Fix tests --- .../InMemoryUserStoreTest.cs | 10 +--- .../SqlUserStoreTest.cs | 1 + .../StartupTest.cs | 17 ++++--- .../InMemoryStoreTest.cs | 1 + .../StartupTest.cs | 51 ++++++++----------- .../SignInManagerTest.cs | 5 +- 6 files changed, 37 insertions(+), 48 deletions(-) diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs index 11273a779b..f8c592a1f7 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs @@ -28,11 +28,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test public async Task CanUseAddedManagerInstance() { var services = new ServiceCollection(); -#if NET45 - // services.AddEntityFramework().AddSqlServer(); - //#else services.AddEntityFramework().AddInMemoryStore(); -#endif services.AddSingleton, OptionsAccessor>(); services.AddInstance(new IdentityContext()); services.AddTransient, InMemoryInMemoryUserStore>(); @@ -47,13 +43,11 @@ namespace Microsoft.AspNet.Identity.Entity.Test public async Task CanCreateUsingAddUserManager() { var services = new ServiceCollection(); -#if NET45 - // services.AddEntityFramework().AddSqlServer(); - //#else services.AddEntityFramework().AddInMemoryStore(); -#endif + // TODO: this needs to construct a new instance of InMemoryStore var store = new InMemoryInMemoryUserStore(new IdentityContext()); + services.Add(OptionsServices.GetDefaultServices()); services.AddIdentity(s => { s.AddUserStore(() => store); diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs index 477d81df7a..cbab9dfd25 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs @@ -32,6 +32,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test builder.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); services.AddEntityFramework().AddSqlServer(); services.AddIdentityEntityFramework(); }); diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs index 33a81269af..ebd734b106 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs @@ -38,8 +38,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test [Fact] public void CanCustomizeIdentityOptions() { - IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); + IBuilder builder = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); builder.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); services.AddIdentity(identityServices => { }); services.AddSetup(); }); @@ -61,8 +62,11 @@ namespace Microsoft.AspNet.Identity.Entity.Test [Fact] public void CanSetupIdentityOptions() { - IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); - app.UseServices(services => services.AddIdentity(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true))); + IBuilder app = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); + app.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); + services.AddIdentity(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true)); + }); var optionsGetter = app.ApplicationServices.GetService>(); Assert.NotNull(optionsGetter); @@ -74,14 +78,11 @@ namespace Microsoft.AspNet.Identity.Entity.Test [Fact] public async Task EnsureStartupUsageWorks() { - IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); - - //builder.UseServices(services => services.AddIdentity(s => - // s.AddEntity() - //{ + IBuilder builder = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); builder.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); services.AddEntityFramework(); services.AddTransient(); services.AddIdentity(s => diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs index c5d5a6ea0f..e0e0d5ff95 100644 --- a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs +++ b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs @@ -13,6 +13,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test protected override UserManager CreateManager() { var services = new ServiceCollection(); + services.Add(OptionsServices.GetDefaultServices()); services.AddTransient, UserValidator>(); services.AddTransient, PasswordValidator>(); var options = new IdentityOptions diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs index 2aa16410b2..a91b73e0bb 100644 --- a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs +++ b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs @@ -16,11 +16,6 @@ namespace Microsoft.AspNet.Identity.InMemory.Test { public class ApplicationUser : IdentityUser { } - public class ApplicationUserManager : UserManager - { - public ApplicationUserManager(IServiceProvider services, IUserStore store, IOptionsAccessor options) : base(services, store, options) { } - } - public class PasswordsNegativeLengthSetup : IOptionsSetup { public int Order { get { return 0; } } @@ -33,8 +28,9 @@ namespace Microsoft.AspNet.Identity.InMemory.Test [Fact] public void CanCustomizeIdentityOptions() { - IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); + var builder = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); builder.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); services.AddIdentity(identityServices => { }); services.AddSetup(); }); @@ -56,8 +52,12 @@ namespace Microsoft.AspNet.Identity.InMemory.Test [Fact] public void CanSetupIdentityOptions() { - IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); - app.UseServices(services => services.AddIdentity(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true))); + var app = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); + app.UseServices(services => + { + services.Add(OptionsServices.GetDefaultServices()); + services.AddIdentity(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true)); + }); var optionsGetter = app.ApplicationServices.GetService>(); Assert.NotNull(optionsGetter); @@ -69,24 +69,18 @@ namespace Microsoft.AspNet.Identity.InMemory.Test [Fact] public async Task EnsureStartupUsageWorks() { - IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); + var builder = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); - //builder.UseServices(services => services.AddIdentity(s => - // s.AddEntity() - //{ - builder.UseServices(services => services.AddIdentity(s => { + services.Add(OptionsServices.GetDefaultServices()); s.AddInMemory(); - s.AddUserManager(); - s.AddRoleManager(); })); var userStore = builder.ApplicationServices.GetService>(); var roleStore = builder.ApplicationServices.GetService>(); - var userManager = builder.ApplicationServices.GetService(); - //TODO: var userManager = builder.ApplicationServices.GetService(); - var roleManager = builder.ApplicationServices.GetService(); + var userManager = builder.ApplicationServices.GetService>(); + var roleManager = builder.ApplicationServices.GetService>(); Assert.NotNull(userStore); Assert.NotNull(userManager); @@ -99,19 +93,18 @@ namespace Microsoft.AspNet.Identity.InMemory.Test [Fact] public void VerifyUseInMemoryLifetimes() { - IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider()); + var builder = new Builder.Builder(new ServiceCollection().BuildServiceProvider()); builder.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); services.AddIdentity(s => s.AddInMemory()); - services.AddTransient(); - services.AddTransient(); }); var userStore = builder.ApplicationServices.GetService>(); var roleStore = builder.ApplicationServices.GetService>(); - var userManager = builder.ApplicationServices.GetService(); - var roleManager = builder.ApplicationServices.GetService(); + var userManager = builder.ApplicationServices.GetService>(); + var roleManager = builder.ApplicationServices.GetService>(); Assert.NotNull(userStore); Assert.NotNull(userManager); @@ -120,13 +113,13 @@ namespace Microsoft.AspNet.Identity.InMemory.Test var userStore2 = builder.ApplicationServices.GetService>(); var roleStore2 = builder.ApplicationServices.GetService>(); - var userManager2 = builder.ApplicationServices.GetService(); - var roleManager2 = builder.ApplicationServices.GetService(); + var userManager2 = builder.ApplicationServices.GetService>(); + var roleManager2 = builder.ApplicationServices.GetService>(); Assert.Equal(userStore, userStore2); - Assert.NotEqual(userManager, userManager2); + Assert.Equal(userManager, userManager2); Assert.Equal(roleStore, roleStore2); - Assert.NotEqual(roleManager, roleManager2); + Assert.Equal(roleManager, roleManager2); } @@ -135,8 +128,8 @@ namespace Microsoft.AspNet.Identity.InMemory.Test const string userName = "admin"; const string roleName = "Admins"; const string password = "1qaz@WSX"; - var userManager = serviceProvider.GetService(); - var roleManager = serviceProvider.GetService(); + var userManager = serviceProvider.GetService>(); + var roleManager = serviceProvider.GetService>(); var user = new ApplicationUser { UserName = userName }; IdentityResultAssert.IsSuccess(await userManager.CreateAsync(user, password)); diff --git a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs index c93ad2c717..4076374a79 100644 --- a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs +++ b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs @@ -5,14 +5,12 @@ using System; using System.Threading; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Security; -using Microsoft.AspNet.Identity.InMemory; using Microsoft.AspNet.Identity.Test; -using Microsoft.AspNet.PipelineCore; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Security.Cookies; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Framework.Logging; +using Microsoft.Framework.OptionsModel; using Moq; using System.Security.Claims; using System.Threading.Tasks; @@ -43,6 +41,7 @@ namespace Microsoft.AspNet.Identity.Security.Test contextAccessor.Setup(a => a.Value).Returns(context.Object); app.UseServices(services => { + services.Add(OptionsServices.GetDefaultServices()); services.AddInstance(contextAccessor.Object); services.AddInstance(new NullLoggerFactory()); services.AddIdentity(s =>