From e9106fdfa9df5614b216b527c48b8d37bc5a31ed Mon Sep 17 00:00:00 2001
From: ajcvickers <ajcvickers@hotmail.com>
Date: Thu, 8 May 2014 16:02:23 -0700
Subject: [PATCH] Updating AddEntityFramework call to not use nested closure.

---
 .../InMemoryUserStoreTest.cs                         | 12 +++++++-----
 .../RoleStoreTest.cs                                 |  8 ++++----
 .../SqlUserStoreTest.cs                              | 12 ++++++------
 .../TestIdentityFactory.cs                           |  9 +++++----
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs
index 8148e838ce..2877f2f897 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs
@@ -44,9 +44,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         {
             var services = new ServiceCollection();
 #if NET45
-            //            services.AddEntityFramework(s => s.AddSqlServer());
+            //            services.AddEntityFramework().AddSqlServer();
             //#else
-            services.AddEntityFramework(s => s.AddInMemoryStore());
+            services.AddEntityFramework().AddInMemoryStore();
 #endif
             services.AddSingleton<IOptionsAccessor<IdentityOptions>, OptionsAccessor<IdentityOptions>>();
             services.AddInstance<DbContext>(new IdentityContext());
@@ -63,9 +63,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         {
             var services = new ServiceCollection();
 #if NET45
-            //            services.AddEntityFramework(s => s.AddSqlServer());
+            //            services.AddEntityFramework().AddSqlServer();
             //#else
-            services.AddEntityFramework(s => s.AddInMemoryStore());
+            services.AddEntityFramework().AddInMemoryStore();
 #endif
             // TODO: this needs to construct a new instance of InMemoryStore
             var store = new InMemoryInMemoryUserStore(new IdentityContext());
@@ -205,7 +205,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         {
             // TODO: Should be possible to do this without creating the provider externally, but
             // that is currently not working. Will be investigated.
-            var provider = new ServiceCollection().AddEntityFramework(s => s.AddInMemoryStore()).BuildServiceProvider();
+            var services = new ServiceCollection();
+            services.AddEntityFramework().AddInMemoryStore();
+            var provider = services.BuildServiceProvider();
 
             using (var db = new IdentityContext(provider))
             {
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
index 0b7a62d3db..fd2c85d0de 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
@@ -38,9 +38,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         {
             var services = new ServiceCollection();
 #if NET45
-            //            services.AddEntityFramework(s => s.AddSqlServer());
+            //            services.AddEntityFramework().AddSqlServer();
             //#else
-            services.AddEntityFramework(s => s.AddInMemoryStore());
+            services.AddEntityFramework().AddInMemoryStore();
 #endif
             // TODO: this should construct a new instance of InMemoryStore
             var store = new EntityRoleStore<EntityRole>(new IdentityContext());
@@ -60,9 +60,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         {
             var services = new ServiceCollection();
 #if NET45
-//            services.AddEntityFramework(s => s.AddSqlServer());
+//            services.AddEntityFramework().AddSqlServer())
 //#else
-            services.AddEntityFramework(s => s.AddInMemoryStore());
+            services.AddEntityFramework().AddInMemoryStore();
 #endif
             services.AddTransient<DbContext, IdentityContext>();
             services.AddTransient<IRoleStore<EntityRole>, EntityRoleStore<EntityRole>>();
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs
index 11c4a6d154..b2d220b1e2 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs
@@ -97,9 +97,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
 
         public static IdentitySqlContext CreateContext()
         {
-            var serviceProvider = new ServiceCollection()
-                .AddEntityFramework(s => s.AddSqlServer())
-                .BuildServiceProvider();
+            var services = new ServiceCollection();
+            services.AddEntityFramework().AddSqlServer();
+            var services.BuildServiceProvider();
 
             var db = new IdentitySqlContext(serviceProvider);
 
@@ -115,9 +115,9 @@ namespace Microsoft.AspNet.Identity.Entity.Test
 
         public static ApplicationDbContext CreateAppContext()
         {
-            var serviceProvider = new ServiceCollection()
-                .AddEntityFramework(s => s.AddSqlServer())
-                .BuildServiceProvider();
+            var services = new ServiceCollection();
+            services.AddEntityFramework().AddSqlServer();
+            var serviceProvider = services.BuildServiceProvider();
 
             var db = new ApplicationDbContext(serviceProvider);
 
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs b/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
index b8e76f18ee..ee3bc4d055 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
@@ -35,13 +35,14 @@ namespace Microsoft.AspNet.Identity.Entity.Test
     {
         public static IdentityContext CreateContext()
         {
-            var serviceProvider = new ServiceCollection()
+            var services = new ServiceCollection();
+            
 //#if NET45
-//                .AddEntityFramework(s => s.AddSqlServer())
+//            services.AddEntityFramework().AddSqlServer();
 //#else
-                .AddEntityFramework(s => s.AddInMemoryStore())
+            services.AddEntityFramework().AddInMemoryStore();
 //#endif
-                .BuildServiceProvider();
+            var serviceProvider = services.BuildServiceProvider();
 
             var db = new IdentityContext(serviceProvider);