refactor(sf,site): both stores take ILocalDb instead of a connection string

Tasks 5 and 6 of the Phase 2 plan, committed together because their test fallout is entangled — several fixtures construct both stores. StoreAndForwardStorage and SiteStorageService now take ILocalDb. Connections come from ILocalDb.CreateConnection(), which hands out an already-open, pragma-configured connection carrying the zb_hlc_next() UDF the capture triggers call; a raw connection would lack the UDF and every write to a replicated table would fail closed. Deleted with the connection strings: S&F's EnsureDatabaseDirectoryExists and its per-open busy_timeout pragma, and the site service's BusyTimeoutFloorSeconds normalization — LocalDb owns all of it now. DI: AddSiteRuntime's string overload is gone (nothing left to supply), so the Host calls the no-arg form. ScadaBridge:Database:SiteDbPath and StoreAndForwardOptions.SqliteDbPath survive only as the migrator's source locations in Tasks 8/9. Two things the plan did not anticipate, both worth reading: 1. FOUND A REAL LATENT DEFECT, from Phase 1, now fixed. The plan assumed directory creation simply moved to LocalDb along with file ownership. It did not: the LocalDb library never creates the parent directory, and SqliteLocalDb opens the file eagerly in its constructor — so a missing directory is a hard boot failure ("SQLite Error 14: unable to open database file"), not a degraded start. The default site config points at the RELATIVE path ./data/site-localdb.db, so any site node without a pre-existing data/ directory fails to boot. The docker rig escapes only because its volume mount happens to create /app/data — a coincidence that would have hidden this until a bare-metal or fresh deployment. This has been latent since Phase 1 made LocalDb:Path required; deleting S&F's EnsureDatabaseDirectoryExists here would have widened it. Re-established the guarantee at the layer that now owns the path (SiteLocalDbDirectory.Ensure, called before AddZbLocalDb) and pinned it with SiteLocalDbDirectoryTests. Non-vacuity is not assumed: two tests written against the wrong assumption failed with exactly this SQLite Error 14 before the fix existed. 2. Test fallout was ~7x the plan's estimate. The plan named "fixtures" in one project; the constructor change actually reaches 40 files across 7 test projects, and most used Mode=Memory;Cache=Shared — which LocalDb has no equivalent for, so every one had to move to a real temp file. Rather than copy the Phase 1 TestLocalDb fixture into 7 projects, added a shared tests/ZB.MOM.WW.ScadaBridge.TestSupport library (not a test project) so the WAL-sidecar cleanup and the "real, not stubbed" rationale live in one place. Retargeted rather than deleted, in both directions: the S&F WAL test now asserts against the LocalDb-backed store (WAL genuinely is LocalDb's job), while the directory-creation test moved to Host.Tests (that guarantee is NOT LocalDb's). SiteStorageServiceTests.Initialize_EnablesWalJournalMode got the same treatment. DeploymentManagerMediumFindingsTests induced a persistence failure via an unopenable path, which no longer reaches the assertion since the fixture now throws first; it induces the same failure shape via an uninitialized store. Verified: full solution build 0 warnings; SiteRuntime 532, Host 318, AuditLog 355, ExternalSystemGateway 142, HealthMonitoring 97, StoreAndForward 153 — 1597 passed, 0 failed. Claude-Session: https://claude.ai/code/session_01BL2Vu1ESDQ9SCN4gVKkdts
2026-07-20 03:05:45 -04:00
parent 3dfb288b74
commit f2efeb37b7
57 changed files with 1368 additions and 848 deletions
@@ -1,8 +1,8 @@
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using ZB.MOM.WW.ScadaBridge.Commons.Types;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -20,7 +20,7 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class CachedCallAttemptEmissionTests : IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardService _service;
    private readonly StoreAndForwardOptions _options;
