118933d5d5
Review 01 U2. The composer never emits EquipmentTags in v3 (device values live in the Raw subtree and reach equipment as UnsReferenceVariables), so the equipment-tag plan diff sets (Added/Removed/ChangedEquipmentTags, EquipmentTagDelta), the planner's diff over them, the classifier's TagDeltaIsSurgicalEligible and its Rebuild clause, the applier's MaterialiseEquipmentTags pass, surgical ChangedEquipmentTags loop, removed-tag teardown loop and add-announcement term, and the publish actor's equipment-tag pass were unreachable, maintained dead weight. IsEmpty keeps its semantics (an otherwise-empty plan is still Empty). Kept, deliberately: AddressSpaceComposition.EquipmentTags and the EquipmentTagPlan record — Runtime's DeploymentArtifact (outside this lane) still assigns the empty set and the artifact parity tests assert it; follow-up F2 removes both together. Tests: the equipment-tag vehicle tests for PureRemove / AddRemoveMix / the rebuild ratchet are re-expressed over raw tags (same applier paths); the equipment-tag surgical and classifier tests are deleted (their raw / UNS-reference equivalents already exist); SubscriptionSurvivalTests now materialises its tags through MaterialiseRawSubtree. Refs #732 Claude-Session: https://claude.ai/code/session_01Ub9hGmYLQvn9XETzw7CMsT
219 lines
11 KiB
C#
219 lines
11 KiB
C#
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Shouldly;
|
|
using Xunit;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.OpcUa;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
|
|
|
|
/// <summary>
|
|
/// Guards the failure-visibility surface added for archreview 01/S-1: the applier must report a
|
|
/// failed rebuild (<see cref="AddressSpaceApplyOutcome.RebuildFailed"/>) and tally swallowed per-node
|
|
/// sink failures (<see cref="AddressSpaceApplyOutcome.FailedNodes"/> for Apply's own passes; the
|
|
/// <c>Materialise*</c> passes return their own failed-node counts) instead of reporting optimistic
|
|
/// success while the running address space is stale or partial.
|
|
/// </summary>
|
|
public sealed class AddressSpaceApplierFailureSurfaceTests
|
|
{
|
|
// ---------------- T1: RebuildFailed ----------------
|
|
|
|
/// <summary>A rebuild whose sink call throws is reported as attempted-but-failed, not optimistic success.</summary>
|
|
[Fact]
|
|
public void Apply_WhenRebuildThrows_ReportsRebuildFailed()
|
|
{
|
|
var sink = new ConfigurableThrowingSink { ThrowOnRebuild = true };
|
|
var applier = new AddressSpaceApplier(sink, NullLogger<AddressSpaceApplier>.Instance);
|
|
|
|
var outcome = applier.Apply(RebuildingPlan("eq-1"));
|
|
|
|
outcome.RebuildCalled.ShouldBeTrue();
|
|
outcome.RebuildFailed.ShouldBeTrue();
|
|
}
|
|
|
|
/// <summary>A clean apply reports no failure on either channel — the regression guard for the new fields.</summary>
|
|
[Fact]
|
|
public void Apply_HappyPath_ReportsNoFailure()
|
|
{
|
|
var sink = new ConfigurableThrowingSink();
|
|
var applier = new AddressSpaceApplier(sink, NullLogger<AddressSpaceApplier>.Instance);
|
|
|
|
var outcome = applier.Apply(RebuildingPlan("eq-1"));
|
|
|
|
outcome.RebuildCalled.ShouldBeTrue();
|
|
outcome.RebuildFailed.ShouldBeFalse();
|
|
outcome.FailedNodes.ShouldBe(0);
|
|
}
|
|
|
|
// ---------------- T2: FailedNodes (removal-pass tally) ----------------
|
|
|
|
/// <summary>A removal-pass alarm-condition write that throws is counted into FailedNodes (swallowed today).
|
|
/// The terminal condition write is made for a removed SCRIPTED ALARM — a removed equipment gets none (review
|
|
/// 01 L4: an equipment id is a folder, never a condition, so writing one only minted a phantom).</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(AlarmRemovalPlan("alm-1"));
|
|
|
|
outcome.RemovedNodes.ShouldBe(1);
|
|
outcome.FailedNodes.ShouldBe(1);
|
|
}
|
|
|
|
/// <summary>Review 01 L4 — removing an equipment writes NO condition state against the equipment id.</summary>
|
|
[Fact]
|
|
public void Apply_RemovedEquipment_WritesNoConditionAgainstTheEquipmentId()
|
|
{
|
|
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(0, "no condition write happens for an equipment folder, so a throwing alarm write cannot be reached");
|
|
}
|
|
|
|
// ---------------- T3: Materialise* passes return failed-node counts ----------------
|
|
|
|
/// <summary>Every EnsureVariable throwing in MaterialiseRawSubtree is tallied into the pass's int return.</summary>
|
|
[Fact]
|
|
public void MaterialiseRawSubtree_WhenEnsureVariableThrows_ReturnsFailedCount()
|
|
{
|
|
var sink = new ConfigurableThrowingSink { ThrowOnEnsureVariable = true };
|
|
var applier = new AddressSpaceApplier(sink, NullLogger<AddressSpaceApplier>.Instance);
|
|
|
|
var composition = CompositionWithRawTags(RawTag("t1", "A"), RawTag("t2", "B"), RawTag("t3", "C"));
|
|
|
|
applier.MaterialiseRawSubtree(composition).ShouldBe(3);
|
|
}
|
|
|
|
/// <summary>All four Materialise* passes return 0 failures on a clean sink — the happy-path regression.</summary>
|
|
[Fact]
|
|
public void Materialise_HappyPath_AllPassesReturnZero()
|
|
{
|
|
var sink = new ConfigurableThrowingSink();
|
|
var applier = new AddressSpaceApplier(sink, NullLogger<AddressSpaceApplier>.Instance);
|
|
|
|
var tags = CompositionWithRawTags(RawTag("t1", "A"));
|
|
var vtags = CompositionWithVirtualTags(
|
|
new EquipmentVirtualTagPlan("v1", "eq-1", FolderPath: "", Name: "VA", DataType: "Float", Expression: "1", DependencyRefs: Array.Empty<string>(), Historize: false));
|
|
var alarms = CompositionWithScriptedAlarms(
|
|
new EquipmentScriptedAlarmPlan("a1", "eq-1", "Alarm", "OffNormalAlarm", 500, "msg", "pred", "true",
|
|
Array.Empty<string>(), HistorizeToAveva: false, Retain: true, Enabled: true));
|
|
|
|
applier.MaterialiseHierarchy(tags).ShouldBe(0);
|
|
applier.MaterialiseRawSubtree(tags).ShouldBe(0);
|
|
applier.MaterialiseEquipmentVirtualTags(vtags).ShouldBe(0);
|
|
applier.MaterialiseScriptedAlarms(alarms).ShouldBe(0);
|
|
}
|
|
|
|
// ---------------- fixtures ----------------
|
|
|
|
private static RawTagPlan RawTag(string id, string name) =>
|
|
new(id, $"Plant/dev1/{name}", ParentNodeId: null, "drv", Name: name, DataType: "Float", Writable: false, Alarm: null,
|
|
ReferencingEquipmentPaths: Array.Empty<string>());
|
|
|
|
private static AddressSpaceComposition CompositionWithRawTags(params RawTagPlan[] tags) =>
|
|
new(Array.Empty<EquipmentNode>(), Array.Empty<DriverInstancePlan>(), Array.Empty<ScriptedAlarmPlan>())
|
|
{
|
|
RawTags = tags,
|
|
};
|
|
|
|
private static AddressSpaceComposition CompositionWithVirtualTags(params EquipmentVirtualTagPlan[] vtags) =>
|
|
new(Array.Empty<EquipmentNode>(), Array.Empty<DriverInstancePlan>(), Array.Empty<ScriptedAlarmPlan>())
|
|
{
|
|
EquipmentVirtualTags = vtags,
|
|
};
|
|
|
|
private static AddressSpaceComposition CompositionWithScriptedAlarms(params EquipmentScriptedAlarmPlan[] alarms) =>
|
|
new(Array.Empty<EquipmentNode>(), Array.Empty<DriverInstancePlan>(), Array.Empty<ScriptedAlarmPlan>())
|
|
{
|
|
EquipmentScriptedAlarms = alarms,
|
|
};
|
|
|
|
// A rebuild-forcing plan: a node-affecting ChangedEquipment delta classifies as Rebuild (R2-07), so
|
|
// these tests exercise the SafeRebuild path (RebuildCalled/RebuildFailed) regardless of the pure-add
|
|
// routing. A pure-add plan would no longer rebuild, so the failure-surface tests must use a change.
|
|
private static AddressSpacePlan RebuildingPlan(string id) => new(
|
|
AddedEquipment: Array.Empty<EquipmentNode>(),
|
|
RemovedEquipment: Array.Empty<EquipmentNode>(),
|
|
ChangedEquipment: new[]
|
|
{
|
|
new AddressSpacePlan.EquipmentDelta(
|
|
new EquipmentNode(id, id, "line-1"),
|
|
new EquipmentNode(id, id + "-renamed", "line-1")),
|
|
},
|
|
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>());
|
|
|
|
private static AddressSpacePlan AlarmRemovalPlan(params string[] ids) => new(
|
|
AddedEquipment: Array.Empty<EquipmentNode>(),
|
|
RemovedEquipment: Array.Empty<EquipmentNode>(),
|
|
ChangedEquipment: Array.Empty<AddressSpacePlan.EquipmentDelta>(),
|
|
AddedDrivers: Array.Empty<DriverInstancePlan>(),
|
|
RemovedDrivers: Array.Empty<DriverInstancePlan>(),
|
|
ChangedDrivers: Array.Empty<AddressSpacePlan.DriverDelta>(),
|
|
AddedAlarms: Array.Empty<ScriptedAlarmPlan>(),
|
|
RemovedAlarms: ids.Select(id => new ScriptedAlarmPlan(id, "eq-1", "pred", "msg")).ToArray(),
|
|
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
|
|
{
|
|
public bool ThrowOnRebuild { get; init; }
|
|
public bool ThrowOnEnsureVariable { get; init; }
|
|
public bool ThrowOnEnsureFolder { get; init; }
|
|
public bool ThrowOnAlarmWrite { get; init; }
|
|
public bool ThrowOnMaterialiseAlarm { get; init; }
|
|
|
|
public void WriteValue(string nodeId, object? value, uint statusCode, DateTime sourceTimestampUtc, AddressSpaceRealm realm = AddressSpaceRealm.Uns) { }
|
|
|
|
public void WriteAlarmQuality(string alarmNodeId, uint statusCode, DateTime sourceTimestampUtc, AddressSpaceRealm realm) { }
|
|
|
|
public void WriteAlarmCondition(string alarmNodeId, AlarmConditionSnapshot state, DateTime sourceTimestampUtc, AddressSpaceRealm realm = AddressSpaceRealm.Uns)
|
|
{
|
|
if (ThrowOnAlarmWrite) throw new InvalidOperationException("simulated WriteAlarmCondition fault");
|
|
}
|
|
|
|
public void MaterialiseAlarmCondition(string alarmNodeId, string equipmentNodeId, string displayName, string alarmType, int severity, AddressSpaceRealm realm, bool isNative = false)
|
|
{
|
|
if (ThrowOnMaterialiseAlarm) throw new InvalidOperationException("simulated MaterialiseAlarmCondition fault");
|
|
}
|
|
|
|
public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName, AddressSpaceRealm realm = AddressSpaceRealm.Uns)
|
|
{
|
|
if (ThrowOnEnsureFolder) throw new InvalidOperationException("simulated EnsureFolder fault");
|
|
}
|
|
|
|
public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType, bool writable, AddressSpaceRealm realm, string? historianTagname = null, bool isArray = false, uint? arrayLength = null, bool refuseArrayOnScalar = false)
|
|
{
|
|
if (ThrowOnEnsureVariable) throw new InvalidOperationException("simulated EnsureVariable fault");
|
|
}
|
|
|
|
public void RebuildAddressSpace()
|
|
{
|
|
if (ThrowOnRebuild) throw new InvalidOperationException("simulated RebuildAddressSpace fault");
|
|
}
|
|
|
|
public void RaiseNodesAddedModelChange(string affectedNodeId, AddressSpaceRealm realm = AddressSpaceRealm.Uns) { }
|
|
public void WireAlarmNotifiers(string alarmNodeId, AddressSpaceRealm alarmRealm, IReadOnlyList<string> notifierFolderNodeIds, AddressSpaceRealm notifierFolderRealm) { }
|
|
public void AddReference(string sourceNodeId, AddressSpaceRealm sourceRealm, string targetNodeId, AddressSpaceRealm targetRealm, string referenceType = "Organizes") { }
|
|
}
|
|
}
|