Joseph Doherty
0d8a80aa27
Completes Task 5a of the LocalDb Phase 1 adoption plan. The GUID-id half landed
with Task 2 (727fa48c) because leaving it out would have committed a writer that
could not satisfy site_events.id NOT NULL; this is the connection half, which
was blocked on Task 3.
SiteEventLogger owned a SqliteConnection built from SiteEventLogOptions
.DatabasePath. It now takes ILocalDb and gets that connection from
CreateConnection() - already open, pragma-configured, and carrying the
zb_hlc_next() UDF that site_events' capture triggers call. It still owns and
disposes the connection; WithConnection's signature and locking semantics are
untouched, so EventLogQueryService and EventLogPurgeService are unaffected.
The connectionStringOverride seam is deleted rather than preserved. site_events
is a replicated table, so a raw connection lacks the UDF and fails closed on
every insert - an override could only produce a logger that cannot write. It had
no callers outside this class (the connectionStringOverride hits elsewhere in the
tree belong to SqliteAuditWriter, a different type).
Tests: a shared TestLocalDb helper gives each fixture a real ILocalDb over a temp
file. Real rather than stubbed on purpose - a stub handing back a bare
SqliteConnection would pass today and fail closed the moment the table is
registered, which is exactly the silent-wiring failure mode this family has hit
three times. ServiceWiringTests' DI path also needed AddZbLocalDb, mirroring
SiteServiceRegistration.
Verified: build 0 warnings; SiteEventLogging 70/70, Host 294/294,
SiteRuntime 530/530.
Claude-Session: https://claude.ai/code/session_01BL2Vu1ESDQ9SCN4gVKkdts
84 lines
3.4 KiB
C#
84 lines
3.4 KiB
C#
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.LocalDb;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.SiteEventLogging.Tests;
|
|
|
|
/// <summary>
|
|
/// Regression tests for SiteEventLogging-007: the purge and query services must not
|
|
/// downcast an injected <see cref="ISiteEventLogger"/> to the concrete type. They now
|
|
/// depend on the concrete <see cref="SiteEventLogger"/> directly, and DI must resolve
|
|
/// the recorder, query service, and purge service to a single shared instance.
|
|
/// </summary>
|
|
public class ServiceWiringTests : IDisposable
|
|
{
|
|
private readonly string _dbPath;
|
|
private ServiceProvider? _provider;
|
|
|
|
public ServiceWiringTests()
|
|
{
|
|
_dbPath = Path.Combine(Path.GetTempPath(), $"test_wiring_{Guid.NewGuid()}.db");
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
_provider?.Dispose();
|
|
TestLocalDb.DeleteFiles(_dbPath);
|
|
}
|
|
|
|
[Fact]
|
|
public void AddSiteEventLogging_ResolvesAllServices_SharingOneRecorderInstance()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddLogging();
|
|
services.Configure<SiteEventLogOptions>(o => o.DatabasePath = _dbPath);
|
|
// SiteEventLogger now takes ILocalDb, so the consolidated site database has to
|
|
// be in the graph for AddSiteEventLogging to resolve at all. In the host this
|
|
// comes from SiteServiceRegistration's AddZbLocalDb.
|
|
services.AddZbLocalDb(new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?>
|
|
{
|
|
["LocalDb:Path"] = _dbPath,
|
|
})
|
|
.Build());
|
|
services.AddSiteEventLogging();
|
|
|
|
_provider = services.BuildServiceProvider();
|
|
|
|
var recorderViaInterface = _provider.GetRequiredService<ISiteEventLogger>();
|
|
var recorderConcrete = _provider.GetRequiredService<SiteEventLogger>();
|
|
var queryService = _provider.GetRequiredService<IEventLogQueryService>();
|
|
|
|
// The interface registration must forward to the concrete singleton — purge
|
|
// and query depend on that same instance, so all three share one connection.
|
|
Assert.Same(recorderConcrete, recorderViaInterface);
|
|
Assert.NotNull(queryService);
|
|
|
|
// The hosted purge service must also resolve without an InvalidCastException.
|
|
var hosted = _provider.GetServices<Microsoft.Extensions.Hosting.IHostedService>();
|
|
Assert.Contains(hosted, h => h is EventLogPurgeService);
|
|
}
|
|
|
|
[Fact]
|
|
public void PurgeAndQueryServices_AcceptConcreteRecorder_WithoutDowncast()
|
|
{
|
|
// The services no longer take ISiteEventLogger and downcast it; they take the
|
|
// concrete SiteEventLogger. Constructing them directly must compile and work.
|
|
var options = Options.Create(new SiteEventLogOptions { DatabasePath = _dbPath });
|
|
using var loggerFactory = LoggerFactory.Create(_ => { });
|
|
using var localDb = TestLocalDb.Create(_dbPath);
|
|
using var recorder = new SiteEventLogger(
|
|
options, loggerFactory.CreateLogger<SiteEventLogger>(), localDb.Db);
|
|
|
|
var purge = new EventLogPurgeService(
|
|
recorder, options, loggerFactory.CreateLogger<EventLogPurgeService>());
|
|
var query = new EventLogQueryService(
|
|
recorder, options, loggerFactory.CreateLogger<EventLogQueryService>());
|
|
|
|
Assert.NotNull(purge);
|
|
Assert.NotNull(query);
|
|
}
|
|
}
|