mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 15:11:53 +08:00
# Description
Pure code-style sweep across the repo — no behavioral changes. Drives
`dotnet format` info-level diagnostics down on a large slice of the
codebase (Stack, Libraries, Tests, Tools).
Six commits, applied bottom-up in safety order so each batch leaves the
build green:
1. **`style: fix whitespace and final-newline formatting (WHITESPACE,
FINALNEWLINE)`**
197 hits across ~30 files; pure mechanical cleanup.
2. **`style: apply dotnet format style fixes (IDE rules)`**
IDE-rule batch via `dotnet format style --severity info` —
`var`/explicit type, simplify names, collection expressions, expression
bodies, unused usings, etc.
3. **`style: apply dotnet format analyzers fixes (RCS blank-line
formatting)`**
Roslynator formatting (RCS0xxx) blank-line and punctuation rules.
4. **`style: convert comments to doc comments and inline local vars
(RCS1181, RCS1124)`**
24 files. RCS1181 promotes `// summary`-style comments above
public/internal members to `/// <summary>` doc comments; RCS1124 inlines
locals used exactly once. Generated `Tools/` files were reverted to keep
the source-generator outputs deterministic.
5. **`docs(agent): correct --diagnostics flag form and verify Roslynator
4.x code fixers`**
Updates `.github/agents/opc-ua-codestyle-enforcer.agent.md` with two
corrections discovered while running this sweep:
- `dotnet format --diagnostics "RULE1 RULE2"` (single quoted,
space-separated) silently fixes nothing on `dotnet format` 10.x — it
parses as one unknown ID and exits 0. The correct form is `--diagnostics
RULE1 --diagnostics RULE2 …`, repeated per rule.
- Roslynator 4.15.0 **does** ship code fixers for
RCS1078/1118/1124/1140/1142/1181/1221/1260 (the previous "no auto-fixer"
list was outdated). RCS1140/1142 default to `Hidden` so need `--severity
info` to surface and fire; RCS1078 requires
`roslynator_empty_string_style = field` (already set in
`.editorconfig`). Only NUnit4002/2046/2010 genuinely lack auto-fixers in
this stack.
6. **`style: format new code from master merge (dotnet format sweep)`**
After merging master into the branch (commit `e3ebc8742`), re-ran the
same three-phase format sweep on the 151 .cs files brought in by the
merge, scoped per project via repeated `--include`. 81 files changed;
same rule families as commits 1–4.
- Hand-fixed `Tests/Opc.Ua.MigrationAnalyzer.Tests/AnalyzerHarness.cs`
for `RCS1174` (redundant `async`/`await` removal) because the auto-fixer
didn't apply for that specific case.
- Reverted files that the formatter would break:
- `Libraries/Opc.Ua.Server/Server/ServerInternalData.cs` — multi-TFM
analysis disagreement injected `<<<<<<<` / `=======` / `>>>>>>>`
markers.
-
`Tools/Opc.Ua.MigrationAnalyzer.Core/{Core/Stack/Client/ChannelBase.cs,
Core/Stack/Types/IUserIdentityTokenHandler.cs,
Client/Session/Session.cs}` — IDE0005 removed `using
Opc.Ua.Security.Certificates` that IS used (the files are 1.5.378
reference fixtures for the analyzer).
- `Tests/Opc.Ua.Gds.Tests/PushTest.cs` — IDE0002 over-simplified
`OpcUa.ObjectTypeIds` to `ObjectTypeIds`, which then resolves to a
conflicting type.
### What this PR does **not** touch
- No behavioral or semantic logic changes.
- No `.editorconfig` rule promotions (rules stay at their current
severities; this is a backlog-burndown pass, not a rule tightening).
- Generated source under `Tools/` is intentionally excluded.
- Higher-risk rule families (`RCS1090`/`CA2007` `ConfigureAwait`,
`RCS1249` null-forgiving cleanup, `IDE0270`/`IDE0059`) are left for
follow-up sweeps because they need per-TFM build verification or
semantic review.
## Related Issues
_No tracking issue — this is a non-functional style sweep and the
agent-doc correction is a follow-up to the same work. Happy to open one
if the maintainers prefer._
## Checklist
- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage. _(N/A — style-only, no
behavioral change)_
- [x] I have added all necessary documentation. _(agent doc updated with
the two corrections)_
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings. _(verified clean on `net10.0` and `net48`; only
pre-existing `NETSDK1005`/`NETSDK1207` failures on Tools/AOT projects)_
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed. _(build
verified on net10 and net48 per batch; full test suite not yet run
locally — relying on CI)_
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
---------
Co-authored-by: agent <agent@local>
370 lines
15 KiB
C#
370 lines
15 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
#nullable enable
|
|
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.Alarms;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests.Alarms
|
|
{
|
|
/// <summary>
|
|
/// Tests that <see cref="AlarmClient"/> dispatches each public
|
|
/// operation to the right source-generated <c>*TypeClient</c> proxy,
|
|
/// passing the supplied <c>conditionId</c> as the request
|
|
/// <c>ObjectId</c> and the correct <c>MethodId</c>. The
|
|
/// <c>comment.IsNullOrEmpty</c> branch dispatch (Xxx vs Xxx2) is
|
|
/// covered for every alarm-condition operation that takes an
|
|
/// optional comment.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("Alarms")]
|
|
[Parallelizable]
|
|
public sealed class AlarmClientTests
|
|
{
|
|
private Mock<ISessionClient> m_sessionMock = null!;
|
|
private ITelemetryContext m_telemetry = null!;
|
|
private AlarmClient m_client = null!;
|
|
private NodeId m_conditionId;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_sessionMock = new Mock<ISessionClient>(MockBehavior.Loose);
|
|
m_sessionMock.SetupGet(s => s.MessageContext)
|
|
.Returns(ServiceMessageContext.Create(NUnitTelemetryContext.Create()));
|
|
m_telemetry = NUnitTelemetryContext.Create();
|
|
m_client = new AlarmClient(m_sessionMock.Object, m_telemetry);
|
|
m_conditionId = new NodeId(42u, 3);
|
|
}
|
|
|
|
[Test]
|
|
public void ConstructorWithNullSessionThrowsArgumentNullException()
|
|
{
|
|
Assert.That(
|
|
() => new AlarmClient(null!, m_telemetry),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void ConstructorWithNullTelemetryThrowsArgumentNullException()
|
|
{
|
|
Assert.That(
|
|
() => new AlarmClient(m_sessionMock.Object, null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public async Task AcknowledgeAsyncForwardsToAcknowledgeableConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.AcknowledgeAsync(
|
|
m_conditionId,
|
|
new ByteString(new byte[] { 1, 2, 3 }),
|
|
new LocalizedText("en", "ack"))).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.AcknowledgeableConditionType_Acknowledge));
|
|
Assert.That(captured.InputArguments.Count, Is.EqualTo(2));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ConfirmAsyncForwardsToAcknowledgeableConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.ConfirmAsync(
|
|
m_conditionId,
|
|
new ByteString(new byte[] { 5 }),
|
|
new LocalizedText("en", "ok"))).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.AcknowledgeableConditionType_Confirm));
|
|
Assert.That(captured.InputArguments.Count, Is.EqualTo(2));
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddCommentAsyncForwardsToConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.AddCommentAsync(
|
|
m_conditionId,
|
|
new ByteString(new byte[] { 9 }),
|
|
new LocalizedText("en", "note"))).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ConditionType_AddComment));
|
|
}
|
|
|
|
[Test]
|
|
public async Task EnableAsyncForwardsToConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.EnableAsync(m_conditionId)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ConditionType_Enable));
|
|
Assert.That(captured.InputArguments.Count, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DisableAsyncForwardsToConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.DisableAsync(m_conditionId)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ConditionType_Disable));
|
|
}
|
|
|
|
[Test]
|
|
public async Task RespondAsyncForwardsToDialogConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.RespondAsync(m_conditionId, 2)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.DialogConditionType_Respond));
|
|
Assert.That(captured.InputArguments.Count, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task SilenceAsyncForwardsToAlarmConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.SilenceAsync(m_conditionId)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.AlarmConditionType_Silence));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Respond2AsyncForwardsToDialogConditionTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.Respond2Async(
|
|
m_conditionId, 1, new LocalizedText("en", "details")))
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.DialogConditionType_Respond2));
|
|
Assert.That(captured.InputArguments.Count, Is.EqualTo(2));
|
|
}
|
|
|
|
[TestCase(null)]
|
|
[TestCase("")]
|
|
public async Task SuppressAsyncWithEmptyCommentDispatchesToSuppress(string? text)
|
|
{
|
|
LocalizedText comment = text == null
|
|
? default
|
|
: new LocalizedText(text);
|
|
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.SuppressAsync(m_conditionId, comment)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.AlarmConditionType_Suppress));
|
|
Assert.That(captured.InputArguments.Count, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public async Task SuppressAsyncWithNonEmptyCommentDispatchesToSuppress2()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.SuppressAsync(
|
|
m_conditionId,
|
|
new LocalizedText("en", "reason"))).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.AlarmConditionType_Suppress2));
|
|
Assert.That(captured.InputArguments.Count, Is.EqualTo(1));
|
|
}
|
|
|
|
[TestCase(null, false)]
|
|
[TestCase("", false)]
|
|
[TestCase("note", true)]
|
|
public async Task UnsuppressAsyncCommentBranchSelection(string? text, bool expectV2)
|
|
{
|
|
LocalizedText comment = text == null ? default : new LocalizedText(text);
|
|
NodeId expected = expectV2
|
|
? MethodIds.AlarmConditionType_Unsuppress2
|
|
: MethodIds.AlarmConditionType_Unsuppress;
|
|
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.UnsuppressAsync(m_conditionId, comment)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.MethodId, Is.EqualTo(expected));
|
|
}
|
|
|
|
[TestCase(null, false)]
|
|
[TestCase("", false)]
|
|
[TestCase("note", true)]
|
|
public async Task RemoveFromServiceAsyncCommentBranchSelection(string? text, bool expectV2)
|
|
{
|
|
LocalizedText comment = text == null ? default : new LocalizedText(text);
|
|
NodeId expected = expectV2
|
|
? MethodIds.AlarmConditionType_RemoveFromService2
|
|
: MethodIds.AlarmConditionType_RemoveFromService;
|
|
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.RemoveFromServiceAsync(m_conditionId, comment))
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(captured.MethodId, Is.EqualTo(expected));
|
|
}
|
|
|
|
[TestCase(null, false)]
|
|
[TestCase("", false)]
|
|
[TestCase("note", true)]
|
|
public async Task PlaceInServiceAsyncCommentBranchSelection(string? text, bool expectV2)
|
|
{
|
|
LocalizedText comment = text == null ? default : new LocalizedText(text);
|
|
NodeId expected = expectV2
|
|
? MethodIds.AlarmConditionType_PlaceInService2
|
|
: MethodIds.AlarmConditionType_PlaceInService;
|
|
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.PlaceInServiceAsync(m_conditionId, comment))
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(captured.MethodId, Is.EqualTo(expected));
|
|
}
|
|
|
|
[TestCase(null, false)]
|
|
[TestCase("", false)]
|
|
[TestCase("note", true)]
|
|
public async Task ResetAsyncCommentBranchSelection(string? text, bool expectV2)
|
|
{
|
|
LocalizedText comment = text == null ? default : new LocalizedText(text);
|
|
NodeId expected = expectV2
|
|
? MethodIds.AlarmConditionType_Reset2
|
|
: MethodIds.AlarmConditionType_Reset;
|
|
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.ResetAsync(m_conditionId, comment))
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(captured.MethodId, Is.EqualTo(expected));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ConditionRefreshAsyncUsesConditionTypeAsObjectId()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.ConditionRefreshAsync(11u)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(ObjectTypeIds.ConditionType));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ConditionType_ConditionRefresh));
|
|
Assert.That(captured.InputArguments.Count, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task TimedShelveAsyncForwardsToShelvedStateMachineTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.TimedShelveAsync(m_conditionId, 1000.0)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ShelvedStateMachineType_TimedShelve));
|
|
}
|
|
|
|
[Test]
|
|
public async Task OneShotShelveAsyncForwardsToShelvedStateMachineTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.OneShotShelveAsync(m_conditionId)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ShelvedStateMachineType_OneShotShelve));
|
|
}
|
|
|
|
[Test]
|
|
public async Task UnshelveAsyncForwardsToShelvedStateMachineTypeClient()
|
|
{
|
|
CallMethodRequest captured = await CaptureCallAsync(
|
|
_ => m_client.UnshelveAsync(m_conditionId)).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.ObjectId, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured.MethodId,
|
|
Is.EqualTo(MethodIds.ShelvedStateMachineType_Unshelve));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wires up the loose mock for <see cref="ISessionClient.CallAsync"/>
|
|
/// to capture the (single) <see cref="CallMethodRequest"/> and
|
|
/// return a Good-status response, then runs the supplied
|
|
/// invocation and returns the captured request for assertions.
|
|
/// </summary>
|
|
private async Task<CallMethodRequest> CaptureCallAsync(
|
|
System.Func<CallMethodRequest, ValueTask> action)
|
|
{
|
|
ArrayOf<CallMethodRequest> captured = default;
|
|
m_sessionMock.Setup(s => s.CallAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Callback<RequestHeader, ArrayOf<CallMethodRequest>, CancellationToken>(
|
|
(_, r, _) => captured = r)
|
|
.Returns(new ValueTask<CallResponse>(new CallResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped(
|
|
[
|
|
new CallMethodResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
OutputArguments = default
|
|
}
|
|
]),
|
|
DiagnosticInfos = []
|
|
}));
|
|
|
|
await action(default!).ConfigureAwait(false);
|
|
|
|
Assert.That(captured.Count, Is.EqualTo(1));
|
|
return captured[0];
|
|
}
|
|
}
|
|
}
|