WIP

unittests/Oracle/Database.cs

@@ -5,11 +5,5 @@
 namespace Oracle;
 
 [Collection(nameof(OracleTestContainer))]
-public class Database : GenericDatabase, IClassFixture<SimpleService>
-{
-    public Database(OracleTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new OracleGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-}
+public class Database(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : GenericDatabase(testContext, testOutput);

unittests/Oracle/MigrationTables.cs

@@ -6,13 +6,9 @@
 namespace Oracle;
 
 [Collection(nameof(OracleTestContainer))]
-public class MigrationTables : GenericMigrationTables, IClassFixture<SimpleService>
+public class MigrationTables(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : GenericMigrationTables(testContext, testOutput)
 {
-    public MigrationTables(OracleTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new OracleGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
 
     protected override Task CheckTableCasing(string tableName, string funnyCasing, Func<GrateConfiguration, string, GrateConfiguration> setTableName)
     {

unittests/Sqlite/Database.cs

@@ -5,16 +5,12 @@
 namespace Sqlite;
 
 [Collection(nameof(SqliteTestContainer))]
-public class Database : TestCommon.Generic.GenericDatabase, IClassFixture<SimpleService>
+// ReSharper disable once InconsistentNaming
+// ReSharper disable once UnusedType.Global
+public class Database(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.GenericDatabase(testContext, testOutput)
 {
-
-    public Database(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-
+
     protected override async Task CreateDatabaseFromConnectionString(string db, string connectionString)
     {
         await using var conn = new SqliteConnection(connectionString);
@@ -50,4 +46,5 @@ public override Task Is_created_with_custom_script_if_custom_create_database_fol
     [Fact(Skip = "SQLite does not support docker container")]
     public override Task Is_up_and_running_with_appropriate_database_version() => Task.CompletedTask;
     protected override bool ThrowOnMissingDatabase => false;
+
 }

unittests/Sqlite/MigrationTables.cs

@@ -4,13 +4,11 @@
 namespace Sqlite;
 
 [Collection(nameof(SqliteTestContainer))]
-public class MigrationTables : TestCommon.Generic.GenericMigrationTables, IClassFixture<SimpleService>
+// ReSharper disable once InconsistentNaming
+// ReSharper disable once UnusedType.Global
+public class MigrationTables(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.GenericMigrationTables(testContext, testOutput)
 {
-    public MigrationTables(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
 
     protected override string CountTableSql(string schemaName, string tableName)
     {

unittests/Sqlite/Running_MigrationScripts/Anytime_scripts.cs

@@ -3,15 +3,9 @@
 
 namespace Sqlite.Running_MigrationScripts;
 
+
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class Anytime_scripts : TestCommon.Generic.Running_MigrationScripts.Anytime_scripts, IClassFixture<SimpleService>
-{
-
-    public Anytime_scripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-}
+// ReSharper disable once UnusedType.Global
+public class Anytime_scripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.Anytime_scripts(testContext, testOutput);

unittests/Sqlite/Running_MigrationScripts/DropDatabase.cs

@@ -4,12 +4,7 @@
 namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
-public class DropDatabase : TestCommon.Generic.Running_MigrationScripts.DropDatabase, IClassFixture<SimpleService>
-{
-    public DropDatabase(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-}
+// ReSharper disable once InconsistentNaming
+// ReSharper disable once UnusedType.Global
+public class DropDatabase(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.DropDatabase(testContext, testOutput);

unittests/Sqlite/Running_MigrationScripts/Environment_scripts.cs

@@ -5,12 +5,7 @@ namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class Environment_scripts : TestCommon.Generic.Running_MigrationScripts.Environment_scripts, IClassFixture<SimpleService>
-{
-    public Environment_scripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
+// ReSharper disable once UnusedType.Global
+public class Environment_scripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.Environment_scripts(testContext, testOutput);
 
-}

unittests/Sqlite/Running_MigrationScripts/Everytime_scripts.cs

@@ -5,12 +5,6 @@ namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class Everytime_scripts : TestCommon.Generic.Running_MigrationScripts.Everytime_scripts, IClassFixture<SimpleService>
-{
-    public Everytime_scripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-}
+// ReSharper disable once UnusedType.Global
+public class Everytime_scripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.Everytime_scripts(testContext, testOutput);

unittests/Sqlite/Running_MigrationScripts/Failing_Scripts.cs

@@ -5,14 +5,9 @@ namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class Failing_Scripts : TestCommon.Generic.Running_MigrationScripts.Failing_Scripts, IClassFixture<SimpleService>
+// ReSharper disable once UnusedType.Global
+public class Failing_Scripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.Failing_Scripts(testContext, testOutput)
 {
-    public Failing_Scripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-
     protected override string ExpectedErrorMessageForInvalidSql => "SQLite Error 1: 'no such column: TOP'.";
 }

unittests/Sqlite/Running_MigrationScripts/One_time_scripts.cs

@@ -5,12 +5,6 @@ namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class One_time_scripts : TestCommon.Generic.Running_MigrationScripts.One_time_scripts, IClassFixture<SimpleService>
-{
-    public One_time_scripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-}
+// ReSharper disable once UnusedType.Global
+public class One_time_scripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.One_time_scripts(testContext, testOutput);

unittests/Sqlite/Running_MigrationScripts/Order_Of_Scripts.cs

@@ -5,12 +5,6 @@ namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class Order_Of_Scripts : TestCommon.Generic.Running_MigrationScripts.Order_Of_Scripts, IClassFixture<SimpleService>
-{
-    public Order_Of_Scripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
-
-}
+// ReSharper disable once UnusedType.Global
+public class Order_Of_Scripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.Order_Of_Scripts(testContext, testOutput);

unittests/Sqlite/Running_MigrationScripts/ScriptsRun_Table.cs

@@ -4,12 +4,8 @@
 namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
-public class ScriptsRun_Table : TestCommon.Generic.Running_MigrationScripts.ScriptsRun_Table, IClassFixture<SimpleService>
-{
-    public ScriptsRun_Table(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
+// ReSharper disable once InconsistentNaming
+// ReSharper disable once UnusedType.Global
+public class ScriptsRun_Table(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.ScriptsRun_Table(testContext, testOutput);
 
-}

unittests/Sqlite/Running_MigrationScripts/TokenScripts.cs

@@ -4,12 +4,8 @@
 namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
-public class TokenScripts : TestCommon.Generic.Running_MigrationScripts.TokenScripts, IClassFixture<SimpleService>
-{
-    public TokenScripts(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
+// ReSharper disable once InconsistentNaming
+// ReSharper disable once UnusedType.Global
+public class TokenScripts(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.TokenScripts(testContext, testOutput);
 
-}

unittests/Sqlite/Running_MigrationScripts/Versioning_The_Database.cs

@@ -5,12 +5,7 @@ namespace Sqlite.Running_MigrationScripts;
 
 [Collection(nameof(SqliteTestContainer))]
 // ReSharper disable once InconsistentNaming
-public class Versioning_The_Database : TestCommon.Generic.Running_MigrationScripts.Versioning_The_Database, IClassFixture<SimpleService>
-{
-    public Versioning_The_Database(SqliteTestContainer testContainer, SimpleService simpleService, ITestOutputHelper testOutput)
-    {
-        Context = new SqliteGrateTestContext(simpleService.ServiceProvider, testContainer);
-        TestOutput = testOutput;
-    }
+// ReSharper disable once UnusedType.Global
+public class Versioning_The_Database(IGrateTestContext testContext, ITestOutputHelper testOutput)
+    : TestCommon.Generic.Running_MigrationScripts.Versioning_The_Database(testContext, testOutput);
 
-}

unittests/Sqlite/Sqlite.csproj

@@ -14,6 +14,8 @@
       <PackageReference Include="xunit.runner.visualstudio"/>
       <PackageReference Include="coverlet.collector" />
       <PackageReference Include="XunitXml.TestLogger" />
+      <PackageReference Include="Xunit.DependencyInjection" />
+      <PackageReference Include="Xunit.DependencyInjection.Logging" />
   </ItemGroup>
 
   <ItemGroup>

unittests/Sqlite/Startup.cs

@@ -0,0 +1,57 @@
+using grate.Configuration;
+using grate.Infrastructure;
+using grate.Migration;
+using grate.PostgreSql.Infrastructure;
+using grate.PostgreSql.Migration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Sqlite.TestInfrastructure;
+using TestCommon.TestInfrastructure;
+
+namespace PostgreSQL;
+
+// ReSharper disable once UnusedType.Global
+public class Startup
+{
+    // ReSharper disable once UnusedMember.Global
+    public void ConfigureServices(IServiceCollection services, HostBuilderContext context)
+    {
+        services
+            .AddLogging(
+                lb => lb
+                    .AddXUnit()
+                    .AddConsole()
+                    .SetMinimumLevel(TestConfig.GetLogLevel())
+            )
+            .AddSingleton<IGrateMigrator, GrateMigrator>()
+            .AddSingleton<Func<GrateConfiguration, GrateMigrator>>(provider =>
+            config =>
+            {
+                IDatabase database = provider.GetRequiredService<IDatabase>();
+
+                ILogger<DbMigrator> dbLogger = provider.GetRequiredService<ILogger<DbMigrator>>();
+                ILogger<GrateMigrator> grateLogger = provider.GetRequiredService<ILogger<GrateMigrator>>();
+
+                IHashGenerator hashGenerator = provider.GetRequiredService<IHashGenerator>();
+                return 
+                    new GrateMigrator(grateLogger,
+                    new DbMigrator(database, dbLogger, hashGenerator, config));
+            })
+            .AddSingleton<IHashGenerator, HashGenerator>()
+
+            .AddTransient<IGrateTestContext, SqliteGrateTestContext>()
+
+            .AddTransient<IDatabase, PostgreSqlDatabase>()
+            .AddSingleton<ISyntax, PostgreSqlSyntax>()
+            .AddSingleton<IDatabaseConnectionFactory, SqliteConnectionFactory>()
+            .AddSingleton<StatementSplitter>()
+            .AddSingleton(service =>
+            {
+                var database = service.GetService<IDatabase>()!;
+                return new StatementSplitter(database.StatementSeparatorRegex);
+            });
+            ;
+
+    }
+}