Some tests are using the new provider factory

PawelGerr · PawelGerr · commit 305e43853ac4 · 2023-02-11T17:05:49.000+01:00
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/DbContextProviderFactoryFixture.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/DbContextProviderFactoryFixture.cs
@@ -0,0 +1,43 @@
+using Microsoft.Extensions.Logging;
+using Thinktecture.EntityFrameworkCore;
+using Thinktecture.EntityFrameworkCore.Testing;
+using Thinktecture.TestDatabaseContext;
+using Xunit.Extensions.AssemblyFixture;
+
+[assembly: TestFramework(AssemblyFixtureFramework.TypeName, AssemblyFixtureFramework.AssemblyName)]
+
+namespace Thinktecture;
+
+public class DbContextProviderFactoryFixture : IAsyncLifetime
+{
+   private readonly SqliteTestDbContextProviderFactory<TestDbContext> _factory;
+
+   public DbContextProviderFactoryFixture()
+   {
+      _factory = ConfigureBuilder().BuildFactory();
+   }
+
+   private static SqliteTestDbContextProviderBuilder<TestDbContext> ConfigureBuilder()
+   {
+      return new SqliteTestDbContextProviderBuilder<TestDbContext>()
+             .UseMigrationExecutionStrategy(IMigrationExecutionStrategy.Migrations)
+             .UseMigrationLogLevel(LogLevel.Warning)
+             .ConfigureSqliteOptions(optionsBuilder => optionsBuilder.AddBulkOperationSupport()
+                                                                     .AddRowNumberSupport());
+   }
+
+   public SqliteTestDbContextProvider<TestDbContext> CreateProvider(ILoggerFactory loggerFactory)
+   {
+      return _factory.Create(loggerFactory);
+   }
+
+   public async Task InitializeAsync()
+   {
+      await _factory.InitializeAsync();
+   }
+
+   public async Task DisposeAsync()
+   {
+      await _factory.DisposeAsync();
+   }
+}
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/BulkInsertAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/BulkInsertAsync.cs
@@ -5,7 +5,7 @@
 namespace Thinktecture.EntityFrameworkCore.BulkOperations.SqliteBulkOperationExecutorTests;
 
 // ReSharper disable once InconsistentNaming
