refactor: defer dbcontext registration to strategy (#60)

Author: ArwynFr

src/ArwynFr.IntegrationTesting/DatabaseTestStrategy.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace ArwynFr.IntegrationTesting;
 
@@ -9,7 +10,10 @@ internal sealed class DatabaseTestStrategy<TContext> : IDatabaseTestStrategy<TCo
     private bool transaction = false;
     private bool transient = false;
 
-    public ServiceLifetime Lifetime => transaction ? ServiceLifetime.Singleton : ServiceLifetime.Scoped;
+    private ServiceLifetime Lifetime
+    => transaction
+    ? ServiceLifetime.Singleton
+    : ServiceLifetime.Scoped;
 
     public async Task DisposeAsync(TContext database)
     {
@@ -32,6 +36,14 @@ public async Task InitializeAsync(TContext database)
         }
     }
 
+    public void RegisterDbContext(IServiceCollection services, Action<IServiceProvider, DbContextOptionsBuilder> configureDbContext)
+    {
+        services.RemoveAll<TContext>();
+        services.RemoveAll<DbContextOptions<TContext>>();
+        services.AddDbContext<TContext>(configureDbContext, Lifetime);
+        services.Add(new ServiceDescriptor(typeof(TContext), typeof(TContext), Lifetime));
+    }
+
     public DatabaseTestStrategy<TContext> WithPerTest()
     {
         transient = true;

src/ArwynFr.IntegrationTesting/IDatabaseTestStrategy.cs

@@ -22,8 +22,7 @@ public interface IDatabaseTestStrategy<TContext>
     /// </summary>
     public static IDatabaseTestStrategy<TContext> Transaction => new DatabaseTestStrategy<TContext>().WithTransaction();
 
-    ServiceLifetime Lifetime { get; }
     Task DisposeAsync(TContext database);
     Task InitializeAsync(TContext database);
-
+    void RegisterDbContext(IServiceCollection services, Action<IServiceProvider, DbContextOptionsBuilder> configureDbContext);
 }

src/ArwynFr.IntegrationTesting/IntegrationTestBase.Database.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Xunit.Abstractions;
 
 namespace ArwynFr.IntegrationTesting;
@@ -28,12 +27,9 @@ public override async Task InitializeAsync()
     protected override void ConfigureAppServices(IServiceCollection services)
     {
         base.ConfigureAppServices(services);
-        services.RemoveAll<TContext>();
-        services.RemoveAll<DbContextOptions<TContext>>();
-        services.AddDbContext<TContext>(ConfigureDbContext, DatabaseTestStrategy.Lifetime);
-        services.Add(new ServiceDescriptor(typeof(TContext), typeof(TContext), DatabaseTestStrategy.Lifetime));
+        DatabaseTestStrategy.RegisterDbContext(services, ConfigureDbContext);
     }
 
-    protected abstract void ConfigureDbContext(DbContextOptionsBuilder builder);
+    protected abstract void ConfigureDbContext(IServiceProvider services, DbContextOptionsBuilder builder);
 
 }

test/ArwynFr.IntegrationTesting.Tests/EntityFrameworkCore/DatabaseDefaultStrategyTests.cs

@@ -20,6 +20,6 @@ public override async Task InitializeAsync()
         await base.InitializeAsync();
     }
 
-    protected override void ConfigureDbContext(DbContextOptionsBuilder builder)
+    protected override void ConfigureDbContext(IServiceProvider services, DbContextOptionsBuilder builder)
         => builder.UseSqlite($@"Data Source={Guid.NewGuid()}.sqlite");
 }

test/ArwynFr.IntegrationTesting.Tests/EntityFrameworkCore/DatabaseMigrationTests.cs

@@ -18,6 +18,6 @@ public async Task PerTestStrategy_uses_migrations()
     protected override IDatabaseTestStrategy<MigrationDbContext> DatabaseTestStrategy
         => IDatabaseTestStrategy<MigrationDbContext>.DatabasePerTest;
 
-    protected override void ConfigureDbContext(DbContextOptionsBuilder builder)
+    protected override void ConfigureDbContext(IServiceProvider services, DbContextOptionsBuilder builder)
         => builder.UseSqlite($@"Data Source={Guid.NewGuid()}.sqlite");
 }

test/ArwynFr.IntegrationTesting.Tests/EntityFrameworkCore/DatabaseNonRelationalTests.cs

@@ -17,6 +17,6 @@ public void PerTestStrategy_creates_non_relational_DB()
     protected override IDatabaseTestStrategy<DummyDbContext> DatabaseTestStrategy
         => IDatabaseTestStrategy<DummyDbContext>.DatabasePerTest;
 
-    protected override void ConfigureDbContext(DbContextOptionsBuilder builder)
+    protected override void ConfigureDbContext(IServiceProvider services, DbContextOptionsBuilder builder)
         => builder.UseInMemoryDatabase(Guid.NewGuid().ToString());
 }

test/ArwynFr.IntegrationTesting.Tests/EntityFrameworkCore/DatabasePerTestStrategyTests.cs

@@ -17,6 +17,6 @@ public void PerTestStrategy_creates_database()
     protected override IDatabaseTestStrategy<DummyDbContext> DatabaseTestStrategy
         => IDatabaseTestStrategy<DummyDbContext>.DatabasePerTest;
 
-    protected override void ConfigureDbContext(DbContextOptionsBuilder builder)
+    protected override void ConfigureDbContext(IServiceProvider services, DbContextOptionsBuilder builder)
         => builder.UseSqlite($@"Data Source={Guid.NewGuid()}.sqlite");
 }

test/ArwynFr.IntegrationTesting.Tests/EntityFrameworkCore/DatabaseTransactionStrategyTests.cs

@@ -23,6 +23,6 @@ public override async Task InitializeAsync()
     protected override IDatabaseTestStrategy<DummyDbContext> DatabaseTestStrategy
         => IDatabaseTestStrategy<DummyDbContext>.Transaction;
 
-    protected override void ConfigureDbContext(DbContextOptionsBuilder builder)
+    protected override void ConfigureDbContext(IServiceProvider services, DbContextOptionsBuilder builder)
         => builder.UseSqlite($@"Data Source={Guid.NewGuid()}.sqlite");
 }