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
This commit is contained in:
Arthur Vickers 2019-03-13 08:50:46 -07:00
parent 9791f5e244
commit a8fd7f4ec9
8 changed files with 32 additions and 11 deletions

View File

@ -22,7 +22,10 @@ namespace MusicStore.Components
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

View File

@ -25,7 +25,10 @@ namespace MusicStore.Controllers
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }
@ -248,4 +251,4 @@ namespace MusicStore.Controllers
return cartItems; return cartItems;
} }
} }
} }

View File

@ -20,7 +20,10 @@ namespace MusicStore.Components
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

View File

@ -22,7 +22,10 @@ namespace MusicStore.Controllers
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }
@ -125,4 +128,4 @@ namespace MusicStore.Controllers
} }
} }
} }
} }

View File

@ -27,6 +27,7 @@ namespace MusicStore.Controllers
services.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build()); services.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build());
services.AddOptions(); services.AddOptions();
services services
.AddMemoryCache()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); .AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
services.AddIdentity<ApplicationUser, IdentityRole>() services.AddIdentity<ApplicationUser, IdentityRole>()
@ -117,4 +118,4 @@ namespace MusicStore.Controllers
} }
} }
} }

View File

@ -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 // See License.txt in the project root for license information
using System; using System;
@ -50,7 +50,10 @@ namespace MusicStore.Test
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

View File

@ -28,6 +28,8 @@ namespace MusicStore.Controllers
var services = new ServiceCollection(); var services = new ServiceCollection();
services services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); .AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
services.AddMvc(); services.AddMvc();

View File

@ -22,7 +22,10 @@ namespace MusicStore.Controllers
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); services
.AddMemoryCache()
.AddLogging()
.AddDbContext<MusicStoreContext>(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider));
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }
@ -176,4 +179,4 @@ namespace MusicStore.Controllers
return generes.ToArray(); return generes.ToArray();
} }
} }
} }