Cleanup

carl-berg · Jun 20, 2024 · ff3d80b · ff3d80b
1 parent 49411c9
commit ff3d80b
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 125 deletions.
diff --git a/DataDude.Tests/Core/DatabaseFixture.cs b/DataDude.Tests/Core/DatabaseFixture.cs
@@ -1,37 +1,13 @@
-using System.Collections.Generic;
-using System.Reflection;
-using ADatabaseFixture;
-using ADatabaseFixture.GalacticWasteManagement;
-using GalacticWasteManagement;
-using GalacticWasteManagement.Scripts;
-using GalacticWasteManagement.Scripts.EmbeddedScripts;
-using GalacticWasteManagement.Scripts.ScriptProviders;
+using ADatabaseFixture;
+using Microsoft.Data.SqlClient;
 using Xunit;
 
 namespace DataDude.Tests.Core
 {
-    public class DatabaseFixture : DatabaseFixtureBase, IAsyncLifetime
+    public class DatabaseFixture() : DatabaseFixtureBase(
+        new SqlServerDatabaseAdapter(ConnectionFactory),
+        new FixtureMigrator()), IAsyncLifetime
     {
-        public DatabaseFixture()
-            : base(
-                new SqlServerDatabaseAdapter(),
-                GalacticWasteManagementMigrator.Create(new DefaultProjectSettings()))
-        {
-        }
-
-        private class DefaultProjectSettings : ProjectSettings
-        {
-            public DefaultProjectSettings()
-                : base(
-                new DefaultMigrationVersioning(),
-                new GalacticWasteManagement.SqlServer.MsSql150ScriptParser(),
-                new List<IScriptProvider>
-                {
-                    new BuiltInScriptsScriptProvider(),
-                    new EmbeddedScriptProvider(Assembly.GetAssembly(typeof(DatabaseFixture)), "Core.Scripts"),
-                })
-            {
-            }
-        }
+        public static SqlConnection ConnectionFactory(string connectionString) => new(connectionString);
     }
 }
