feat(opcua): materialise Equipment VirtualTag variables on rebuild

2026-06-07 05:22:22 -04:00
parent 9818d0cba8
commit 695e61dedf
3 changed files with 106 additions and 0 deletions
@@ -257,6 +257,60 @@ public sealed class Phase7ApplierTests
        sink.VariableCalls.ShouldContain(("eq-2/Speed", "eq-2", "Speed", "Float"));
    }

+    /// <summary>Verifies MaterialiseEquipmentVirtualTags creates one Variable per VirtualTag directly
+    /// under its existing equipment folder, with a folder-scoped NodeId (EquipmentId/Name — NOT the
+    /// VirtualTagId or Expression), parent == EquipmentId, displayName == Name, and does NOT re-create
+    /// the equipment folder (no sub-folder when FolderPath is empty).</summary>
+    [Fact]
+    public void MaterialiseEquipmentVirtualTags_creates_variable_under_equipment_folder()
+    {
+        var sink = new RecordingSink();
+        var applier = new Phase7Applier(sink, NullLogger<Phase7Applier>.Instance);
+
+        var composition = new Phase7CompositionResult(
+            Array.Empty<EquipmentNode>(), Array.Empty<DriverInstancePlan>(), Array.Empty<ScriptedAlarmPlan>())
+        {
+            EquipmentVirtualTags = new[]
+            {
+                new EquipmentVirtualTagPlan("vt-1", "eq-1", FolderPath: "", Name: "speed-rpm", DataType: "Float64",
+                    Expression: "ctx.GetTag(\"x\") * 60", DependencyRefs: new[] { "x" }),
+            },
+        };
+
+        applier.MaterialiseEquipmentVirtualTags(composition);
+
+        sink.FolderCalls.ShouldBeEmpty(); // equipment folder already exists; no sub-folder needed
+        sink.VariableCalls.ShouldHaveSingleItem().ShouldBe(("eq-1/speed-rpm", "eq-1", "speed-rpm", "Float64"));
+    }
+
+    /// <summary>Two VirtualTags under the SAME equipment produce two distinct folder-scoped variables
+    /// (one EnsureVariable each, no NodeId collision), parented to the equipment folder.</summary>
+    [Fact]
+    public void MaterialiseEquipmentVirtualTags_two_under_same_equipment_do_not_collide()
+    {
+        var sink = new RecordingSink();
+        var applier = new Phase7Applier(sink, NullLogger<Phase7Applier>.Instance);
+
+        var composition = new Phase7CompositionResult(
+            Array.Empty<EquipmentNode>(), Array.Empty<DriverInstancePlan>(), Array.Empty<ScriptedAlarmPlan>())
+        {
+            EquipmentVirtualTags = new[]
+            {
+                new EquipmentVirtualTagPlan("vt-a", "eq-1", FolderPath: "", Name: "speed-rpm", DataType: "Float64",
+                    Expression: "ctx.GetTag(\"a\")", DependencyRefs: new[] { "a" }),
+                new EquipmentVirtualTagPlan("vt-b", "eq-1", FolderPath: "", Name: "load-pct", DataType: "Float64",
+                    Expression: "ctx.GetTag(\"b\")", DependencyRefs: new[] { "b" }),
+            },
+        };
+
+        applier.MaterialiseEquipmentVirtualTags(composition);
+
+        sink.FolderCalls.ShouldBeEmpty();
+        sink.VariableCalls.Count.ShouldBe(2);
+        sink.VariableCalls.ShouldContain(("eq-1/speed-rpm", "eq-1", "speed-rpm", "Float64"));
+        sink.VariableCalls.ShouldContain(("eq-1/load-pct", "eq-1", "load-pct", "Float64"));
+    }
+
    /// <summary>Verifies that added equipment tags in an otherwise-empty plan trigger an
    /// address-space rebuild (parity with the Galaxy-tag path — the planner now diffs equipment
    /// tags, so a tags-only deploy is no longer a silent no-op).</summary>