From a8fd7f4ec959d3166958f08d547c66d3d0ed1440 Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Wed, 13 Mar 2019 08:50:46 -0700 Subject: [PATCH] Add MemoryCache services where needed Previously the tests were relying on EF adding the services. See https://github.com/aspnet/EntityFrameworkCore/issues/14756 and https://github.com/aspnet/AspNetCore/issues/7728 --- .../test/MusicStore.Test/CartSummaryComponentTest.cs | 5 ++++- .../test/MusicStore.Test/CheckoutControllerTest.cs | 7 +++++-- .../test/MusicStore.Test/GenreMenuComponentTest.cs | 5 ++++- src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs | 7 +++++-- .../test/MusicStore.Test/ManageControllerTest.cs | 3 ++- .../test/MusicStore.Test/Models/ShoppingCartTest.cs | 7 +++++-- .../test/MusicStore.Test/ShoppingCartControllerTest.cs | 2 ++ src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs | 7 +++++-- 8 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs b/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs index c0ad44d768..c5ba830c80 100644 --- a/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -22,7 +22,10 @@ namespace MusicStore.Components var services = new ServiceCollection(); - services.AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); + services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs b/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs index 42a9727391..e978410877 100644 --- a/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs @@ -25,7 +25,10 @@ namespace MusicStore.Controllers var services = new ServiceCollection(); - services.AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); + services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } @@ -248,4 +251,4 @@ namespace MusicStore.Controllers return cartItems; } } -} \ No newline at end of file +} diff --git a/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs b/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs index 3910ed641d..30ac743ec0 100644 --- a/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -20,7 +20,10 @@ namespace MusicStore.Components var services = new ServiceCollection(); - services.AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); + services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs b/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs index 3ddc79aa54..3a12ab8f3a 100644 --- a/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs @@ -22,7 +22,10 @@ namespace MusicStore.Controllers var services = new ServiceCollection(); - services.AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); + services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } @@ -125,4 +128,4 @@ namespace MusicStore.Controllers } } } -} \ No newline at end of file +} diff --git a/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs b/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs index 81ae1367ea..459f91db33 100644 --- a/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs @@ -27,6 +27,7 @@ namespace MusicStore.Controllers services.AddSingleton(new ConfigurationBuilder().Build()); services.AddOptions(); services + .AddMemoryCache() .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services.AddIdentity() @@ -117,4 +118,4 @@ namespace MusicStore.Controllers } } -} \ No newline at end of file +} diff --git a/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs b/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs index f445a457c3..58dd56c9a8 100644 --- a/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs +++ b/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // See License.txt in the project root for license information using System; @@ -50,7 +50,10 @@ namespace MusicStore.Test var services = new ServiceCollection(); - services.AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); + services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } diff --git a/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs b/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs index 1eb5a233f4..1306b48475 100644 --- a/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -28,6 +28,8 @@ namespace MusicStore.Controllers var services = new ServiceCollection(); services + .AddMemoryCache() + .AddLogging() .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services.AddMvc(); diff --git a/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs b/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs index 9c305ada94..e7c278bf12 100644 --- a/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs @@ -22,7 +22,10 @@ namespace MusicStore.Controllers var services = new ServiceCollection(); - services.AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); + services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); _serviceProvider = services.BuildServiceProvider(); } @@ -176,4 +179,4 @@ namespace MusicStore.Controllers return generes.ToArray(); } } -} \ No newline at end of file +}