Test code refactoring. Minor CI change.

.gitea/workflows/ci.yml

@@ -11,10 +11,10 @@ jobs:
       image: ghcr.io/catthehacker/ubuntu:act-latest
       options: >-
         --privileged
+        --add-host=host.testcontainers.internal:host-gateway
     env:
-      TESTCONTAINERS_RYUK_DISABLED: 'true'
+      # Testcontainers will substitute this host into GetConnectionString()
-      TESTCONTAINERS_CHECKS_DISABLE: 'true'
+      TESTCONTAINERS_HOST_OVERRIDE: host.testcontainers.internal
-      TESTCONTAINERS_HOST_OVERRIDE: host.docker.internal
     steps:
       - uses: actions/checkout@v4  
       - uses: actions/setup-dotnet@v4

JSMR.Tests/Fixtures/MariaDbClone.cs

@@ -54,6 +54,13 @@ public static class MariaDbClone
             await ExecAsync(root, $"USE `{databaseName}`; {createTable};");
         }
 
+        //await Parallel.ForEachAsync(tables, async (table, cancellationToken) =>
+        //{
+        //    var createTable = await ShowCreateTableAsync(root, templateDbName, table);
+        //    // Run DDL in the new DB (the CREATE statement itself doesn't include db name)
+        //    await ExecAsync(root, $"USE `{databaseName}`; {createTable};");
+        //});
+
         // 2) Copy data
         foreach (var table in tables)
         {

JSMR.Tests/Fixtures/MariaDbContainerFixture.cs

@@ -1,6 +1,5 @@
 using DotNet.Testcontainers.Builders;
 using JSMR.Tests.Fixtures;
-using JSMR.Tests.Ingestion;
 using Testcontainers.MariaDb;
 
 [assembly: AssemblyFixture(typeof(MariaDbContainerFixture))]

JSMR.Tests/Ingestion/English/EnglishIngestionTestBase.cs

@@ -0,0 +1,9 @@
+using JSMR.Infrastructure.Common.Languages;
+using JSMR.Tests.Fixtures;
+
+namespace JSMR.Tests.Ingestion.English;
+
+public abstract class EnglishIngestionTestBase(MariaDbContainerFixture container) : IngestionTestsBase(container)
+{
+    protected static LanguageIdentifier LanguageIdentifier = new();
+}

JSMR.Tests/Ingestion/English/English_Fail_Attempted_Insert_When_Not_English_Tests.cs

@@ -1,6 +1,5 @@
 using JSMR.Application.Scanning.Contracts;
 using JSMR.Application.Scanning.Ports;
-using JSMR.Infrastructure.Common.Languages;
 using JSMR.Infrastructure.Data;
 using JSMR.Infrastructure.Ingestion;
 using JSMR.Tests.Fixtures;
@@ -9,16 +8,12 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.English;
 
-public class English_Fail_Attempted_Insert_When_Not_English_Tests(MariaDbContainerFixture container)
+public class English_Fail_Attempted_Insert_When_Not_English_Tests(MariaDbContainerFixture container) : EnglishIngestionTestBase(container)
 {
-    private readonly LanguageIdentifier languageIdentifier = new();
-
     [Fact]
     public async Task Fail_Attempted_Insert_When_Not_English()
     {
-        await using AppDbContext dbContext = await MariaTestDb.CreateIsolatedAsync(
+        await using AppDbContext dbContext = await GetAppDbContextAsync();
-            container.RootConnectionString,
-            seed: VoiceWorkIngestionSeedData.SeedAsync);
 
         VoiceWorkIngest ingest = new()
         {
@@ -29,7 +24,7 @@ public class English_Fail_Attempted_Insert_When_Not_English_Tests(MariaDbContain
             Description = "最高の製品です！"
         };
 
-        EnglishVoiceWorkUpdater updater = new(dbContext, languageIdentifier);
+        EnglishVoiceWorkUpdater updater = new(dbContext, LanguageIdentifier);
         VoiceWorkUpsertResult[] results = await updater.UpsertAsync([ingest], CancellationToken.None);
 
         int englishVoiceWorkCount = await dbContext.EnglishVoiceWorks.CountAsync(CancellationToken.None);

JSMR.Tests/Ingestion/English/English_Fail_Attempted_Insert_With_Missing_Circle_Tests.cs

@@ -1,6 +1,5 @@
 using JSMR.Application.Scanning.Contracts;
 using JSMR.Application.Scanning.Ports;
-using JSMR.Infrastructure.Common.Languages;
 using JSMR.Infrastructure.Data;
 using JSMR.Infrastructure.Ingestion;
 using JSMR.Tests.Fixtures;
@@ -9,16 +8,12 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.English;
 
-public class English_Fail_Attempted_Insert_With_Missing_Circle_Tests(MariaDbContainerFixture container) //: IAssemblyFixture<MariaDbContainerFixture>
+public class English_Fail_Attempted_Insert_With_Missing_Circle_Tests(MariaDbContainerFixture container) : EnglishIngestionTestBase(container)
 {
-    private readonly LanguageIdentifier languageIdentifier = new();
-
     [Fact]
     public async Task Fail_Attempted_Insert_With_Missing_Circle()
     {
-        await using AppDbContext dbContext = await MariaTestDb.CreateIsolatedAsync(
+        await using AppDbContext dbContext = await GetAppDbContextAsync();
-            container.RootConnectionString,
-            seed: VoiceWorkIngestionSeedData.SeedAsync);
 
         VoiceWorkIngest ingest = new()
         {
@@ -29,7 +24,7 @@ public class English_Fail_Attempted_Insert_With_Missing_Circle_Tests(MariaDbCont
             Description = "EN Desc"
         };
 
-        EnglishVoiceWorkUpdater updater = new(dbContext, languageIdentifier);
+        EnglishVoiceWorkUpdater updater = new(dbContext, LanguageIdentifier);
         VoiceWorkUpsertResult[] results = await updater.UpsertAsync([ingest], CancellationToken.None);
 
         int englishVoiceWorkCount = await dbContext.EnglishVoiceWorks.CountAsync(CancellationToken.None);

JSMR.Tests/Ingestion/English/English_Fail_Attempted_Insert_With_Missing_Product_Tests.cs

@@ -1,6 +1,5 @@
 using JSMR.Application.Scanning.Contracts;
 using JSMR.Application.Scanning.Ports;
-using JSMR.Infrastructure.Common.Languages;
 using JSMR.Infrastructure.Data;
 using JSMR.Infrastructure.Ingestion;
 using JSMR.Tests.Fixtures;
@@ -9,16 +8,12 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.English;
 
-public class English_Fail_Attempted_Insert_With_Missing_Product_Tests(MariaDbContainerFixture container)
+public class English_Fail_Attempted_Insert_With_Missing_Product_Tests(MariaDbContainerFixture container) : EnglishIngestionTestBase(container)
 {
-    private readonly LanguageIdentifier languageIdentifier = new();
-
     [Fact]
     public async Task Fail_Attempted_Insert_With_Missing_Product()
     {
-        await using AppDbContext dbContext = await MariaTestDb.CreateIsolatedAsync(
+        await using AppDbContext dbContext = await GetAppDbContextAsync();
-            container.RootConnectionString,
-            seed: VoiceWorkIngestionSeedData.SeedAsync);
 
         VoiceWorkIngest ingest = new()
         {
@@ -29,7 +24,7 @@ public class English_Fail_Attempted_Insert_With_Missing_Product_Tests(MariaDbCon
             Description = "EN Desc"
         };
 
-        EnglishVoiceWorkUpdater updater = new(dbContext, languageIdentifier);
+        EnglishVoiceWorkUpdater updater = new(dbContext, LanguageIdentifier);
         VoiceWorkUpsertResult[] results = await updater.UpsertAsync([ingest], CancellationToken.None);
 
         int englishVoiceWorkCount = await dbContext.EnglishVoiceWorks.CountAsync(CancellationToken.None);

JSMR.Tests/Ingestion/English/English_Insert_Then_Update_Tests.cs

@@ -1,7 +1,6 @@
 using JSMR.Application.Scanning.Contracts;
 using JSMR.Application.Scanning.Ports;
 using JSMR.Domain.Entities;
-using JSMR.Infrastructure.Common.Languages;
 using JSMR.Infrastructure.Data;
 using JSMR.Infrastructure.Ingestion;
 using JSMR.Tests.Fixtures;
@@ -10,16 +9,12 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.English;
 
-public class English_Insert_Then_Update_Tests(MariaDbContainerFixture container) //: IAssemblyFixture<MariaDbContainerFixture>
+public class English_Insert_Then_Update_Tests(MariaDbContainerFixture container) : EnglishIngestionTestBase(container)
 {
-    private readonly LanguageIdentifier languageIdentifier = new();
-
     [Fact]
     public async Task Insert_Then_Update()
     {
-        await using AppDbContext dbContext = await MariaTestDb.CreateIsolatedAsync(
+        await using AppDbContext dbContext = await GetAppDbContextAsync();
-            container.RootConnectionString,
-            seed: VoiceWorkIngestionSeedData.SeedAsync);
 
         // Part 1 -- Insert
         VoiceWorkIngest ingest = new()
@@ -31,7 +26,7 @@ public class English_Insert_Then_Update_Tests(MariaDbContainerFixture container)
             Description = "An average product. (EN)"
         };
 
-        EnglishVoiceWorkUpdater updater = new(dbContext, languageIdentifier);
+        EnglishVoiceWorkUpdater updater = new(dbContext, LanguageIdentifier);
         VoiceWorkUpsertResult[] results = await updater.UpsertAsync([ingest], TestContext.Current.CancellationToken);
 
         VoiceWork voiceWork = await dbContext.VoiceWorks.SingleAsync(v => v.ProductId == "RJ0000001", TestContext.Current.CancellationToken);

JSMR.Tests/Ingestion/IngestionTestsBase.cs

@@ -0,0 +1,15 @@
+using JSMR.Infrastructure.Data;
+using JSMR.Tests.Fixtures;
+
+namespace JSMR.Tests.Ingestion;
+
+public abstract class IngestionTestsBase(MariaDbContainerFixture container)
+{
+    protected async Task<AppDbContext> GetAppDbContextAsync()
+    {
+        return await MariaDbClone.CloneFromTemplateAsync(
+            container.RootConnectionString,
+            container.TemplateDbName,
+            seed: VoiceWorkIngestionSeedData.SeedAsync);
+    }
+}

JSMR.Tests/Ingestion/Japanese/Fail_Attempted_Insert_With_Spam_Circle_Tests.cs

@@ -10,7 +10,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Fail_Attempted_Insert_With_Spam_Circle_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Fail_Attempted_Insert_With_Spam_Circle_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Fail_Attempted_Insert_With_Spam_Circle()

JSMR.Tests/Ingestion/Japanese/Fail_Attempted_Update_With_Decreased_Downloads_Tests.cs

@@ -10,7 +10,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Fail_Attempted_Update_With_Decreased_Downloads_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Fail_Attempted_Update_With_Decreased_Downloads_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Fail_Attempted_Update_With_Decreased_Downloads()

JSMR.Tests/Ingestion/Japanese/Fail_Attempted_Update_With_Sales_Date_Reversal_Tests.cs

@@ -10,7 +10,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Fail_Attempted_Update_With_Sales_Date_Reversal_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Fail_Attempted_Update_With_Sales_Date_Reversal_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Fail_Attempted_Update_With_Decreased_Downloads()

JSMR.Tests/Ingestion/Japanese/Insert_New_Release_And_Scan_Again_Later_Tests.cs

@@ -9,7 +9,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Insert_New_Release_And_Scan_Again_Later_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Insert_New_Release_And_Scan_Again_Later_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Insert_New_Release_And_Scan_Again_Later()

JSMR.Tests/Ingestion/Japanese/Insert_New_Release_With_New_Tags_And_Creators_Tests.cs

@@ -10,7 +10,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Insert_New_Release_With_New_Tags_And_Creators_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Insert_New_Release_With_New_Tags_And_Creators_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Insert_New_Release_With_New_Tags_And_Creators()

JSMR.Tests/Ingestion/Japanese/Insert_New_Upcoming_And_Scan_Again_Later_Tests.cs

@@ -9,7 +9,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Insert_New_Upcoming_And_Scan_Again_Later_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Insert_New_Upcoming_And_Scan_Again_Later_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Insert_New_Upcoming_And_Scan_Again_Later()

JSMR.Tests/Ingestion/Japanese/Insert_New_Upcoming_Release_Same_Day_Tests.cs

@@ -9,7 +9,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Insert_New_Upcoming_Release_Same_Day_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Insert_New_Upcoming_Release_Same_Day_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Insert_New_Upcoming_Release_Same_Day()

JSMR.Tests/Ingestion/Japanese/Insert_New_Upcoming_With_Existing_Tags_And_Creators_Tests.cs

@@ -10,7 +10,7 @@ using Shouldly;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public class Insert_New_Upcoming_With_Existing_Tags_And_Creators_Tests(MariaDbContainerFixture container) : IngestionTestsBase(container)
+public class Insert_New_Upcoming_With_Existing_Tags_And_Creators_Tests(MariaDbContainerFixture container) : JapaneseIngestionTestsBase(container)
 {
     [Fact]
     public async Task Insert_New_Upcoming_With_Existing_Tags_And_Creators()

JSMR.Tests/Ingestion/Japanese/JapaneseIngestionTestsBase.cs

@@ -4,22 +4,13 @@ using JSMR.Infrastructure.Common.Time;
 using JSMR.Infrastructure.Data;
 using JSMR.Infrastructure.Ingestion;
 using JSMR.Tests.Fixtures;
-using Microsoft.EntityFrameworkCore;
 using NSubstitute;
 using System.Runtime.InteropServices;
 
 namespace JSMR.Tests.Ingestion.Japanese;
 
-public abstract class IngestionTestsBase(MariaDbContainerFixture container)
+public abstract class JapaneseIngestionTestsBase(MariaDbContainerFixture container) : IngestionTestsBase(container)
 {
-    protected async Task<AppDbContext> GetAppDbContextAsync()
-    {
-        return await MariaDbClone.CloneFromTemplateAsync(
-            container.RootConnectionString,
-            container.TemplateDbName,
-            seed: VoiceWorkIngestionSeedData.SeedAsync);
-    }
-
     protected static async Task<VoiceWorkUpsertResult[]> UpsertAsync(AppDbContext dbContext, DateTime dateTime, VoiceWorkIngest[] ingests)
     {
         DateTime utcDateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);