diff --git a/DataDude.Tests/Core/DatabaseTest.cs b/DataDude.Tests/Core/DatabaseTest.cs
@@ -1,18 +1,13 @@
-using System;
-using System.Threading.Tasks;
-using ADatabaseFixture.GalacticWasteManagement;
+using System.Threading.Tasks;
 using Respawn;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace DataDude.Tests.Core
 {
     [Collection("DatabaseIntegrationTest")]
-    public abstract class DatabaseTest : IAsyncLifetime
+    public abstract class DatabaseTest(DatabaseFixture fixture) : IAsyncLifetime
     {
-        public DatabaseTest(DatabaseFixture fixture) => Fixture = fixture;
-
-        public DatabaseFixture Fixture { get; }
+        public DatabaseFixture Fixture { get; } = fixture;
 
         private static Respawner Checkpoint { get; set; }
 

diff --git a/DataDude.Tests/Core/FixtureMigrator.cs b/DataDude.Tests/Core/FixtureMigrator.cs
@@ -0,0 +1,31 @@
+using ADatabaseMigrator.Hashing;
+using ADatabaseMigrator.Journaling;
+using ADatabaseMigrator.ScriptLoading.EmbeddedResources;
+using ADatabaseMigrator;
+using ADatabaseMigrator.ScriptLoading.EmbeddedResources.Versioning;
+using System.Data.Common;
+using Microsoft.Data.SqlClient;
+using System.Threading.Tasks;
+using System.Threading;
+using ADatabaseMigrator.SqlServer;
+
+namespace DataDude.Tests.Core
+{
+    public class FixtureMigrator : ADatabaseFixture.IMigrator
+    {
+        public const string VersioningTable = MigrationScriptJournalManager.JournalTableName;
+
+        public async Task MigrateUp(string connectionString, CancellationToken? cancellationToken)
+        {
+            using var connection = new SqlConnection(connectionString);
+            connection.Open();
+            await new Migrator(
+                    scriptLoader: new EmbeddedResourceScriptLoader(new MD5ScriptHasher(), config => config
+                        .UsingAssemblyFromType<FixtureMigrator>()
+                            .AddNamespaces<VersionFromPathVersionLoader>(MigrationScriptRunType.RunOnce, "Core.Scripts.Migrations")),
+                    journalManager: new MigrationScriptJournalManager(connection),
+                    scriptRunner: new SqlServerMigrationScriptRunner(connection))
+                .Migrate(cancellationToken);
+        }
+    }
+}
diff --git a/DataDude.Tests/Core/TestSchema.cs b/DataDude.Tests/Core/TestSchema.cs
@@ -1,17 +1,11 @@
-using System.Data;
-using System.Data.Common;
+using System.Data.Common;
 using System.Threading.Tasks;
 using DataDude.Schema;
 
 namespace DataDude.Tests.Core
 {
-    public class TestSchema : SchemaInformation, ISchemaLoader
+    public class TestSchema() : SchemaInformation([]), ISchemaLoader
     {
-        public TestSchema()
-            : base(System.Array.Empty<TableInformation>())
-        {
-        }
-
         public bool CacheSchema { get; set; }
 
         public TestTable AddTable(string name) => AddTable(new TestTable(name));

diff --git a/DataDude.Tests/Core/TestTable.cs b/DataDude.Tests/Core/TestTable.cs
@@ -10,7 +10,7 @@ public class TestTable : TableInformation
         public TestTable(string name)
             : this(name, c => c.AddIntegerColumn("Id", true))
         {
-            AddIndex(new IndexInformation(this, $"PK_{name}", new[] { this["Id"] ! }, true, false, false, false));
+            AddIndex(new IndexInformation(this, $"PK_{name}", [this["Id"] !], true, false, false, false));
         }
 
         public TestTable(string name, Action<TestTableColumnBuilder> configureColumns)

diff --git a/DataDude.Tests/DataDude.Tests.csproj b/DataDude.Tests/DataDude.Tests.csproj
@@ -1,21 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ADatabaseFixture.GalacticWasteManagement" Version="0.4.0" />
-    <PackageReference Include="ADatabaseFixture.SqlServer" Version="0.4.0" />
-    <PackageReference Include="FakeItEasy" Version="7.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="ADatabaseFixture" Version="0.5.1" />
+    <PackageReference Include="ADatabaseMigrator" Version="0.2.2" />
+    <PackageReference Include="ADatabaseMigrator.SqlServer" Version="0.1.0" />
+    <PackageReference Include="Dapper" Version="2.1.35" />
+    <PackageReference Include="FakeItEasy" Version="8.3.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
-    <PackageReference Include="Respawn" Version="6.0.0" />
-    <PackageReference Include="Shouldly" Version="4.1.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Respawn" Version="6.2.1" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/DataDude.Tests/ExecutionTests.cs b/DataDude.Tests/ExecutionTests.cs
@@ -6,13 +6,8 @@
 
 namespace DataDude.Tests
 {
-    public class ExecutionTests : DatabaseTest
+    public class ExecutionTests(DatabaseFixture fixture) : DatabaseTest(fixture)
     {
-        public ExecutionTests(DatabaseFixture fixture)
-            : base(fixture)
-        {
-        }
-
         [Fact]
         public async Task Can_Execute_Instruction()
         {

diff --git a/...Tests/Inserts/AutoInsertFKTableTestscs.cs → ...e.Tests/Inserts/AutoInsertFKTableTests.cs b/...Tests/Inserts/AutoInsertFKTableTestscs.cs → ...e.Tests/Inserts/AutoInsertFKTableTests.cs
@@ -10,7 +10,7 @@
 
 namespace DataDude.Tests.Inserts
 {
-    public class AutoInsertFKTableTestscs
+    public class AutoInsertFKTableTests
     {
         [Fact]
         public async Task Chain()