Fixing a racing condition in tests

tsutomi · tsutomi · commit 072cbb353431 · 2025-07-23T20:34:20.000+02:00
diff --git a/test/Deveel.Repository.Core.XUnit/Deveel.Repository.Core.XUnit.csproj b/test/Deveel.Repository.Core.XUnit/Deveel.Repository.Core.XUnit.csproj
@@ -6,7 +6,6 @@
 
   <PropertyGroup>
     <NoWarn>1701;1702;CS8618</NoWarn>
-    <RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.Core.XUnit\bin\Debug\net7.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.Core.XUnit %28net7.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
diff --git a/test/Deveel.Repository.DynamicLinq.XUnit/Deveel.Repository.DynamicLinq.XUnit.csproj b/test/Deveel.Repository.DynamicLinq.XUnit/Deveel.Repository.DynamicLinq.XUnit.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.DynamicLinq.XUnit\bin\Debug\net6.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.DynamicLinq.XUnit %28net6.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Deveel.Repository.EntityFramework.XUnit/Data/EntityTenantRepositoryTestSuite.cs b/test/Deveel.Repository.EntityFramework.XUnit/Data/EntityTenantRepositoryTestSuite.cs
@@ -19,7 +19,7 @@ public class EntityTenantRepositoryTestSuite : MultiTenantRepositoryTestSuite<Db
 	{
 		private readonly SqlTestConnection sql;
 
-		public EntityTenantRepositoryTestSuite(SqlTestConnection sql, ITestOutputHelper? testOutput) : base(testOutput)
+		public EntityTenantRepositoryTestSuite(SqlTenantTestConnection sql, ITestOutputHelper? testOutput) : base(testOutput)
 		{
 			this.sql = sql;
 		}
diff --git a/test/Deveel.Repository.EntityFramework.XUnit/Data/SqlTenantConnectionCollection.cs b/test/Deveel.Repository.EntityFramework.XUnit/Data/SqlTenantConnectionCollection.cs
@@ -1,5 +1,5 @@
 ﻿namespace Deveel.Data {
 	[CollectionDefinition(nameof(SqlTenantConnectionCollection))]
-	public class SqlTenantConnectionCollection : SqlConnectionCollection {
+	public class SqlTenantConnectionCollection : ICollectionFixture<SqlTenantTestConnection> {
 	}
 }
diff --git a/test/Deveel.Repository.EntityFramework.XUnit/Data/SqlTenantTestConnection.cs b/test/Deveel.Repository.EntityFramework.XUnit/Data/SqlTenantTestConnection.cs
@@ -0,0 +1,9 @@
+﻿namespace Deveel.Data
+{
+	public class SqlTenantTestConnection : SqlTestConnection
+	{
+		public SqlTenantTestConnection() : base("deveel-tenant-test") {
+			// This constructor initializes the connection for tenant tests
+		}
+	}
+}
diff --git a/test/Deveel.Repository.EntityFramework.XUnit/Data/SqlTestConnection.cs b/test/Deveel.Repository.EntityFramework.XUnit/Data/SqlTestConnection.cs
@@ -3,8 +3,11 @@
 
 namespace Deveel.Data {
 	public class SqlTestConnection : IDisposable {
-		public SqlTestConnection() {
-			Connection = new SqliteConnection("Data Source=TestDb;Mode=Memory;Cache=Shared");
+		public SqlTestConnection() : this("deveel-test") {
+		}
+
+		protected SqlTestConnection(string databaseName) {
+			Connection = new SqliteConnection($"Data Source={databaseName};Mode=Memory;Cache=Shared");
 			if (Connection.State != System.Data.ConnectionState.Open)
 				Connection.Open();
 
diff --git a/test/Deveel.Repository.EntityFramework.XUnit/Deveel.Repository.EntityFramework.XUnit.csproj b/test/Deveel.Repository.EntityFramework.XUnit/Deveel.Repository.EntityFramework.XUnit.csproj
@@ -2,7 +2,6 @@
 
 	<PropertyGroup>
 		<IsTestProject>true</IsTestProject>
-		<RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.EntityFramework.XUnit\bin\Debug\net8.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.EntityFramework.XUnit %28net8.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
 	</PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
diff --git a/test/Deveel.Repository.InMemory.XUnit/Deveel.Repository.InMemory.XUnit.csproj b/test/Deveel.Repository.InMemory.XUnit/Deveel.Repository.InMemory.XUnit.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.InMemory.XUnit\bin\Debug\net8.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.InMemory.XUnit %28net8.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
diff --git a/test/Deveel.Repository.Manager.EasyCaching.XUnit/Deveel.Repository.Manager.EasyCaching.XUnit.csproj b/test/Deveel.Repository.Manager.EasyCaching.XUnit/Deveel.Repository.Manager.EasyCaching.XUnit.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.Manager.EasyCaching.XUnit\bin\Debug\net7.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.Manager.EasyCaching.XUnit %28net7.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Deveel.Repository.Manager.XUnit/Deveel.Repository.Manager.XUnit.csproj b/test/Deveel.Repository.Manager.XUnit/Deveel.Repository.Manager.XUnit.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.Manager.XUnit\bin\Debug\net8.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.Manager.XUnit %28net8.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Deveel.Repository.MongoFramework.XUnit/Deveel.Repository.MongoFramework.XUnit.csproj b/test/Deveel.Repository.MongoFramework.XUnit/Deveel.Repository.MongoFramework.XUnit.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <RunSettingsFilePath>D:\deveel\deveel.repository\test\Deveel.Repository.MongoFramework.XUnit\bin\Debug\net7.0\fine-code-coverage\coverage-tool-output\Deveel.Repository.MongoFramework.XUnit %28net7.0%29-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class EntityTenantRepositoryTestSuite : MultiTenantRepositoryTestSuite<Db`
`19`	`19`	`{`
`20`	`20`	`private readonly SqlTestConnection sql;`
`21`	`21`
`22`		`- public EntityTenantRepositoryTestSuite(SqlTestConnection sql, ITestOutputHelper? testOutput) : base(testOutput)`
	`22`	`+ public EntityTenantRepositoryTestSuite(SqlTenantTestConnection sql, ITestOutputHelper? testOutput) : base(testOutput)`
`23`	`23`	`{`
`24`	`24`	`this.sql = sql;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`namespace Deveel.Data {`
`2`	`2`	`[CollectionDefinition(nameof(SqlTenantConnectionCollection))]`
`3`		`- public class SqlTenantConnectionCollection : SqlConnectionCollection {`
	`3`	`+ public class SqlTenantConnectionCollection : ICollectionFixture<SqlTenantTestConnection> {`
`4`	`4`	`}`
`5`	`5`	`}`