Validate scopes when building service providers in tests (#25438)

dotnet · Aug 6, 2021 · 018b50b · 018b50b
1 parent 2053a66
commit 018b50b
Show file tree

Hide file tree

Showing 66 changed files with 298 additions and 305 deletions.
diff --git a/test/EFCore.CrossStore.FunctionalTests/ConfigurationPatternsTest.cs b/test/EFCore.CrossStore.FunctionalTests/ConfigurationPatternsTest.cs
@@ -25,11 +25,14 @@ public ConfigurationPatternsTest(CrossStoreFixture fixture)
         [ConditionalFact]
         public void Can_register_multiple_context_types()
         {
-            var serviceProvider = new ServiceCollection()
+            using var scope = new ServiceCollection()
                 .AddDbContext<MultipleContext1>()
                 .AddDbContext<MultipleContext2>()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true)
+                .CreateScope();
 
+            var serviceProvider = scope.ServiceProvider;
+
             using (var context = serviceProvider.GetRequiredService<MultipleContext1>())
             {
                 Assert.True(context.SimpleEntities.Any());
@@ -102,7 +105,7 @@ var serviceProvider
                 = new ServiceCollection()
                     .AddScoped<SomeService>()
                     .AddDbContext<MultipleProvidersContext>()
-                    .BuildServiceProvider();
+                    .BuildServiceProvider(validateScopes: true);
 
             MultipleProvidersContext context1;
             MultipleProvidersContext context2;

diff --git a/test/EFCore.CrossStore.FunctionalTests/ProviderSpecificServicesTest.cs b/test/EFCore.CrossStore.FunctionalTests/ProviderSpecificServicesTest.cs
@@ -17,7 +17,7 @@ public void Throws_with_new_when_non_relational_provider_in_use()
                 .UseInternalServiceProvider(
                     new ServiceCollection()
                         .AddEntityFrameworkInMemoryDatabase()
-                        .BuildServiceProvider())
+                        .BuildServiceProvider(validateScopes: true))
                 .UseInMemoryDatabase(Guid.NewGuid().ToString())
                 .Options;
 
@@ -34,7 +34,7 @@ public void Throws_with_add_when_non_relational_provider_in_use()
                 .AddEntityFrameworkInMemoryDatabase()
                 .AddDbContext<ConstructorTestContext1A>(
                     (p, b) => b.UseInMemoryDatabase(Guid.NewGuid().ToString()).UseInternalServiceProvider(p))
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             using var serviceScope = appServiceProvider
                 .GetRequiredService<IServiceScopeFactory>()

diff --git a/test/EFCore.Design.Tests/Design/DesignTimeServicesTest.cs b/test/EFCore.Design.Tests/Design/DesignTimeServicesTest.cs
@@ -239,7 +239,7 @@ private ServiceProvider CreateDesignServiceProvider(
                     .CreateServiceCollection("Microsoft.EntityFrameworkCore.SqlServer")
                 : servicesBuilder
                     .CreateServiceCollection(context))
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
         }
 
         private Assembly Compile(string assemblyCode)

diff --git a/test/EFCore.Design.Tests/Design/Internal/DbContextOperationsTest.cs b/test/EFCore.Design.Tests/Design/Internal/DbContextOperationsTest.cs
@@ -130,7 +130,7 @@ private static TestWebHost BuildWebHost(string[] args)
                                     .UseInMemoryDatabase("In-memory test database")
                                     .EnableServiceProviderCaching(false)
                                     .Options))
-                        .BuildServiceProvider());
+                        .BuildServiceProvider(validateScopes: true));
         }
 
         private static class TestProgramWithContextFactory
@@ -139,7 +139,7 @@ private static TestWebHost BuildWebHost(string[] args)
                 => new(
                     new ServiceCollection()
                         .AddDbContextFactory<TestContextFromFactory>(b => b.UseInMemoryDatabase("In-memory test database"))
-                        .BuildServiceProvider());
+                        .BuildServiceProvider(validateScopes: true));
         }
 
         private static class TestProgramRelational
