Stop running tests in parallel, instead start a single container per class per target framework

Author: fabien.menager

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainer.cs

@@ -20,6 +20,8 @@ protected TestDbContainer()
         DbContainer = GetDbContainer();
     }
 
+    protected string GetRandomContainerName() => "phenx-bulk-insert-test-" + Guid.NewGuid();
+
     protected abstract IDatabaseContainer? GetDbContainer();
 
     protected virtual string GetConnectionString()
@@ -35,24 +37,31 @@ public async Task InitializeAsync()
         {
             await DbContainer.StartAsync();
         }
+    }
+
+    public async Task DisposeAsync()
+    {
+        if (DbContainer != null)
+        {
+            await DbContainer.DisposeAsync();
+        }
+    }
 
+    public async Task InitializeDbContextAsync()
+    {
         DbContext = new TDbContext
         {
             ConfigureOptions = Configure
         };
-        DbContext.Database.SetConnectionString(GetConnectionString());
 
+        DbContext.Database.SetConnectionString(GetConnectionString());
         await DbContext.Database.EnsureCreatedAsync();
     }
 
-    public async Task DisposeAsync()
+    public async Task DisposeDbContextAsync()
     {
-        // await DbContext.Database.EnsureDeletedAsync();
+        await DbContext.Database.EnsureDeletedAsync();
         await DbContext.DisposeAsync();
-
-        if (DbContainer != null)
-        {
-            await DbContainer.DisposeAsync();
-        }
+        DbContext = null!;
     }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerPostgreSql.cs

@@ -18,6 +18,7 @@ public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>
             .WithDatabase("testdb")
             .WithUsername("testuser")
             .WithPassword("testpassword")
+            .WithName(GetRandomContainerName())
             .Build();
     }
 

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlServer.cs

@@ -1,5 +1,6 @@
 using DotNet.Testcontainers.Containers;
 
+using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 
 using PhenX.EntityFrameworkCore.BulkInsert.SqlServer;
@@ -14,7 +15,19 @@ public class TestDbContainerSqlServer<TDbContext> : TestDbContainer<TDbContext>
 {
     protected override IDatabaseContainer? GetDbContainer()
     {
-        return new MsSqlBuilder().Build();
+        return new MsSqlBuilder()
+            .WithName(GetRandomContainerName())
+            .Build();
+    }
+
+    protected override string GetConnectionString()
+    {
+        var connectionString = new SqlConnectionStringBuilder(base.GetConnectionString())
+        {
+            InitialCatalog = Guid.NewGuid().ToString("D")
+        };
+
+        return connectionString.ToString();
     }
 
     protected override void Configure(DbContextOptionsBuilder optionsBuilder)

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj

@@ -13,7 +13,6 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Meziantou.Xunit.ParallelTestFramework" Version="2.3.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsBase.cs

@@ -7,14 +7,15 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
-public abstract class BasicTestsBase : IAsyncLifetime
+public abstract class BasicTestsBase<TFixture> : IClassFixture<TFixture>, IAsyncLifetime
+    where TFixture : TestDbContainer<TestDbContext>
 {
-    protected BasicTestsBase(TestDbContainer<TestDbContext> dbContainer)
+    protected BasicTestsBase(TFixture dbContainer)
     {
         DbContainer = dbContainer;
     }
 
-    protected TestDbContainer<TestDbContext> DbContainer { get; }
+    protected TFixture DbContainer { get; }
 
     [Fact]
     public async Task InsertsEntitiesSuccessfully()
@@ -362,7 +363,13 @@ public void BulkInsert_WithOpenTransaction_RollsBackOnFailure_Sync()
         Assert.DoesNotContain(insertedEntities, e => e.Name == "EntityWithTxFail2");
     }
 
-    public Task InitializeAsync() => DbContainer.InitializeAsync();
+    public Task InitializeAsync()
+    {
+        return DbContainer.InitializeDbContextAsync();
+    }
 
-    public Task DisposeAsync() => DbContainer.DisposeAsync();
+    public Task DisposeAsync()
+    {
+        return DbContainer.DisposeDbContextAsync();
+    }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsPostgreSql.cs

@@ -6,9 +6,9 @@
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
 [Trait("Category", "PostgreSql")]
-public class BasicTestsPostgreSql : BasicTestsBase
+public class BasicTestsPostgreSql : BasicTestsBase<TestDbContainerPostgreSql<TestDbContext>>
 {
-    public BasicTestsPostgreSql() : base(new TestDbContainerPostgreSql<TestDbContext>())
+    public BasicTestsPostgreSql(TestDbContainerPostgreSql<TestDbContext> dbContainer) : base(dbContainer)
     {
     }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsSqlServer.cs

@@ -6,9 +6,9 @@
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
 [Trait("Category", "SqlServer")]
-public class BasicTestsSqlServer : BasicTestsBase
+public class BasicTestsSqlServer : BasicTestsBase<TestDbContainerSqlServer<TestDbContext>>
 {
-    public BasicTestsSqlServer() : base(new TestDbContainerSqlServer<TestDbContext>())
+    public BasicTestsSqlServer(TestDbContainerSqlServer<TestDbContext> dbContainer) : base(dbContainer)
     {
     }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsSqlite.cs

@@ -6,9 +6,9 @@
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
 [Trait("Category", "Sqlite")]
-public class BasicTestsSqlite : BasicTestsBase
+public class BasicTestsSqlite : BasicTestsBase<TestDbContainerSqlite<TestDbContext>>
 {
-    public BasicTestsSqlite() : base(new TestDbContainerSqlite<TestDbContext>())
+    public BasicTestsSqlite(TestDbContainerSqlite<TestDbContext> dbContainer) : base(dbContainer)
     {
     }
 }