@@ -28,12 +28,9 @@ public class CachedCallAttemptEmissionTests : IAsyncLifetime, IDisposable

    public CachedCallAttemptEmissionTests()
    {
-        var dbName = $"E4Tests_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={dbName};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("E4Tests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        _options = new StoreAndForwardOptions
        {
@@ -55,7 +52,12 @@ public class CachedCallAttemptEmissionTests : IAsyncLifetime, IDisposable

    public async Task InitializeAsync() => await _storage.InitializeAsync();
    public Task DisposeAsync() => Task.CompletedTask;
-    public void Dispose() => _keepAlive.Dispose();
+    public void Dispose()
+    {
+        var path = _localDb.Path;
+        _localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
+    }

    /// <summary>
    /// Captures every observer notification so tests can assert on the
@@ -476,10 +478,8 @@ public class CachedCallAttemptEmissionTests : IAsyncLifetime, IDisposable

        // Fresh service over its own storage so StartAsync's pump/timer is isolated
        // from the shared _service.
-        var connStr = $"Data Source=SlowObs_{Guid.NewGuid():N};Mode=Memory;Cache=Shared";
-        using var keepAlive = new SqliteConnection(connStr);
-        keepAlive.Open();
-        var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        var localDb = TestLocalDb.CreateTemp("SlowObs");
+        var storage = new StoreAndForwardStorage(localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
        await storage.InitializeAsync();
        var service = new StoreAndForwardService(
            storage,
@@ -515,6 +515,12 @@ public class CachedCallAttemptEmissionTests : IAsyncLifetime, IDisposable
            }
            lock (observed) Assert.Single(observed);
        }
-        finally { await service.StopAsync(); }
+        finally
+        {
+            await service.StopAsync();
+            var path = localDb.Path;
+            localDb.Dispose();
+            TestLocalDb.DeleteFiles(path);
+        }
    }
 }