-public class BulkInsertAsync : IntegrationTestsBase
+public class BulkInsertAsync : SchemaChangingIntegrationTestsBase
 {
    private SqliteBulkOperationExecutor? _sut;
    private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/BulkInsertOrUpdateAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/BulkInsertOrUpdateAsync.cs
@@ -11,8 +11,8 @@ public class BulkInsertOrUpdateAsync : IntegrationTestsBase
 
    private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();
 
-   public BulkInsertOrUpdateAsync(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public BulkInsertOrUpdateAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)
+      : base(testOutputHelper, providerFactoryFixture)
    {
    }
 
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/BulkUpdateAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/BulkUpdateAsync.cs
@@ -12,8 +12,8 @@ public class BulkUpdateAsync : IntegrationTestsBase
 
    private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();
 
-   public BulkUpdateAsync(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public BulkUpdateAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)
+      : base(testOutputHelper, providerFactoryFixture)
    {
    }
 
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/TruncateTableAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutorTests/TruncateTableAsync.cs
@@ -9,8 +9,8 @@ public class TruncateTableAsync : IntegrationTestsBase
    private SqliteBulkOperationExecutor? _sut;
    private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();
 
-   public TruncateTableAsync(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public TruncateTableAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)
+      : base(testOutputHelper, providerFactoryFixture)
    {
    }
 
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/TempTables/SqliteTempTableCreatorTests/CreateTempTableAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/TempTables/SqliteTempTableCreatorTests/CreateTempTableAsync.cs
@@ -11,7 +11,7 @@
 namespace Thinktecture.EntityFrameworkCore.TempTables.SqliteTempTableCreatorTests;
 
 // ReSharper disable once InconsistentNaming
-public class CreateTempTableAsync : IntegrationTestsBase
+public class CreateTempTableAsync : SchemaChangingIntegrationTestsBase
 {
    private readonly Mock<ISqlGenerationHelper> _sqlGenerationHelperMock;
    private readonly TempTableCreationOptions _optionsWithNonUniqueNameAndNoPrimaryKey;
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/DbContextExtensionsTests/BulkInsertIntoTempTableAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/DbContextExtensionsTests/BulkInsertIntoTempTableAsync.cs
@@ -5,7 +5,7 @@
 namespace Thinktecture.Extensions.DbContextExtensionsTests;
 
 // ReSharper disable InconsistentNaming
-public class BulkInsertIntoTempTableAsync : IntegrationTestsBase
+public class BulkInsertIntoTempTableAsync : SchemaChangingIntegrationTestsBase
 {
    public BulkInsertIntoTempTableAsync(ITestOutputHelper testOutputHelper)
       : base(testOutputHelper)
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/DbContextExtensionsTests/BulkInsertValuesIntoTempTableAsync_1_Column.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/DbContextExtensionsTests/BulkInsertValuesIntoTempTableAsync_1_Column.cs
@@ -6,7 +6,7 @@
 namespace Thinktecture.Extensions.DbContextExtensionsTests;
 
 // ReSharper disable once InconsistentNaming
-public class BulkInsertValuesIntoTempTableAsync_1_Column : IntegrationTestsBase
+public class BulkInsertValuesIntoTempTableAsync_1_Column : SchemaChangingIntegrationTestsBase
 {
    public BulkInsertValuesIntoTempTableAsync_1_Column(ITestOutputHelper testOutputHelper)
       : base(testOutputHelper)
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/QueryableExtensionsTests/BulkDelete.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/QueryableExtensionsTests/BulkDelete.cs
@@ -5,8 +5,8 @@ namespace Thinktecture.Extensions.QueryableExtensionsTests;
 // ReSharper disable InconsistentNaming
 public class BulkDelete : IntegrationTestsBase
 {
-   public BulkDelete(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public BulkDelete(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)
+      : base(testOutputHelper, providerFactoryFixture)
    {
    }
 
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/QueryableExtensionsTests/BulkDeleteAsync.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/QueryableExtensionsTests/BulkDeleteAsync.cs
@@ -5,8 +5,8 @@ namespace Thinktecture.Extensions.QueryableExtensionsTests;
 // ReSharper disable InconsistentNaming
 public class BulkDeleteAsync : IntegrationTestsBase
 {
-   public BulkDeleteAsync(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public BulkDeleteAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)
+      : base(testOutputHelper, providerFactoryFixture)
    {
    }
 
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/SqliteDbFunctionsExtensionsTests/RowNumber.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Extensions/SqliteDbFunctionsExtensionsTests/RowNumber.cs
@@ -7,8 +7,8 @@ namespace Thinktecture.Extensions.SqliteDbFunctionsExtensionsTests;
 // ReSharper disable once InconsistentNaming
 public class RowNumber : IntegrationTestsBase
 {
-   public RowNumber(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public RowNumber(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)
+      : base(testOutputHelper, providerFactoryFixture)
    {
    }
 
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/IntegrationTestsBase.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/IntegrationTestsBase.cs
@@ -1,37 +1,24 @@
 using Microsoft.Extensions.Logging;
-using Thinktecture.EntityFrameworkCore;
 using Thinktecture.EntityFrameworkCore.Testing;
 using Thinktecture.TestDatabaseContext;
+using Xunit.Extensions.AssemblyFixture;
 
 namespace Thinktecture;
 
-public class IntegrationTestsBase : SqliteDbContextIntegrationTests<TestDbContext>
+public abstract class IntegrationTestsBase : IAssemblyFixture<DbContextProviderFactoryFixture>
 {
-   private readonly IMigrationExecutionStrategy? _migrationExecutionStrategy;
-
-   protected Action<DbContextOptionsBuilder<TestDbContext>>? ConfigureOptionsBuilder { get; set; }
-   protected Action<ModelBuilder>? ConfigureModel { get; set; }
    protected ILoggerFactory LoggerFactory { get; }
+   protected SqliteTestDbContextProvider<TestDbContext> TestCtxProvider { get; }
+
+   protected TestDbContext ArrangeDbContext => TestCtxProvider.ArrangeDbContext;
+   protected TestDbContext ActDbContext => TestCtxProvider.ActDbContext;
+   protected TestDbContext AssertDbContext => TestCtxProvider.AssertDbContext;
 
    protected IntegrationTestsBase(
       ITestOutputHelper testOutputHelper,
-      IMigrationExecutionStrategy? migrationExecutionStrategy = null)
-      : base(testOutputHelper)
+      DbContextProviderFactoryFixture providerFactoryFixture)
    {
-      _migrationExecutionStrategy = migrationExecutionStrategy;
       LoggerFactory = testOutputHelper.ToLoggerFactory();
-   }
-
-   protected override void ConfigureTestDbContextProvider(SqliteTestDbContextProviderBuilder<TestDbContext> builder)
-   {
-      builder.UseMigrationExecutionStrategy(_migrationExecutionStrategy ?? IMigrationExecutionStrategy.Migrations)
-             .UseMigrationLogLevel(LogLevel.Warning)
-             .ConfigureOptions(optionsBuilder => ConfigureOptionsBuilder?.Invoke(optionsBuilder))
-             .ConfigureSqliteOptions(optionsBuilder => optionsBuilder.AddBulkOperationSupport()
-                                                                     .AddRowNumberSupport())
-             .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel);
-
-      if (ConfigureModel is not null)
-         builder.DisableModelCache();
+      TestCtxProvider = providerFactoryFixture.CreateProvider(LoggerFactory);
    }
 }
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/SchemaChangingIntegrationTestsBase.cs b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/SchemaChangingIntegrationTestsBase.cs
@@ -0,0 +1,35 @@
+using Microsoft.Extensions.Logging;
+using Thinktecture.EntityFrameworkCore;
+using Thinktecture.EntityFrameworkCore.Testing;
+using Thinktecture.TestDatabaseContext;
+
+namespace Thinktecture;
+
+public abstract class SchemaChangingIntegrationTestsBase : SqliteDbContextIntegrationTests<TestDbContext>
+{
+   private readonly IMigrationExecutionStrategy? _migrationExecutionStrategy;
+
+   protected Action<ModelBuilder>? ConfigureModel { get; set; }
+   protected ILoggerFactory LoggerFactory { get; }
+
+   protected SchemaChangingIntegrationTestsBase(
+      ITestOutputHelper testOutputHelper,
+      IMigrationExecutionStrategy? migrationExecutionStrategy = null)
+      : base(testOutputHelper)
+   {
+      _migrationExecutionStrategy = migrationExecutionStrategy;
+      LoggerFactory = testOutputHelper.ToLoggerFactory();
+   }
+
+   protected override void ConfigureTestDbContextProvider(SqliteTestDbContextProviderBuilder<TestDbContext> builder)
+   {
+      builder.UseMigrationExecutionStrategy(_migrationExecutionStrategy ?? IMigrationExecutionStrategy.Migrations)
+             .UseMigrationLogLevel(LogLevel.Warning)
+             .ConfigureSqliteOptions(optionsBuilder => optionsBuilder.AddBulkOperationSupport()
+                                                                     .AddRowNumberSupport())
+             .InitializeContext(ctx => ctx.ConfigureModel = ConfigureModel);
+
+      if (ConfigureModel is not null)
+         builder.DisableModelCache();
+   }
+}
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj
@@ -8,8 +8,9 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+        <PackageReference Include="Xunit.Extensions.AssemblyFixture" Version="2.4.1" />
     </ItemGroup>
-
+   
     <ItemGroup>
         <None Update="appsettings.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Thinktecture.EntityFrameworkCore.BulkOperations.SqliteBulkOperationExecutorTests;`
`6`	`6`
`7`	`7`	`// ReSharper disable once InconsistentNaming`
`8`		`-public class BulkInsertAsync : IntegrationTestsBase`
	`8`	`+public class BulkInsertAsync : SchemaChangingIntegrationTestsBase`
`9`	`9`	`{`
`10`	`10`	`private SqliteBulkOperationExecutor? _sut;`
`11`	`11`	`private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ public class BulkInsertOrUpdateAsync : IntegrationTestsBase`
`11`	`11`
`12`	`12`	`private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();`
`13`	`13`
`14`		`- public BulkInsertOrUpdateAsync(ITestOutputHelper testOutputHelper)`
`15`		`- : base(testOutputHelper)`
	`14`	`+ public BulkInsertOrUpdateAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)`
	`15`	`+ : base(testOutputHelper, providerFactoryFixture)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class BulkUpdateAsync : IntegrationTestsBase`
`12`	`12`
`13`	`13`	`private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();`
`14`	`14`
`15`		`- public BulkUpdateAsync(ITestOutputHelper testOutputHelper)`
`16`		`- : base(testOutputHelper)`
	`15`	`+ public BulkUpdateAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)`
	`16`	`+ : base(testOutputHelper, providerFactoryFixture)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ public class TruncateTableAsync : IntegrationTestsBase`
`9`	`9`	`private SqliteBulkOperationExecutor? _sut;`
`10`	`10`	`private SqliteBulkOperationExecutor SUT => _sut ??= ActDbContext.GetService<SqliteBulkOperationExecutor>();`
`11`	`11`
`12`		`- public TruncateTableAsync(ITestOutputHelper testOutputHelper)`
`13`		`- : base(testOutputHelper)`
	`12`	`+ public TruncateTableAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)`
	`13`	`+ : base(testOutputHelper, providerFactoryFixture)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`namespace Thinktecture.EntityFrameworkCore.TempTables.SqliteTempTableCreatorTests;`
`12`	`12`
`13`	`13`	`// ReSharper disable once InconsistentNaming`
`14`		`-public class CreateTempTableAsync : IntegrationTestsBase`
	`14`	`+public class CreateTempTableAsync : SchemaChangingIntegrationTestsBase`
`15`	`15`	`{`
`16`	`16`	`private readonly Mock<ISqlGenerationHelper> _sqlGenerationHelperMock;`
`17`	`17`	`private readonly TempTableCreationOptions _optionsWithNonUniqueNameAndNoPrimaryKey;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Thinktecture.Extensions.DbContextExtensionsTests;`
`6`	`6`
`7`	`7`	`// ReSharper disable InconsistentNaming`
`8`		`-public class BulkInsertIntoTempTableAsync : IntegrationTestsBase`
	`8`	`+public class BulkInsertIntoTempTableAsync : SchemaChangingIntegrationTestsBase`
`9`	`9`	`{`
`10`	`10`	`public BulkInsertIntoTempTableAsync(ITestOutputHelper testOutputHelper)`
`11`	`11`	`: base(testOutputHelper)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace Thinktecture.Extensions.DbContextExtensionsTests;`
`7`	`7`
`8`	`8`	`// ReSharper disable once InconsistentNaming`
`9`		`-public class BulkInsertValuesIntoTempTableAsync_1_Column : IntegrationTestsBase`
	`9`	`+public class BulkInsertValuesIntoTempTableAsync_1_Column : SchemaChangingIntegrationTestsBase`
`10`	`10`	`{`
`11`	`11`	`public BulkInsertValuesIntoTempTableAsync_1_Column(ITestOutputHelper testOutputHelper)`
`12`	`12`	`: base(testOutputHelper)`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ namespace Thinktecture.Extensions.QueryableExtensionsTests;`
`5`	`5`	`// ReSharper disable InconsistentNaming`
`6`	`6`	`public class BulkDelete : IntegrationTestsBase`
`7`	`7`	`{`
`8`		`- public BulkDelete(ITestOutputHelper testOutputHelper)`
`9`		`- : base(testOutputHelper)`
	`8`	`+ public BulkDelete(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)`
	`9`	`+ : base(testOutputHelper, providerFactoryFixture)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ namespace Thinktecture.Extensions.QueryableExtensionsTests;`
`5`	`5`	`// ReSharper disable InconsistentNaming`
`6`	`6`	`public class BulkDeleteAsync : IntegrationTestsBase`
`7`	`7`	`{`
`8`		`- public BulkDeleteAsync(ITestOutputHelper testOutputHelper)`
`9`		`- : base(testOutputHelper)`
	`8`	`+ public BulkDeleteAsync(ITestOutputHelper testOutputHelper, DbContextProviderFactoryFixture providerFactoryFixture)`
	`9`	`+ : base(testOutputHelper, providerFactoryFixture)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`