From 98c69c3c4b90a16ae19e6423f4f65dda32cf3aee Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Wed, 16 Mar 2016 09:18:07 -0700 Subject: [PATCH] Use separate service providers --- shared/Mocks/StartupOpenIdConnectTesting.cs | 6 ++---- shared/Mocks/StartupSocialTesting.cs | 6 ++---- src/MusicStore/Startup.cs | 6 ++---- src/MusicStore/StartupOpenIdConnect.cs | 6 ++---- test/MusicStore.Test/CartSummaryComponentTest.cs | 7 +++---- test/MusicStore.Test/CheckoutControllerTest.cs | 7 +++---- test/MusicStore.Test/GenreMenuComponentTest.cs | 8 ++++---- test/MusicStore.Test/HomeControllerTest.cs | 7 +++---- test/MusicStore.Test/ManageControllerTest.cs | 5 +++-- test/MusicStore.Test/Models/ShoppingCartTest.cs | 9 +++++---- test/MusicStore.Test/ShoppingCartControllerTest.cs | 7 +++---- test/MusicStore.Test/StoreControllerTest.cs | 7 +++---- 12 files changed, 35 insertions(+), 46 deletions(-) diff --git a/shared/Mocks/StartupOpenIdConnectTesting.cs b/shared/Mocks/StartupOpenIdConnectTesting.cs index 0f200207ef..7bfbbf3d0b 100644 --- a/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -47,10 +47,8 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/shared/Mocks/StartupSocialTesting.cs b/shared/Mocks/StartupSocialTesting.cs index 8159e0536d..c37ea2967d 100644 --- a/shared/Mocks/StartupSocialTesting.cs +++ b/shared/Mocks/StartupSocialTesting.cs @@ -53,10 +53,8 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index c962cb78a6..921d2b6452 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -42,10 +42,8 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index b1b4172d23..a833f15d42 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -57,10 +57,8 @@ namespace MusicStore // Add EF services to the services container if (useInMemoryStore) { - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs index 9d837ebf98..30cfcf13e0 100644 --- a/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -19,12 +19,11 @@ namespace MusicStore.Components public CartSummaryComponentTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs index e9b2d1babf..d9280850c8 100644 --- a/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/test/MusicStore.Test/CheckoutControllerTest.cs @@ -21,12 +21,11 @@ namespace MusicStore.Controllers public CheckoutControllerTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/GenreMenuComponentTest.cs b/test/MusicStore.Test/GenreMenuComponentTest.cs index 31dfa47fa7..b914cb886d 100644 --- a/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -16,11 +16,11 @@ namespace MusicStore.Components public GenreMenuComponentTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs index 5f51001276..16c7cba620 100644 --- a/test/MusicStore.Test/HomeControllerTest.cs +++ b/test/MusicStore.Test/HomeControllerTest.cs @@ -17,12 +17,11 @@ namespace MusicStore.Controllers public HomeControllerTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs index f4036be143..b4a3c5fbce 100644 --- a/test/MusicStore.Test/ManageControllerTest.cs +++ b/test/MusicStore.Test/ManageControllerTest.cs @@ -23,11 +23,12 @@ namespace MusicStore.Controllers public ManageControllerTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); services.AddOptions(); services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + .AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); services.AddIdentity() .AddEntityFrameworkStores(); diff --git a/test/MusicStore.Test/Models/ShoppingCartTest.cs b/test/MusicStore.Test/Models/ShoppingCartTest.cs index 97ac72b4a4..9d30f40059 100644 --- a/test/MusicStore.Test/Models/ShoppingCartTest.cs +++ b/test/MusicStore.Test/Models/ShoppingCartTest.cs @@ -45,11 +45,12 @@ namespace MusicStore.Test public ShoppingCartFixture() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); + _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index ff0ed55779..6b1651420f 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -24,12 +24,11 @@ namespace MusicStore.Controllers public ShoppingCartControllerTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); services.AddMvc(); diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs index 8694c1b3d0..9e9d955455 100644 --- a/test/MusicStore.Test/StoreControllerTest.cs +++ b/test/MusicStore.Test/StoreControllerTest.cs @@ -17,12 +17,11 @@ namespace MusicStore.Controllers public StoreControllerTest() { + var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); + var services = new ServiceCollection(); - services.AddOptions(); - services - .AddEntityFrameworkInMemoryDatabase() - .AddDbContext((p, b) => b.UseInMemoryDatabase().UseInternalServiceProvider(p)); + services.AddDbContext(b => b.UseInMemoryDatabase().UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); }