fix(r2-04): Safe* helpers report failure; Apply tallies removal-pass failures into FailedNodes

2026-07-13 10:38:10 -04:00
parent 437f82b145
commit b3d57ca363
3 changed files with 61 additions and 16 deletions
@@ -43,6 +43,21 @@ public sealed class AddressSpaceApplierFailureSurfaceTests
        outcome.FailedNodes.ShouldBe(0);
    }

+    // ---------------- T2: FailedNodes (removal-pass tally) ----------------
+
+    /// <summary>A removal-pass alarm-condition write that throws is counted into FailedNodes (swallowed today).</summary>
+    [Fact]
+    public void Apply_WhenRemovalConditionWriteThrows_CountsFailedNodes()
+    {
+        var sink = new ConfigurableThrowingSink { ThrowOnAlarmWrite = true };
+        var applier = new AddressSpaceApplier(sink, NullLogger<AddressSpaceApplier>.Instance);
+
+        var outcome = applier.Apply(EquipmentRemovalPlan("eq-1"));
+
+        outcome.RemovedNodes.ShouldBe(1);
+        outcome.FailedNodes.ShouldBe(1);
+    }
+
    // ---------------- fixtures ----------------

    private static AddressSpacePlan AddedEquipmentPlan(string id) => new(
@@ -56,6 +71,17 @@ public sealed class AddressSpaceApplierFailureSurfaceTests
        RemovedAlarms: Array.Empty<ScriptedAlarmPlan>(),
        ChangedAlarms: Array.Empty<AddressSpacePlan.AlarmDelta>());

+    private static AddressSpacePlan EquipmentRemovalPlan(params string[] ids) => new(
+        AddedEquipment: Array.Empty<EquipmentNode>(),
+        RemovedEquipment: ids.Select(id => new EquipmentNode(id, id, "line-1")).ToArray(),
+        ChangedEquipment: Array.Empty<AddressSpacePlan.EquipmentDelta>(),
+        AddedDrivers: Array.Empty<DriverInstancePlan>(),
+        RemovedDrivers: Array.Empty<DriverInstancePlan>(),
+        ChangedDrivers: Array.Empty<AddressSpacePlan.DriverDelta>(),
+        AddedAlarms: Array.Empty<ScriptedAlarmPlan>(),
+        RemovedAlarms: Array.Empty<ScriptedAlarmPlan>(),
+        ChangedAlarms: Array.Empty<AddressSpacePlan.AlarmDelta>());
+
    /// <summary>An <see cref="IOpcUaAddressSpaceSink"/> whose every sink call can be independently made to
    /// throw, so tests can drive each Safe* helper's catch branch. Non-throwing calls are no-ops.</summary>
    private sealed class ConfigurableThrowingSink : IOpcUaAddressSpaceSink