@@ -175,7 +175,7 @@ private static TestWebHost CreateWebHost(Func<DbContextOptionsBuilder, DbContext
                     .AddDbContext<TestContext>(
                         b =>
                             configureProvider(b.EnableServiceProviderCaching(false)))
-                    .BuildServiceProvider());
+                    .BuildServiceProvider(validateScopes: true));
 
         private class TestContext : DbContext
         {

diff --git a/test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationsGeneratorTest.cs b/test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationsGeneratorTest.cs
@@ -1027,7 +1027,7 @@ private static IMigrationsCodeGenerator CreateMigrationsCodeGenerator()
             var reporter = new TestOperationReporter();
             return new DesignTimeServicesBuilder(testAssembly, testAssembly, reporter, new string[0])
                 .CreateServiceCollection(SqlServerTestHelpers.Instance.CreateContext())
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IMigrationsCodeGenerator>();
         }
     }

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs
@@ -201,7 +201,7 @@ public void Required_options_to_GenerateModel_are_not_null()
         {
             var generator = CreateServices()
                 .AddSingleton<IProviderCodeGeneratorPlugin, TestCodeGeneratorPlugin>()
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IModelCodeGenerator>();
 
             Assert.StartsWith(
@@ -234,7 +234,7 @@ public void Plugins_work()
         {
             var generator = CreateServices()
                 .AddSingleton<IProviderCodeGeneratorPlugin, TestCodeGeneratorPlugin>()
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IModelCodeGenerator>();
 
             var scaffoldedModel = generator.GenerateModel(

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpModelGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpModelGeneratorTest.cs
@@ -58,7 +58,7 @@ private static IModelCodeGenerator CreateGenerator()
                 .CreateServiceCollection("Microsoft.EntityFrameworkCore.SqlServer")
                 .AddSingleton<IAnnotationCodeGenerator, AnnotationCodeGenerator>()
                 .AddSingleton<IProviderConfigurationCodeGenerator, TestProviderCodeGenerator>()
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IModelCodeGenerator>();
         }
     }

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs
@@ -3216,7 +3216,7 @@ protected void Test(
             options.ContextType = context.GetType();
 
             var generator = services
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<ICompiledModelCodeGeneratorSelector>()
                 .Select(options);
 

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/ModelCodeGeneratorTestBase.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/ModelCodeGeneratorTestBase.cs
@@ -34,7 +34,7 @@ protected void Test(
             var services = CreateServices();
             AddScaffoldingServices(services);
 
-            var generator = services.BuildServiceProvider()
+            var generator = services.BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IModelCodeGenerator>();
 
             options.ModelNamespace ??= "TestNamespace";

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalDatabaseModelFactoryTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalDatabaseModelFactoryTest.cs
@@ -52,7 +52,7 @@ public RelationalDatabaseModelFactoryTest()
             _factory = new DesignTimeServicesBuilder(assembly, assembly, _reporter, new string[0])
                 .CreateServiceCollection("Microsoft.EntityFrameworkCore.SqlServer")
                 .AddSingleton<IScaffoldingModelFactory, FakeScaffoldingModelFactory>()
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IScaffoldingModelFactory>();
 
             _reporter.Clear();

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/ReverseEngineerScaffolderTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/ReverseEngineerScaffolderTest.cs
@@ -7,11 +7,9 @@
 using System.IO;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Design.Internal;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
-using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -135,7 +133,7 @@ private static IReverseEngineerScaffolder CreateScaffolder()
                     new TestOperationReporter(),
                     new string[0])
                 .CreateServiceCollection("Microsoft.EntityFrameworkCore.SqlServer")
-                .BuildServiceProvider()
+                .BuildServiceProvider() // No scope validation; design services only resolved once
                 .GetRequiredService<IReverseEngineerScaffolder>();
 
         [ConditionalFact]
@@ -151,7 +149,7 @@ public void ScaffoldModel_works_with_named_connection_string()
                 .CreateServiceCollection("Microsoft.EntityFrameworkCore.SqlServer")
                 .AddSingleton<INamedConnectionStringResolver>(resolver)
                 .AddSingleton<IDatabaseModelFactory>(databaseModelFactory)
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IReverseEngineerScaffolder>();
 
             var result = scaffolder.ScaffoldModel(
@@ -181,7 +179,7 @@ public void ScaffoldModel_works_with_overridden_connection_string()
                 .CreateServiceCollection("Microsoft.EntityFrameworkCore.SqlServer")
                 .AddSingleton<INamedConnectionStringResolver>(resolver)
                 .AddSingleton<IDatabaseModelFactory>(databaseModelFactory)
-                .BuildServiceProvider()
+                .BuildServiceProvider(validateScopes: true)
                 .GetRequiredService<IReverseEngineerScaffolder>();
 
             var result = scaffolder.ScaffoldModel(

diff --git a/test/EFCore.InMemory.FunctionalTests/CompositeKeyEndToEndTest.cs b/test/EFCore.InMemory.FunctionalTests/CompositeKeyEndToEndTest.cs
@@ -18,7 +18,7 @@ public async Task Can_use_two_non_generated_integers_as_composite_key_end_to_end
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             var ticks = DateTime.UtcNow.Ticks;
 
@@ -65,7 +65,7 @@ public async Task Can_use_generated_values_in_composite_key_end_to_end()
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             long id1;
             var id2 = DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture);
@@ -121,7 +121,7 @@ public async Task Only_one_part_of_a_composite_key_needs_to_vary_for_uniqueness(
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             var ids = new int[3];
 

diff --git a/test/EFCore.InMemory.FunctionalTests/ConfigPatternsInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/ConfigPatternsInMemoryTest.cs
@@ -87,7 +87,7 @@ public void Can_save_and_query_with_explicit_services_and_OnConfiguring()
         {
             var services = new ServiceCollection();
             services.AddEntityFrameworkInMemoryDatabase();
-            var serviceProvider = services.BuildServiceProvider();
+            var serviceProvider = services.BuildServiceProvider(validateScopes: true);
 
             using (var context = new ExplicitServicesImplicitConfigBlogContext(serviceProvider))
             {
@@ -134,7 +134,7 @@ public void Can_save_and_query_with_explicit_services_and_explicit_config()
                 .UseInMemoryDatabase(nameof(ExplicitServicesAndConfigBlogContext))
                 .UseInternalServiceProvider(
                     new ServiceCollection()
-                        .AddEntityFrameworkInMemoryDatabase().BuildServiceProvider());
+                        .AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(validateScopes: true));
 
             using (var context = new ExplicitServicesAndConfigBlogContext(optionsBuilder.Options))
             {
@@ -195,7 +195,7 @@ public void Throws_on_attempt_to_use_store_with_no_store_services()
         {
             var serviceCollection = new ServiceCollection();
             new EntityFrameworkServicesBuilder(serviceCollection).TryAddCoreServices();
-            var serviceProvider = serviceCollection.BuildServiceProvider();
+            var serviceProvider = serviceCollection.BuildServiceProvider(validateScopes: true);
 
             Assert.Equal(
                 CoreStrings.NoProviderConfigured,
@@ -234,7 +234,7 @@ public void Can_register_context_with_DI_container_and_have_it_injected()
                 .AddTransient<InjectContextController>()
                 .AddEntityFrameworkInMemoryDatabase();
 
-            var serviceProvider = services.BuildServiceProvider();
+            var serviceProvider = services.BuildServiceProvider(validateScopes: true);
 
             serviceProvider.GetRequiredService<InjectContextController>().Test();
         }
@@ -292,7 +292,7 @@ public void Can_register_context_and_configuration_with_DI_container_and_have_bo
                 .AddTransient<InjectContextAndConfigurationController>()
                 .AddSingleton(p => optionsBuilder.UseInternalServiceProvider(p).Options)
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             serviceProvider.GetRequiredService<InjectContextAndConfigurationController>().Test();
         }
@@ -346,7 +346,7 @@ public void Can_register_configuration_with_DI_container_and_have_it_injected()
                 .AddSingleton(optionsBuilder.Options)
                 .AddEntityFrameworkInMemoryDatabase();
 
-            var serviceProvider = services.BuildServiceProvider();
+            var serviceProvider = services.BuildServiceProvider(validateScopes: true);
 
             serviceProvider.GetRequiredService<InjectConfigurationController>().Test();
         }
@@ -406,7 +406,7 @@ public void Can_inject_different_configurations_into_different_contexts()
                 .AddSingleton(p => blogOptions.UseInternalServiceProvider(p).Options)
                 .AddSingleton(p => accountOptions.UseInternalServiceProvider(p).Options)
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             serviceProvider.GetRequiredService<InjectDifferentConfigurationsBlogController>().Test();
             serviceProvider.GetRequiredService<InjectDifferentConfigurationsAccountController>().Test();

diff --git a/test/EFCore.InMemory.FunctionalTests/CustomValueGeneratorTest.cs b/test/EFCore.InMemory.FunctionalTests/CustomValueGeneratorTest.cs
@@ -43,7 +43,7 @@ private static readonly IServiceProvider _serviceProvider
                 = new ServiceCollection()
                     .AddEntityFrameworkInMemoryDatabase()
                     .AddScoped<IValueGeneratorSelector, CustomInMemoryValueGeneratorSelector>()
-                    .BuildServiceProvider();
+                    .BuildServiceProvider(validateScopes: true);
 
             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                 => optionsBuilder
@@ -90,7 +90,7 @@ private class CustomValueGeneratorContextAnnotateType : DbContext
             private static readonly IServiceProvider _serviceProvider
                 = new ServiceCollection()
                     .AddEntityFrameworkInMemoryDatabase()
-                    .BuildServiceProvider();
+                    .BuildServiceProvider(validateScopes: true);
 
             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                 => optionsBuilder
@@ -132,7 +132,7 @@ private class CustomValueGeneratorContextAnnotateFactory : DbContext
             private static readonly IServiceProvider _serviceProvider
                 = new ServiceCollection()
                     .AddEntityFrameworkInMemoryDatabase()
-                    .BuildServiceProvider();
+                    .BuildServiceProvider(validateScopes: true);
 
             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                 => optionsBuilder

diff --git a/test/EFCore.InMemory.FunctionalTests/DatabaseErrorLogStateTest.cs b/test/EFCore.InMemory.FunctionalTests/DatabaseErrorLogStateTest.cs
@@ -34,7 +34,7 @@ private async Task SaveChanges_logs_DatabaseErrorLogState_test(bool async)
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
                 .AddSingleton<ILoggerFactory>(loggerFactory)
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             using var context = new BloggingContext(serviceProvider);
             context.Blogs.Add(
@@ -104,7 +104,7 @@ private async Task Query_logs_DatabaseErrorLogState_test(Func<BloggingContext, T
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
                 .AddSingleton<ILoggerFactory>(loggerFactory)
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             using var context = new BloggingContext(serviceProvider);
             context.Blogs.Add(

diff --git a/test/EFCore.InMemory.FunctionalTests/DatabaseInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/DatabaseInMemoryTest.cs
@@ -29,7 +29,7 @@ public async Task Can_add_update_delete_end_to_end()
                 .AddEntityFrameworkInMemoryDatabase()
                 .AddSingleton<ILoggerFactory>(new ListLoggerFactory())
                 .AddSingleton(TestModelSource.GetFactory(OnModelCreating))
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             var options = new DbContextOptionsBuilder()
                 .UseInternalServiceProvider(serviceProvider)

diff --git a/test/EFCore.InMemory.FunctionalTests/GlobalDatabaseTest.cs b/test/EFCore.InMemory.FunctionalTests/GlobalDatabaseTest.cs
@@ -54,7 +54,7 @@ public void AddDbContext_does_not_force_different_internal_service_provider()
             var serviceProvider = new ServiceCollection()
                 .AddDbContext<BooFooContext>(
                     b => b.UseInMemoryDatabase(nameof(BooFooContext)))
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             using var scope = serviceProvider.CreateScope();
             {
@@ -141,7 +141,7 @@ public void Global_store_can_be_used_when_AddDbContext_force_different_internal_
                     b =>
                         b.UseInMemoryDatabase(nameof(BooFooContext), _databaseRoot)
                             .EnableServiceProviderCaching(false))
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             using var scope = serviceProvider.CreateScope();
             {
@@ -173,7 +173,7 @@ private class ChangeSdlCacheContext : DbContext
             private static readonly IServiceProvider _serviceProvider
                 = new ServiceCollection()
                     .AddEntityFrameworkInMemoryDatabase()
-                    .BuildServiceProvider();
+                    .BuildServiceProvider(validateScopes: true);
 
             private readonly bool _on;
 

diff --git a/test/EFCore.InMemory.FunctionalTests/GuidValueGeneratorEndToEndTest.cs b/test/EFCore.InMemory.FunctionalTests/GuidValueGeneratorEndToEndTest.cs
@@ -17,7 +17,7 @@ public async Task Can_use_GUIDs_end_to_end_async()
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             var guids = new List<Guid>();
             var guidsHash = new HashSet<Guid>();

diff --git a/test/EFCore.InMemory.FunctionalTests/InMemoryFixture.cs b/test/EFCore.InMemory.FunctionalTests/InMemoryFixture.cs
@@ -36,6 +36,6 @@ public static ServiceProvider BuildServiceProvider(IServiceCollection providerSe
             => InMemoryTestStoreFactory.Instance.AddProviderServices(
                     providerServices
                     ?? new ServiceCollection())
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
     }
 }
diff --git a/test/EFCore.InMemory.FunctionalTests/IntegerGeneratorEndToEndInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/IntegerGeneratorEndToEndInMemoryTest.cs
@@ -16,7 +16,7 @@ public void Can_use_sequence_end_to_end()
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             AddEntities(serviceProvider);
             AddEntities(serviceProvider);
@@ -51,7 +51,7 @@ public async Task Can_use_sequence_end_to_end_async()
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             await AddEntitiesAsync(serviceProvider);
             await AddEntitiesAsync(serviceProvider);
@@ -86,7 +86,7 @@ public async Task Can_use_sequence_end_to_end_from_multiple_contexts_concurrentl
         {
             var serviceProvider = new ServiceCollection()
                 .AddEntityFrameworkInMemoryDatabase()
-                .BuildServiceProvider();
+                .BuildServiceProvider(validateScopes: true);
 
             const int threadCount = 50;