@@ -1,9 +1,9 @@
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.RemoteQuery;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -14,17 +14,15 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class ParkedMessageHandlerActorTests : TestKit, IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardService _service;

    public ParkedMessageHandlerActorTests()
    {
-        var connStr = $"Data Source=ActorTests_{Guid.NewGuid():N};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("ActorTests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        var options = new StoreAndForwardOptions
        {
@@ -44,7 +42,13 @@ public class ParkedMessageHandlerActorTests : TestKit, IAsyncLifetime, IDisposab

    protected override void Dispose(bool disposing)
    {
-        if (disposing) _keepAlive.Dispose();
+        if (disposing)
+        {
+            var path = _localDb.Path;
+            _localDb.Dispose();
+            TestLocalDb.DeleteFiles(path);
+        }
+
        base.Dispose(disposing);
    }

@@ -1,10 +1,10 @@
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.RemoteQuery;
 using ZB.MOM.WW.ScadaBridge.Commons.Types;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -19,17 +19,15 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class ParkedOperationRelayTests : TestKit, IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardService _service;

    public ParkedOperationRelayTests()
    {
-        var connStr = $"Data Source=RelayTests_{Guid.NewGuid():N};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("RelayTests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        var options = new StoreAndForwardOptions
        {
@@ -49,7 +47,13 @@ public class ParkedOperationRelayTests : TestKit, IAsyncLifetime, IDisposable

    protected override void Dispose(bool disposing)
    {
-        if (disposing) _keepAlive.Dispose();
+        if (disposing)
+        {
+            var path = _localDb.Path;
+            _localDb.Dispose();
+            TestLocalDb.DeleteFiles(path);
+        }
+
        base.Dispose(disposing);
    }

@@ -1,8 +1,8 @@
 using System.Diagnostics.Metrics;
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Observability;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -20,18 +20,15 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class QueueDepthGaugeTests : IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardService _service;

    public QueueDepthGaugeTests()
    {
-        var dbName = $"QueueDepthTests_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={dbName};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("QueueDepthTests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        var options = new StoreAndForwardOptions
        {
@@ -56,7 +53,12 @@ public class QueueDepthGaugeTests : IAsyncLifetime, IDisposable

    public async Task DisposeAsync() => await _service.StopAsync();

-    public void Dispose() => _keepAlive.Dispose();
+    public void Dispose()
+    {
+        var path = _localDb.Path;
+        _localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
+    }

    /// <summary>
    /// Reads the current value of the <c>scadabridge.store_and_forward.queue.depth</c>
@@ -1,7 +1,7 @@
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -10,18 +10,15 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class ReplicationServiceTests : IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly ReplicationService _replicationService;

    public ReplicationServiceTests()
    {
-        var dbName = $"RepTests_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={dbName};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("RepTests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        var options = new StoreAndForwardOptions { ReplicationEnabled = true };
        _replicationService = new ReplicationService(
@@ -32,7 +29,12 @@ public class ReplicationServiceTests : IAsyncLifetime, IDisposable

    public Task DisposeAsync() => Task.CompletedTask;

-    public void Dispose() => _keepAlive.Dispose();
+    public void Dispose()
+    {
+        var path = _localDb.Path;
+        _localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
+    }

    [Fact]
    public void ReplicateEnqueue_NoHandler_DoesNotThrow()
@@ -1,6 +1,6 @@
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -11,18 +11,16 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class StoreAndForwardReplicationTests : IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardService _service;
    private readonly List<ReplicationOperation> _replicated = new();

    public StoreAndForwardReplicationTests()
    {
-        var connStr = $"Data Source=ReplTests_{Guid.NewGuid():N};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("ReplTests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        var options = new StoreAndForwardOptions
        {
@@ -45,7 +43,12 @@ public class StoreAndForwardReplicationTests : IAsyncLifetime, IDisposable

    public async Task InitializeAsync() => await _storage.InitializeAsync();
    public Task DisposeAsync() => Task.CompletedTask;
-    public void Dispose() => _keepAlive.Dispose();
+    public void Dispose()
+    {
+        var path = _localDb.Path;
+        _localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
+    }

    /// <summary>Replication is fire-and-forget (Task.Run); poll until the expected ops arrive.</summary>
    private async Task<List<ReplicationOperation>> WaitForReplicationAsync(int count)
@@ -1,6 +1,6 @@
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -9,20 +9,17 @@ namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
 /// </summary>
 public class StoreAndForwardServiceTests : IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardService _service;
    private readonly StoreAndForwardOptions _options;
-    private readonly List<SqliteConnection> _extraKeepAlives = new();
+    private readonly List<TestLocalDb> _extraLocalDbs = new();

    public StoreAndForwardServiceTests()
    {
-        var dbName = $"SvcTests_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={dbName};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("SvcTests");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);

        _options = new StoreAndForwardOptions
        {
@@ -41,23 +38,29 @@ public class StoreAndForwardServiceTests : IAsyncLifetime, IDisposable

    public void Dispose()
    {
-        _keepAlive.Dispose();
-        foreach (var c in _extraKeepAlives) c.Dispose();
+        DisposeLocalDb(_localDb);
+        foreach (var db in _extraLocalDbs) DisposeLocalDb(db);
+    }
+
+    /// <summary>Disposes a local database, then removes its file and WAL sidecars.</summary>
+    private static void DisposeLocalDb(TestLocalDb localDb)
+    {
+        var path = localDb.Path;
+        localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
    }

    /// <summary>
-    /// Builds a fresh service over its own in-memory (shared-cache) SQLite so a test
-    /// can call StartAsync without racing the shared <c>_service</c>'s timer. The
-    /// keep-alive connection is tracked for disposal.
+    /// Builds a fresh service over its own local database so a test can call
+    /// StartAsync without racing the shared <c>_service</c>'s timer. The database
+    /// is tracked for disposal.
    /// </summary>
    private StoreAndForwardService CreateService(TimeSpan? retryTimerInterval = null)
    {
-        var connStr = $"Data Source=DeferTests_{Guid.NewGuid():N};Mode=Memory;Cache=Shared";
-        var keepAlive = new SqliteConnection(connStr);
-        keepAlive.Open();
-        _extraKeepAlives.Add(keepAlive);
+        var localDb = TestLocalDb.CreateTemp("DeferTests");
+        _extraLocalDbs.Add(localDb);

-        var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        var storage = new StoreAndForwardStorage(localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
        storage.InitializeAsync().GetAwaiter().GetResult();

        var options = new StoreAndForwardOptions
@@ -557,12 +560,10 @@ public class StoreAndForwardServiceTests : IAsyncLifetime, IDisposable
        // Build a service whose timer fires almost immediately, with a handler
        // that pauses in the middle of delivery so we can observe StopAsync's
        // wait behaviour.
-        var dbName = $"StopWait_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={dbName};Mode=Memory;Cache=Shared";
-        using var keepAlive = new SqliteConnection(connStr);
-        keepAlive.Open();
+        var localDb = TestLocalDb.CreateTemp("StopWait");
+        _extraLocalDbs.Add(localDb);

-        var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        var storage = new StoreAndForwardStorage(localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
        await storage.InitializeAsync();

        var options = new StoreAndForwardOptions
@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
 using ZB.MOM.WW.ScadaBridge.SiteEventLogging;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

@@ -34,7 +34,7 @@ public class StoreAndForwardSiteEventTests : IAsyncLifetime, IDisposable
        public long FailedWriteCount => 0;
    }

-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
    private readonly StoreAndForwardOptions _options;
    private readonly FakeSiteEventLogger _siteLog = new();
@@ -42,12 +42,9 @@ public class StoreAndForwardSiteEventTests : IAsyncLifetime, IDisposable

    public StoreAndForwardSiteEventTests()
    {
-        var dbName = $"SiteEvt_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={dbName};Mode=Memory;Cache=Shared";
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
+        _localDb = TestLocalDb.CreateTemp("SiteEvt");

-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
        _options = new StoreAndForwardOptions
        {
            DefaultRetryInterval = TimeSpan.Zero,
@@ -63,7 +60,12 @@ public class StoreAndForwardSiteEventTests : IAsyncLifetime, IDisposable

    public async Task InitializeAsync() => await _storage.InitializeAsync();
    public Task DisposeAsync() => Task.CompletedTask;
-    public void Dispose() => _keepAlive.Dispose();
+    public void Dispose()
+    {
+        var path = _localDb.Path;
+        _localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
+    }

    [Fact]
    public async Task BufferForRetry_ExternalSystem_EmitsStoreAndForwardSiteEvent()
@@ -1,27 +1,29 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
+using ZB.MOM.WW.ScadaBridge.TestSupport;

 namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;

 /// <summary>
 /// WP-9: Tests for SQLite persistence layer.
-/// Uses in-memory SQLite with a kept-alive connection for test isolation.
 /// </summary>
+/// <remarks>
+/// Backed by a real temp-file LocalDb rather than the shared-cache in-memory database
+/// this class used before: <see cref="StoreAndForwardStorage"/> now takes
+/// <c>ILocalDb</c>, and LocalDb has no in-memory mode (<c>LocalDb:Path</c> is a
+/// filesystem path). Isolation still comes from a fresh database per test — xUnit
+/// constructs one instance per test — it is just a file now.
+/// </remarks>
 public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable
 {
-    private readonly SqliteConnection _keepAlive;
+    private readonly TestLocalDb _localDb;
    private readonly StoreAndForwardStorage _storage;
-    private readonly string _dbName;

    public StoreAndForwardStorageTests()
    {
-        _dbName = $"StorageTests_{Guid.NewGuid():N}";
-        var connStr = $"Data Source={_dbName};Mode=Memory;Cache=Shared";
-        // Keep one connection alive so the in-memory DB persists
-        _keepAlive = new SqliteConnection(connStr);
-        _keepAlive.Open();
-        _storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
+        _localDb = TestLocalDb.CreateTemp("StorageTests");
+        _storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
    }

    public async Task InitializeAsync() => await _storage.InitializeAsync();
@@ -30,7 +32,11 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable

    public void Dispose()
    {
-        _keepAlive.Dispose();
+        // Dispose first — the master connection anchors the WAL, so the sidecars
+        // cannot be removed while it is open.
+        var path = _localDb.Path;
+        _localDb.Dispose();
+        TestLocalDb.DeleteFiles(path);
    }

    [Fact]
@@ -360,9 +366,8 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable
        // schema by dropping the table and recreating it without the columns,
        // inserting directly, then running InitializeAsync (which ALTER-adds
        // the columns) and reading the row back.
-        await using (var setup = new SqliteConnection($"Data Source={_dbName};Mode=Memory;Cache=Shared"))
+        await using (var setup = _localDb.Db.CreateConnection())
        {
-            await setup.OpenAsync();
            await using var drop = setup.CreateCommand();
            drop.CommandText = @"
                DROP TABLE IF EXISTS sf_messages;
@@ -415,9 +420,8 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable
        bad.LastAttemptAt = null; // due immediately
        await _storage.EnqueueAsync(bad);

-        await using (var conn = new SqliteConnection($"Data Source={_dbName};Mode=Memory;Cache=Shared"))
+        await using (var conn = _localDb.Db.CreateConnection())
        {
-            await conn.OpenAsync();
            await using var corrupt = conn.CreateCommand();
            corrupt.CommandText =
                "UPDATE sf_messages SET execution_id = 'not-a-guid' WHERE id = 'bad1';";
@@ -514,9 +518,8 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable
        // ExecutionId rollout) by recreating the table without
        // parent_execution_id, inserting directly, then running InitializeAsync
        // which ALTER-adds the column.
-        await using (var setup = new SqliteConnection($"Data Source={_dbName};Mode=Memory;Cache=Shared"))
+        await using (var setup = _localDb.Db.CreateConnection())
        {
-            await setup.OpenAsync();
            await using var drop = setup.CreateCommand();
            drop.CommandText = @"
                DROP TABLE IF EXISTS sf_messages;
@@ -569,9 +572,8 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable
        bad.LastAttemptAt = null; // due immediately
        await _storage.EnqueueAsync(bad);

-        await using (var conn = new SqliteConnection($"Data Source={_dbName};Mode=Memory;Cache=Shared"))
+        await using (var conn = _localDb.Db.CreateConnection())
        {
-            await conn.OpenAsync();
            await using var corrupt = conn.CreateCommand();
            corrupt.CommandText =
                "UPDATE sf_messages SET parent_execution_id = 'not-a-guid' WHERE id = 'pbad1';";
@@ -630,57 +632,46 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable
        };
    }

-    [Fact]
-    public async Task InitializeAsync_FileInMissingDirectory_CreatesDirectory()
-    {
-        // SQLite creates the database file on demand but not its parent directory;
-        // the storage must create the directory itself or OpenAsync fails with
-        // "unable to open database file" (the cause of the SiteActorPathTests failures).
-        var directory = Path.Combine(Path.GetTempPath(), "sf-storage-test-" + Guid.NewGuid().ToString("N"));
-        var dbPath = Path.Combine(directory, "store-and-forward.db");
-        Assert.False(Directory.Exists(directory));
-
-        try
-        {
-            var storage = new StoreAndForwardStorage(
-                $"Data Source={dbPath}", NullLogger<StoreAndForwardStorage>.Instance);
-
-            await storage.InitializeAsync();
-
-            Assert.True(Directory.Exists(directory));
-            Assert.True(File.Exists(dbPath));
-        }
-        finally
-        {
-            if (Directory.Exists(directory))
-                Directory.Delete(directory, recursive: true);
-        }
-    }
+    // ── Invariants that moved owner ──
+    //
+    // Directory creation and WAL journal mode used to be this storage class's own job
+    // (EnsureDatabaseDirectoryExists / an explicit PRAGMA in InitializeAsync). Both moved
+    // out when the store stopped owning its file. They landed in DIFFERENT places, so the
+    // coverage split rather than moving wholesale:
+    //
+    //   * WAL is genuinely LocalDb's — it sets the journal mode on the database it owns.
+    //     The test below still asserts it, now against the LocalDb-backed store.
+    //
+    //   * Directory creation is NOT LocalDb's. The library does not create the parent
+    //     directory and opens the file eagerly, so a missing directory is a hard boot
+    //     failure. The guarantee had to be re-established explicitly in the Host
+    //     (SiteServiceRegistration.EnsureLocalDbDirectoryExists), and it is pinned there
+    //     by SiteLocalDbDirectoryTests — the layer that now owns it. Asserting it here
+    //     would be asserting a guarantee this class no longer provides.

    [Fact]
-    public async Task Initialize_EnablesWalJournalMode_OnFileDatabase()
+    public async Task Initialize_LeavesTheDatabaseInWalJournalMode()
    {
        // WAL lets the retry-sweep lanes, script enqueues, and standby replication
-        // applies read/write concurrently without "database is locked". journal_mode
-        // is persistent + file-scoped, so a fresh connection observes it.
-        var directory = Path.Combine(Path.GetTempPath(), "sf-wal-test-" + Guid.NewGuid().ToString("N"));
-        var path = Path.Combine(directory, "wal-test.db");
+        // applies read/write concurrently without "database is locked".
+        using var localDb = TestLocalDb.CreateTemp("sf-wal-test");
+        var path = localDb.Path;
        try
        {
            var storage = new StoreAndForwardStorage(
-                $"Data Source={path}", NullLogger<StoreAndForwardStorage>.Instance);
+                localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
            await storage.InitializeAsync();

-            await using var conn = new SqliteConnection($"Data Source={path}");
-            await conn.OpenAsync();
+            // journal_mode is persistent + file-scoped, so any connection observes it.
+            await using var conn = localDb.Db.CreateConnection();
            await using var cmd = conn.CreateCommand();
            cmd.CommandText = "PRAGMA journal_mode";
            Assert.Equal("wal", (string)(await cmd.ExecuteScalarAsync())!);
        }
        finally
        {
-            if (Directory.Exists(directory))
-                Directory.Delete(directory, recursive: true);
+            localDb.Dispose();
+            TestLocalDb.DeleteFiles(path);
        }
    }

@@ -731,8 +722,7 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable

    private async Task ExecRawAsync(string sql, params (string, object)[] parameters)
    {
-        await using var conn = new SqliteConnection($"Data Source={_dbName};Mode=Memory;Cache=Shared");
-        await conn.OpenAsync();
+        await using var conn = _localDb.Db.CreateConnection();
        await using var cmd = conn.CreateCommand();
        cmd.CommandText = sql;
        foreach (var (name, value) in parameters) cmd.Parameters.AddWithValue(name, value);
@@ -741,8 +731,7 @@ public class StoreAndForwardStorageTests : IAsyncLifetime, IDisposable

    private async Task<object?> ScalarRawAsync(string sql)
    {
-        await using var conn = new SqliteConnection($"Data Source={_dbName};Mode=Memory;Cache=Shared");
-        await conn.OpenAsync();
+        await using var conn = _localDb.Db.CreateConnection();
        await using var cmd = conn.CreateCommand();
        cmd.CommandText = sql;
        var result = await cmd.ExecuteScalarAsync();
@@ -27,6 +27,7 @@
  <ItemGroup>
    <ProjectReference Include="../../src/ZB.MOM.WW.ScadaBridge.StoreAndForward/ZB.MOM.WW.ScadaBridge.StoreAndForward.csproj" />
    <ProjectReference Include="../../src/ZB.MOM.WW.ScadaBridge.Commons/ZB.MOM.WW.ScadaBridge.Commons.csproj" />
-  </ItemGroup>
+      <ProjectReference Include="../ZB.MOM.WW.ScadaBridge.TestSupport/ZB.MOM.WW.ScadaBridge.TestSupport.csproj" />
+</ItemGroup>

 </Project>