fix(client): TimedShelve milliseconds + shelve node guard + service-layer tests
Important 1: ShelveAlarmAsync Timed branch now multiplies shelvingTimeSeconds × 1000.0
before passing to CallMethodAsync — OPC UA Part 9 TimedShelve ShelvingTime is a Duration
in milliseconds, not seconds. IOpcUaClientService XML doc and ShelveCommand --duration
description updated to document the seconds-in / ms-out contract.
Important 2: ShelveAlarmAsync builds shelvingStateNodeId with the same
EndsWith(".ShelvingState") guard already used by the .Condition suffix in
AcknowledgeAlarmAsync / ConfirmAlarmAsync, preventing double-append.
Important 3: Add 6 service-layer tests to OpcUaClientServiceTests —
ConfirmAlarmAsync_OnSuccess_ReturnsGood
ConfirmAlarmAsync_OnServiceResultException_ReturnsBadStatusCode
ShelveAlarmAsync_OneShot_CallsMethodWithNoArgs
ShelveAlarmAsync_Timed_PassesDurationInMilliseconds (regression guard for Important 1)
ShelveAlarmAsync_Unshelve_CallsMethodWithNoArgs
ShelveAlarmAsync_OnServiceResultException_ReturnsBadStatusCode
FakeSessionAdapter extended with CallMethodInputArgs list to record per-call input
arguments so the Timed test can assert the ms value.
Minor 4: ShelveCommand output changed from "Shelve (OneShot) successful" to
"{shelveKind} successful/failed" so Unshelve reads "Unshelve successful: …".
Minor 6: ShelveCommand --duration description updated to "(must be > 0; in seconds,
converted to milliseconds for the OPC UA call; required for --kind Timed)".
This commit is contained in:
@@ -417,7 +417,9 @@ public sealed class OpcUaClientService : IOpcUaClientService
|
||||
|
||||
// The shelve methods live on the ShelvingState child of the condition node.
|
||||
// conditionNodeId is the alarm/condition node; append .ShelvingState to get the state machine node.
|
||||
var shelvingStateNodeId = NodeId.Parse(conditionNodeId + ".ShelvingState");
|
||||
var shelvingStateNodeId = conditionNodeId.EndsWith(".ShelvingState")
|
||||
? NodeId.Parse(conditionNodeId)
|
||||
: NodeId.Parse(conditionNodeId + ".ShelvingState");
|
||||
|
||||
NodeId methodId;
|
||||
object[] inputArgs;
|
||||
@@ -433,7 +435,8 @@ public sealed class OpcUaClientService : IOpcUaClientService
|
||||
throw new ArgumentOutOfRangeException(nameof(shelvingTimeSeconds),
|
||||
"Timed shelving requires a positive shelvingTimeSeconds value.");
|
||||
methodId = MethodIds.AlarmConditionType_ShelvingState_TimedShelve;
|
||||
inputArgs = [shelvingTimeSeconds];
|
||||
// OPC UA Part 9 TimedShelve ShelvingTime input is a Duration (Double) in milliseconds.
|
||||
inputArgs = [shelvingTimeSeconds * 1000.0];
|
||||
break;
|
||||
case ShelveKind.Unshelve:
|
||||
methodId = MethodIds.AlarmConditionType_ShelvingState_Unshelve;
|
||||
|
||||
Reference in New Issue
Block a user