f2efeb37b7
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
178 lines
7.2 KiB
C#
178 lines
7.2 KiB
C#
using Akka.Actor;
|
|
using Akka.TestKit.Xunit2;
|
|
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;
|
|
|
|
/// <summary>
|
|
/// StoreAndForward-013: tests for the <see cref="ParkedMessageHandlerActor"/> actor
|
|
/// bridge — the Query/Retry/Discard request-to-response mapping and the
|
|
/// <c>ExtractMethodName</c> payload-JSON parsing (including the malformed-JSON branch).
|
|
/// </summary>
|
|
public class ParkedMessageHandlerActorTests : TestKit, IAsyncLifetime, IDisposable
|
|
{
|
|
private readonly TestLocalDb _localDb;
|
|
private readonly StoreAndForwardStorage _storage;
|
|
private readonly StoreAndForwardService _service;
|
|
|
|
public ParkedMessageHandlerActorTests()
|
|
{
|
|
_localDb = TestLocalDb.CreateTemp("ActorTests");
|
|
|
|
_storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
|
|
|
var options = new StoreAndForwardOptions
|
|
{
|
|
DefaultRetryInterval = TimeSpan.Zero,
|
|
DefaultMaxRetries = 1,
|
|
RetryTimerInterval = TimeSpan.FromMinutes(10),
|
|
ReplicationEnabled = false,
|
|
};
|
|
|
|
_service = new StoreAndForwardService(
|
|
_storage, options, NullLogger<StoreAndForwardService>.Instance);
|
|
}
|
|
|
|
public async Task InitializeAsync() => await _storage.InitializeAsync();
|
|
|
|
public Task DisposeAsync() => Task.CompletedTask;
|
|
|
|
protected override void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
var path = _localDb.Path;
|
|
_localDb.Dispose();
|
|
TestLocalDb.DeleteFiles(path);
|
|
}
|
|
|
|
base.Dispose(disposing);
|
|
}
|
|
|
|
/// <summary>Enqueues a message and parks it via the retry sweep (MaxRetries = 1).</summary>
|
|
private async Task<string> ParkMessageAsync(StoreAndForwardCategory category, string payloadJson)
|
|
{
|
|
_service.RegisterDeliveryHandler(category, _ => throw new HttpRequestException("always fails"));
|
|
var result = await _service.EnqueueAsync(category, "target", payloadJson, maxRetries: 1);
|
|
await _service.RetryPendingMessagesAsync();
|
|
return result.MessageId;
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Query_ReturnsParkedEntries_WithExtractedMethodName()
|
|
{
|
|
await ParkMessageAsync(StoreAndForwardCategory.ExternalSystem,
|
|
"""{"MethodName":"StartPump","Args":{}}""");
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageQueryRequest("corr-1", "site-1", 1, 50, DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageQueryResponse>();
|
|
Assert.True(response.Success);
|
|
Assert.Equal("corr-1", response.CorrelationId);
|
|
Assert.Equal("site-1", response.SiteId);
|
|
Assert.Single(response.Messages);
|
|
Assert.Equal("StartPump", response.Messages[0].MethodName);
|
|
Assert.Equal(StoreAndForwardCategory.ExternalSystem, response.Messages[0].Category);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Query_NotificationPayload_UsesSubjectAsMethodName()
|
|
{
|
|
await ParkMessageAsync(StoreAndForwardCategory.Notification,
|
|
"""{"Subject":"Tank overflow","Body":"..."}""");
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageQueryRequest("corr-2", "site-1", 1, 50, DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageQueryResponse>();
|
|
Assert.True(response.Success);
|
|
Assert.Equal("Tank overflow", response.Messages[0].MethodName);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Query_MalformedJsonPayload_FallsBackToCategoryName()
|
|
{
|
|
await ParkMessageAsync(StoreAndForwardCategory.CachedDbWrite, "not-valid-json{");
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageQueryRequest("corr-3", "site-1", 1, 50, DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageQueryResponse>();
|
|
Assert.True(response.Success);
|
|
// Malformed JSON must not throw — ExtractMethodName falls back to the category.
|
|
Assert.Equal(StoreAndForwardCategory.CachedDbWrite.ToString(), response.Messages[0].MethodName);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Query_PayloadWithoutMethodNameOrSubject_FallsBackToCategoryName()
|
|
{
|
|
await ParkMessageAsync(StoreAndForwardCategory.ExternalSystem, """{"Unrelated":"value"}""");
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageQueryRequest("corr-4", "site-1", 1, 50, DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageQueryResponse>();
|
|
Assert.Equal(StoreAndForwardCategory.ExternalSystem.ToString(), response.Messages[0].MethodName);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Retry_ParkedMessage_ReturnsSuccess()
|
|
{
|
|
var messageId = await ParkMessageAsync(StoreAndForwardCategory.ExternalSystem, """{}""");
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageRetryRequest("corr-5", "site-1", messageId, DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageRetryResponse>();
|
|
Assert.True(response.Success);
|
|
Assert.Equal("corr-5", response.CorrelationId);
|
|
Assert.Null(response.ErrorMessage);
|
|
|
|
var msg = await _storage.GetMessageByIdAsync(messageId);
|
|
Assert.Equal(StoreAndForwardMessageStatus.Pending, msg!.Status);
|
|
}
|
|
|
|
[Fact]
|
|
public void Retry_UnknownMessage_ReturnsFailureWithMessage()
|
|
{
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageRetryRequest("corr-6", "site-1", "does-not-exist", DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageRetryResponse>();
|
|
Assert.False(response.Success);
|
|
Assert.Equal("corr-6", response.CorrelationId);
|
|
Assert.NotNull(response.ErrorMessage);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Discard_ParkedMessage_ReturnsSuccessAndRemovesMessage()
|
|
{
|
|
var messageId = await ParkMessageAsync(StoreAndForwardCategory.ExternalSystem, """{}""");
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageDiscardRequest("corr-7", "site-1", messageId, DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageDiscardResponse>();
|
|
Assert.True(response.Success);
|
|
Assert.Equal("corr-7", response.CorrelationId);
|
|
|
|
var msg = await _storage.GetMessageByIdAsync(messageId);
|
|
Assert.Null(msg);
|
|
}
|
|
|
|
[Fact]
|
|
public void Discard_UnknownMessage_ReturnsFailureWithMessage()
|
|
{
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new ParkedMessageDiscardRequest("corr-8", "site-1", "does-not-exist", DateTimeOffset.UtcNow));
|
|
|
|
var response = ExpectMsg<ParkedMessageDiscardResponse>();
|
|
Assert.False(response.Success);
|
|
Assert.NotNull(response.ErrorMessage);
|
|
}
|
|
}
|