Another test

SebastianStehle · SebastianStehle · commit a50c0b7051e1 · 2025-05-24T17:54:47.000+02:00
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerMySql.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerMySql.cs
@@ -9,14 +9,15 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
 
-public class TestDbContainerMySql<TDbContext> : TestDbContainer<TDbContext>
+public abstract class TestDbContainerMySql<TDbContext>(string reuseId) : TestDbContainer<TDbContext>
     where TDbContext : TestDbContextBase, new()
 {
     protected override IDatabaseContainer? GetDbContainer()
     {
         return new MySqlBuilder()
             .WithCommand("--log-bin-trust-function-creators=1", "--local-infile=1", "--innodb-print-all-deadlocks=ON")
             .WithReuse(true)
+            .WithLabel("reuse-id", reuseId)
             .Build();
     }
 
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerPostgreSql.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerPostgreSql.cs
@@ -9,7 +9,7 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
 
-public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>
+public abstract class TestDbContainerPostgreSql<TDbContext>(string reuseId) : TestDbContainer<TDbContext>
     where TDbContext : TestDbContextBase, new()
 {
     protected override IDatabaseContainer? GetDbContainer()
@@ -20,6 +20,7 @@ public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>
             .WithDatabase("testdb")
             .WithUsername("testuser")
             .WithPassword("testpassword")
+            .WithLabel("reuse-id", reuseId)
             .Build();
     }
 
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlServer.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlServer.cs
@@ -9,14 +9,15 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
 
-public class TestDbContainerSqlServer<TDbContext> : TestDbContainer<TDbContext>
+public abstract class TestDbContainerSqlServer<TDbContext>(string reuseId) : TestDbContainer<TDbContext>
     where TDbContext : TestDbContextBase, new()
 {
     protected override IDatabaseContainer? GetDbContainer()
     {
         return new MsSqlBuilder()
             .WithImage("vibs2006/sql_server_fts") // Geo Geospatial support
             .WithReuse(true)
+            .WithLabel("reuse-id", reuseId)
             .Build();
     }
 
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlite.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlite.cs
@@ -7,7 +7,7 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
 
-public class TestDbContainerSqlite<TDbContext> : TestDbContainer<TDbContext>
+public abstract class TestDbContainerSqlite<TDbContext> : TestDbContainer<TDbContext>
     where TDbContext : TestDbContextBase, new()
 {
     protected override IDatabaseContainer? GetDbContainer() => null;
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsMySql.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsMySql.cs
@@ -5,7 +5,14 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
+public class BasicTestsMySqlFixture : TestDbContainerSqlServer<TestDbContextMySql>
+{
+    public BasicTestsMySqlFixture() : base("basic-mysql")
+    {
+    }
+}
+
 [Trait("Category", "MySql")]
-public class BasicTestsMySql(TestDbContainerMySql<TestDbContextMySql> dbContainer) : BasicTestsBase<TestDbContainerMySql<TestDbContextMySql>, TestDbContextMySql>(dbContainer)
+public class BasicTestsMySql(BasicTestsMySqlFixture dbContainer) : BasicTestsBase<BasicTestsMySqlFixture, TestDbContextMySql>(dbContainer)
 {
 }
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsPostgreSql.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsPostgreSql.cs
@@ -5,7 +5,14 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
+public class BasicTestsPostgreSqlFixture : TestDbContainerSqlServer<TestDbContextPostgreSql>
+{
+    public BasicTestsPostgreSqlFixture() : base("basic-postgresql")
+    {
+    }
+}
+
 [Trait("Category", "PostgreSql")]
-public class BasicTestsPostgreSql(TestDbContainerPostgreSql<TestDbContextPostgreSql> dbContainer) : BasicTestsBase<TestDbContainerPostgreSql<TestDbContextPostgreSql>, TestDbContextPostgreSql>(dbContainer)
+public class BasicTestsPostgreSql(BasicTestsPostgreSqlFixture dbContainer) : BasicTestsBase<BasicTestsPostgreSqlFixture, TestDbContextPostgreSql>(dbContainer)
 {
 }
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsSqlServer.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsSqlServer.cs
@@ -5,7 +5,14 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
+public class BasicTestsSqlServerFixture : TestDbContainerSqlServer<TestDbContextSqlServer>
+{
+    public BasicTestsSqlServerFixture() : base("basic-sql-server")
+    {
+    }
+}
+
 [Trait("Category", "SqlServer")]
-public class BasicTestsSqlServer(TestDbContainerSqlServer<TestDbContextSqlServer> dbContainer) : BasicTestsBase<TestDbContainerSqlServer<TestDbContextSqlServer>, TestDbContextSqlServer>(dbContainer)
+public class BasicTestsSqlServer(BasicTestsSqlServerFixture dbContainer) : BasicTestsBase<BasicTestsSqlServerFixture, TestDbContextSqlServer>(dbContainer)
 {
 }
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsSqlite.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsSqlite.cs
@@ -5,8 +5,12 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;
 
+public class BasicTestsSqliteFixture : TestDbContainerSqlite<TestDbContextSqlite>
+{
+}
+
 [Trait("Category", "Sqlite")]
-public class BasicTestsSqlite(TestDbContainerSqlite<TestDbContextSqlite> dbContainer) : BasicTestsBase<TestDbContainerSqlite<TestDbContextSqlite>, TestDbContextSqlite>(dbContainer)
+public class BasicTestsSqlite(BasicTestsSqliteFixture dbContainer) : BasicTestsBase<BasicTestsSqliteFixture, TestDbContextSqlite>(dbContainer)
 {
 }
 
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsBase.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsBase.cs
@@ -1,10 +1,6 @@
 ﻿using NetTopologySuite.Geometries;
 
-using PhenX.EntityFrameworkCore.BulkInsert.Enums;
 using PhenX.EntityFrameworkCore.BulkInsert.Extensions;
-using PhenX.EntityFrameworkCore.BulkInsert.MySql;
-using PhenX.EntityFrameworkCore.BulkInsert.Options;
-using PhenX.EntityFrameworkCore.BulkInsert.SqlServer;
 using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
 using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
 
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsMySql.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsMySql.cs
@@ -5,7 +5,14 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
 
+public class GeoTestsMySqlFixture : TestDbContainerSqlServer<TestDbContextGeo>
+{
+    public GeoTestsMySqlFixture() : base("geo-mysql")
+    {
+    }
+}
+
 [Trait("Category", "MySql")]
-public class GeoTestsMySql(TestDbContainerMySql<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerMySql<TestDbContextGeo>, TestDbContextGeo>(dbContainer)
+public class GeoTestsMySql(GeoTestsMySqlFixture dbContainer) : GeoTestsBase<GeoTestsMySqlFixture, TestDbContextGeo>(dbContainer)
 {
 }
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsPostgreSql.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsPostgreSql.cs
@@ -5,7 +5,14 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
 
+public class GeoTestsPostgreSqlFixture : TestDbContainerSqlServer<TestDbContextGeo>
+{
+    public GeoTestsPostgreSqlFixture() : base("geo-postgresql")
+    {
+    }
+}
+
 [Trait("Category", "PostgreSql")]
-public class GeoTestsPostgreSql(TestDbContainerPostgreSql<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerPostgreSql<TestDbContextGeo>, TestDbContextGeo>(dbContainer)
+public class GeoTestsPostgreSql(GeoTestsPostgreSqlFixture dbContainer) : GeoTestsBase<GeoTestsPostgreSqlFixture, TestDbContextGeo>(dbContainer)
 {
 }
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsSqlServer.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsSqlServer.cs
@@ -5,7 +5,14 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
 
+public class GeoTestsSqlServerFixture : TestDbContainerSqlServer<TestDbContextGeo>
+{
+    public GeoTestsSqlServerFixture() : base("geo-sqlserver")
+    {
+    }
+}
+
 [Trait("Category", "SqlServer")]
-public class GeoTestsSqlServer(TestDbContainerSqlServer<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerSqlServer<TestDbContextGeo>, TestDbContextGeo>(dbContainer)
+public class GeoTestsSqlServer(GeoTestsSqlServerFixture dbContainer) : GeoTestsBase<GeoTestsSqlServerFixture, TestDbContextGeo>(dbContainer)
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,15 @@`
`9`	`9`
`10`	`10`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;`
`11`	`11`
`12`		`-public class TestDbContainerMySql<TDbContext> : TestDbContainer<TDbContext>`
	`12`	`+public abstract class TestDbContainerMySql<TDbContext>(string reuseId) : TestDbContainer<TDbContext>`
`13`	`13`	`where TDbContext : TestDbContextBase, new()`
`14`	`14`	`{`
`15`	`15`	`protected override IDatabaseContainer? GetDbContainer()`
`16`	`16`	`{`
`17`	`17`	`return new MySqlBuilder()`
`18`	`18`	`.WithCommand("--log-bin-trust-function-creators=1", "--local-infile=1", "--innodb-print-all-deadlocks=ON")`
`19`	`19`	`.WithReuse(true)`
	`20`	`+ .WithLabel("reuse-id", reuseId)`
`20`	`21`	`.Build();`
`21`	`22`	`}`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;`
`11`	`11`
`12`		`-public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>`
	`12`	`+public abstract class TestDbContainerPostgreSql<TDbContext>(string reuseId) : TestDbContainer<TDbContext>`
`13`	`13`	`where TDbContext : TestDbContextBase, new()`
`14`	`14`	`{`
`15`	`15`	`protected override IDatabaseContainer? GetDbContainer()`
`@@ -20,6 +20,7 @@ public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>`
`20`	`20`	`.WithDatabase("testdb")`
`21`	`21`	`.WithUsername("testuser")`
`22`	`22`	`.WithPassword("testpassword")`
	`23`	`+ .WithLabel("reuse-id", reuseId)`
`23`	`24`	`.Build();`
`24`	`25`	`}`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;`
`9`	`9`
`10`		`-public class TestDbContainerSqlite<TDbContext> : TestDbContainer<TDbContext>`
	`10`	`+public abstract class TestDbContainerSqlite<TDbContext> : TestDbContainer<TDbContext>`
`11`	`11`	`where TDbContext : TestDbContextBase, new()`
`12`	`12`	`{`
`13`	`13`	`protected override IDatabaseContainer? GetDbContainer() => null;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,14 @@`
`5`	`5`
`6`	`6`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;`
`7`	`7`
	`8`	`+public class BasicTestsMySqlFixture : TestDbContainerSqlServer<TestDbContextMySql>`
	`9`	`+{`
	`10`	`+ public BasicTestsMySqlFixture() : base("basic-mysql")`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+}`
	`14`	`+`
`8`	`15`	`[Trait("Category", "MySql")]`
`9`		`-public class BasicTestsMySql(TestDbContainerMySql<TestDbContextMySql> dbContainer) : BasicTestsBase<TestDbContainerMySql<TestDbContextMySql>, TestDbContextMySql>(dbContainer)`
	`16`	`+public class BasicTestsMySql(BasicTestsMySqlFixture dbContainer) : BasicTestsBase<BasicTestsMySqlFixture, TestDbContextMySql>(dbContainer)`
`10`	`17`	`{`
`11`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,14 @@`
`5`	`5`
`6`	`6`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;`
`7`	`7`
	`8`	`+public class BasicTestsPostgreSqlFixture : TestDbContainerSqlServer<TestDbContextPostgreSql>`
	`9`	`+{`
	`10`	`+ public BasicTestsPostgreSqlFixture() : base("basic-postgresql")`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+}`
	`14`	`+`
`8`	`15`	`[Trait("Category", "PostgreSql")]`
`9`		`-public class BasicTestsPostgreSql(TestDbContainerPostgreSql<TestDbContextPostgreSql> dbContainer) : BasicTestsBase<TestDbContainerPostgreSql<TestDbContextPostgreSql>, TestDbContextPostgreSql>(dbContainer)`
	`16`	`+public class BasicTestsPostgreSql(BasicTestsPostgreSqlFixture dbContainer) : BasicTestsBase<BasicTestsPostgreSqlFixture, TestDbContextPostgreSql>(dbContainer)`
`10`	`17`	`{`
`11`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,14 @@`
`5`	`5`
`6`	`6`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;`
`7`	`7`
	`8`	`+public class BasicTestsSqlServerFixture : TestDbContainerSqlServer<TestDbContextSqlServer>`
	`9`	`+{`
	`10`	`+ public BasicTestsSqlServerFixture() : base("basic-sql-server")`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+}`
	`14`	`+`
`8`	`15`	`[Trait("Category", "SqlServer")]`
`9`		`-public class BasicTestsSqlServer(TestDbContainerSqlServer<TestDbContextSqlServer> dbContainer) : BasicTestsBase<TestDbContainerSqlServer<TestDbContextSqlServer>, TestDbContextSqlServer>(dbContainer)`
	`16`	`+public class BasicTestsSqlServer(BasicTestsSqlServerFixture dbContainer) : BasicTestsBase<BasicTestsSqlServerFixture, TestDbContextSqlServer>(dbContainer)`
`10`	`17`	`{`
`11`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,12 @@`
`5`	`5`
`6`	`6`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Basic;`
`7`	`7`
	`8`	`+public class BasicTestsSqliteFixture : TestDbContainerSqlite<TestDbContextSqlite>`
	`9`	`+{`
	`10`	`+}`
	`11`	`+`
`8`	`12`	`[Trait("Category", "Sqlite")]`
`9`		`-public class BasicTestsSqlite(TestDbContainerSqlite<TestDbContextSqlite> dbContainer) : BasicTestsBase<TestDbContainerSqlite<TestDbContextSqlite>, TestDbContextSqlite>(dbContainer)`
	`13`	`+public class BasicTestsSqlite(BasicTestsSqliteFixture dbContainer) : BasicTestsBase<BasicTestsSqliteFixture, TestDbContextSqlite>(dbContainer)`
`10`	`14`	`{`
`11`	`15`	`}`
`12`	`16`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,14 @@`
`5`	`5`
`6`	`6`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;`
`7`	`7`
	`8`	`+public class GeoTestsMySqlFixture : TestDbContainerSqlServer<TestDbContextGeo>`
	`9`	`+{`
	`10`	`+ public GeoTestsMySqlFixture() : base("geo-mysql")`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+}`
	`14`	`+`
`8`	`15`	`[Trait("Category", "MySql")]`
`9`		`-public class GeoTestsMySql(TestDbContainerMySql<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerMySql<TestDbContextGeo>, TestDbContextGeo>(dbContainer)`
	`16`	`+public class GeoTestsMySql(GeoTestsMySqlFixture dbContainer) : GeoTestsBase<GeoTestsMySqlFixture, TestDbContextGeo>(dbContainer)`
`10`	`17`	`{`
`11`	`18`	`}`