feat(opcua): announce pure-add nodes via Part 3 NodeAdded model-change (R2-07 T3)

2026-07-13 11:48:02 -04:00
parent 0d717e4785
commit 9dbc363ef0
3 changed files with 157 additions and 1 deletions
@@ -1825,6 +1825,105 @@ public sealed class AddressSpaceApplierTests
        sink.FolderRenameCalls.ShouldHaveSingleItem(); // the surgical update was attempted first
    }

+    // ----- R2-07 T3: pure-add NodeAdded announcements -----
+
+    /// <summary>Two tags added under the SAME equipment (no FolderPath) dedup to ONE announcement for the
+    /// equipment id.</summary>
+    [Fact]
+    public void ComputeAddAnnouncements_two_tags_under_same_equipment_dedup_to_one()
+    {
+        var applier = new AddressSpaceApplier(new RecordingSink(), NullLogger<AddressSpaceApplier>.Instance);
+
+        var plan = EmptyPlan with
+        {
+            AddedEquipmentTags = new[]
+            {
+                new EquipmentTagPlan("t1", "eq-1", "drv", FolderPath: "", Name: "A", DataType: "Float", FullName: "1", Writable: false, Alarm: null),
+                new EquipmentTagPlan("t2", "eq-1", "drv", FolderPath: "", Name: "B", DataType: "Float", FullName: "2", Writable: false, Alarm: null),
+            },
+        };
+
+        applier.ComputeAddAnnouncements(plan).ShouldBe(new[] { "eq-1" });
+    }
+
+    /// <summary>A tag with a FolderPath announces its SUB-FOLDER (the materialise parent), not the equipment.</summary>
+    [Fact]
+    public void ComputeAddAnnouncements_tag_with_folder_path_announces_subfolder()
+    {
+        var applier = new AddressSpaceApplier(new RecordingSink(), NullLogger<AddressSpaceApplier>.Instance);
+
+        var plan = EmptyPlan with
+        {
+            AddedEquipmentTags = new[]
+            {
+                new EquipmentTagPlan("t1", "eq-1", "drv", FolderPath: "Diag", Name: "A", DataType: "Float", FullName: "1", Writable: false, Alarm: null),
+            },
+        };
+
+        applier.ComputeAddAnnouncements(plan).ShouldBe(new[] { EquipmentNodeIds.SubFolder("eq-1", "Diag") });
+    }
+
+    /// <summary>An added scripted alarm announces its equipment folder (where its condition node parents).</summary>
+    [Fact]
+    public void ComputeAddAnnouncements_added_alarm_announces_equipment()
+    {
+        var applier = new AddressSpaceApplier(new RecordingSink(), NullLogger<AddressSpaceApplier>.Instance);
+
+        var plan = EmptyPlan with
+        {
+            AddedAlarms = new[] { new ScriptedAlarmPlan("alm-1", "eq-9", "scr", "msg") },
+        };
+
+        applier.ComputeAddAnnouncements(plan).ShouldBe(new[] { "eq-9" });
+    }
+
+    /// <summary>An added equipment WITH a UnsLineId announces its parent line; WITHOUT one announces its own
+    /// new folder id (a valid Part 3 NodeAdded of the folder itself; the root has no announceable id).</summary>
+    [Fact]
+    public void ComputeAddAnnouncements_added_equipment_announces_line_or_self()
+    {
+        var applier = new AddressSpaceApplier(new RecordingSink(), NullLogger<AddressSpaceApplier>.Instance);
+
+        var withLine = EmptyPlan with { AddedEquipment = new[] { new EquipmentNode("eq-1", "One", "line-7") } };
+        applier.ComputeAddAnnouncements(withLine).ShouldBe(new[] { "line-7" });
+
+        var noLine = EmptyPlan with { AddedEquipment = new[] { new EquipmentNode("eq-2", "Two", "") } };
+        applier.ComputeAddAnnouncements(noLine).ShouldBe(new[] { "eq-2" });
+    }
+
+    /// <summary>A plan with no additions yields no announcements.</summary>
+    [Fact]
+    public void ComputeAddAnnouncements_empty_add_plan_yields_none()
+    {
+        var applier = new AddressSpaceApplier(new RecordingSink(), NullLogger<AddressSpaceApplier>.Instance);
+        applier.ComputeAddAnnouncements(EmptyPlan).ShouldBeEmpty();
+    }
+
+    /// <summary>AnnounceAddedNodes raises exactly one RaiseNodesAddedModelChange per DISTINCT affected
+    /// parent (dedup + subfolder-parent + added-equipment cases), Safe-wrapped.</summary>
+    [Fact]
+    public void AnnounceAddedNodes_raises_one_model_change_per_distinct_parent()
+    {
+        var sink = new RecordingSink();
+        var applier = new AddressSpaceApplier(sink, NullLogger<AddressSpaceApplier>.Instance);
+
+        var plan = EmptyPlan with
+        {
+            AddedEquipment = new[] { new EquipmentNode("eq-2", "Two", "line-7") },
+            AddedEquipmentTags = new[]
+            {
+                new EquipmentTagPlan("t1", "eq-1", "drv", FolderPath: "", Name: "A", DataType: "Float", FullName: "1", Writable: false, Alarm: null),
+                new EquipmentTagPlan("t2", "eq-1", "drv", FolderPath: "", Name: "B", DataType: "Float", FullName: "2", Writable: false, Alarm: null),
+                new EquipmentTagPlan("t3", "eq-1", "drv", FolderPath: "Diag", Name: "C", DataType: "Float", FullName: "3", Writable: false, Alarm: null),
+            },
+        };
+
+        applier.AnnounceAddedNodes(plan);
+
+        sink.ModelChangeCalls.OrderBy(x => x).ShouldBe(
+            new[] { "eq-1", EquipmentNodeIds.SubFolder("eq-1", "Diag"), "line-7" }.OrderBy(x => x));
+    }
+
    private static AddressSpaceComposition CompositionWithAreas(params UnsAreaProjection[] areas) =>
        new(
            areas, Array.Empty<UnsLineProjection>(), Array.Empty<EquipmentNode>(),