Tests: disable model cache only if the tests are changing the model

Author: PawelGerr

tests/Thinktecture.EntityFrameworkCore.Relational.Tests/EntityFrameworkCore/Infrastructure/DefaultSchemaModelCustomizerTests/Customize.cs

@@ -1,55 +1,70 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
+using Thinktecture.EntityFrameworkCore.Testing;
 using Thinktecture.TestDatabaseContext;
 
 namespace Thinktecture.EntityFrameworkCore.Infrastructure.DefaultSchemaModelCustomizerTests;
 
 public class Customize : IntegrationTestsBase
 {
+   private string? _schema;
+
    public Customize(ITestOutputHelper testOutputHelper)
       : base(testOutputHelper)
    {
-      ConfigureOptionsBuilder = builder =>
-                                {
-                                   builder.AddOrUpdateExtension<RelationalDbContextOptionsExtension>(extension =>
-                                                                                                     {
-                                                                                                        extension.Register(typeof(ModelCustomizer), typeof(ModelCustomizer), ServiceLifetime.Singleton);
-                                                                                                        return extension;
-                                                                                                     });
-                                   builder.ReplaceService<IModelCustomizer, DefaultSchemaModelCustomizer<ModelCustomizer>>();
-                                };
+   }
+
+   protected override void ConfigureTestDbContextProvider(SqliteTestDbContextProviderBuilder<DbContextWithSchema> builder)
+   {
+      base.ConfigureTestDbContextProvider(builder);
+
+      builder.ConfigureOptions(optionsBuilder =>
+                               {
+                                  optionsBuilder.AddOrUpdateExtension<RelationalDbContextOptionsExtension>(extension =>
+                                                                                                           {
+                                                                                                              extension.Register(typeof(ModelCustomizer), typeof(ModelCustomizer), ServiceLifetime.Singleton);
+                                                                                                              return extension;
+                                                                                                           });
+                                  optionsBuilder.ReplaceService<IModelCustomizer, DefaultSchemaModelCustomizer<ModelCustomizer>>();
+                               });
+
+      if (_schema is not null)
+      {
+         builder.UseContextFactory(options => new DbContextWithSchema(options, _schema))
+                .DisableModelCache();
+      }
    }
 
    [Fact]
    public void Should_set_schema_if_entity_schema_is_null()
    {
-      Schema = "BA3C32B0-D7EC-422C-AE3B-3206E7D67735";
+      _schema = "BA3C32B0-D7EC-422C-AE3B-3206E7D67735";
 
-      ActDbContext.Model.FindEntityType(typeof(TestEntity))!.GetSchema().Should().Be(Schema);
+      ActDbContext.Model.FindEntityType(typeof(TestEntity))!.GetSchema().Should().Be(_schema);
    }
 
    [Fact]
    public void Should_set_schema_if_view_schema_is_null()
    {
-      Schema = "E2FBA720-E24C-46C9-B326-46C3C91707F5";
+      _schema = "E2FBA720-E24C-46C9-B326-46C3C91707F5";
 
-      ActDbContext.Model.FindEntityType(typeof(TestQuery))!.GetViewSchema().Should().Be(Schema);
+      ActDbContext.Model.FindEntityType(typeof(TestQuery))!.GetViewSchema().Should().Be(_schema);
    }
 
    [Fact]
    public void Should_set_schema_if_dbFunction_schema_is_null()
    {
-      Schema = "E2FBA720-E24C-46C9-B326-46C3C91707F5";
+      _schema = "E2FBA720-E24C-46C9-B326-46C3C91707F5";
 
       ActDbContext.Model.GetDbFunctions()
                   .Single(f => f.MethodInfo!.Name == nameof(DbContextWithSchema.TestDbFunction))
-                  .Schema.Should().Be(Schema);
+                  .Schema.Should().Be(_schema);
    }
 
    [Fact]
    public void Should_not_change_schema_if_entity_schema_is_set_already()
    {
-      Schema = "4BA05B95-7FEA-4F32-A1E0-ACA9CB486EB9";
+      _schema = "4BA05B95-7FEA-4F32-A1E0-ACA9CB486EB9";
       ConfigureModel = builder => builder.Entity<TestEntity>().ToTable("Table", "Schema");
 
       ActDbContext.Model.FindEntityType(typeof(TestEntity))!.GetSchema().Should().Be("Schema");
@@ -58,7 +73,7 @@ public void Should_not_change_schema_if_entity_schema_is_set_already()
    [Fact]
    public void Should_not_reset_schema_if_entity_schema_is_set_already()
    {
-      Schema = null;
+      _schema = null;
       ConfigureModel = builder => builder.Entity<TestEntity>().ToTable("Table", "Schema");
 
       ActDbContext.Model.FindEntityType(typeof(TestEntity))!.GetSchema().Should().Be("Schema");

tests/Thinktecture.EntityFrameworkCore.Relational.Tests/IntegrationTestsBase.cs

@@ -11,7 +11,6 @@ public class IntegrationTestsBase : SqliteDbContextIntegrationTests<DbContextWit
 
    protected Action<DbContextOptionsBuilder<DbContextWithSchema>>? ConfigureOptionsBuilder { get; set; }
    protected Action<ModelBuilder>? ConfigureModel { get; set; }
-   protected string? Schema { get; set; }
    protected ILoggerFactory LoggerFactory { get; }
 
    protected IntegrationTestsBase(
@@ -29,9 +28,9 @@ protected override void ConfigureTestDbContextProvider(SqliteTestDbContextProvid
              .UseMigrationLogLevel(LogLevel.Warning)
              .ConfigureOptions(optionsBuilder => ConfigureOptionsBuilder?.Invoke(optionsBuilder))
              .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel)
-             .UseContextFactory(options => new DbContextWithSchema(options, Schema));
+             .UseContextFactory(options => new DbContextWithSchema(options, null));
 
-      if (ConfigureModel is not null || Schema is not null)
+      if (ConfigureModel is not null)
          builder.DisableModelCache();
    }
 

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/IntegrationTestsBase.cs

@@ -64,7 +64,6 @@ protected override void ConfigureTestDbContextProvider(SqlServerTestDbContextPro
                                               optionsBuilder.AddTenantDatabaseSupport<TestTenantDatabaseProviderFactory>();
                                         })
              .UseSharedTableSchema(schema)
-             .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel)
-             .DisableModelCache();
+             .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel);
    }
 }

tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/IntegrationTestsBase.cs

@@ -29,7 +29,9 @@ protected override void ConfigureTestDbContextProvider(SqliteTestDbContextProvid
              .ConfigureOptions(optionsBuilder => ConfigureOptionsBuilder?.Invoke(optionsBuilder))
              .ConfigureSqliteOptions(optionsBuilder => optionsBuilder.AddBulkOperationSupport()
                                                                      .AddRowNumberSupport())
-             .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel)
-             .DisableModelCache();
+             .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel);
+
+      if (ConfigureModel is not null)
+         builder.DisableModelCache();
    }
 }