Files
Marc Schierandagent a81d981755 dotnet format sweep (whitespace, IDE, RCS) + code-style enforcer agent fix (#3865)
# 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>
2026-06-10 08:35:44 +02:00

269 lines
10 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;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Moq;
using NUnit.Framework;
using Opc.Ua.Client.Alarms;
using Opc.Ua.Client.StateMachines;
using Opc.Ua.Client.Subscriptions;
using Opc.Ua.Client.Subscriptions.Streaming;
using Opc.Ua.Tests;
using MonitoringOptions = Opc.Ua.Client.Subscriptions.MonitoredItems.MonitoredItemOptions;
// Local fake IStreamingSubscription test types are no-op IAsyncDisposable
// instances with nothing to dispose; CA2000's leak warning does not apply.
#pragma warning disable CA2000
namespace Opc.Ua.Client.Tests.Alarms
{
/// <summary>
/// Tests for the Part 16 state-machine partial on
/// <see cref="AlarmClient"/>. Drives the
/// <c>ShelvedStateMachineTypeClient</c> proxy via a mocked
/// <see cref="ISessionClient"/> and asserts the wired-up
/// <c>conditionId</c> propagates as the <c>StartingNode</c> of the
/// proxy's browse-path requests.
/// </summary>
[TestFixture]
[Category("Client")]
[Category("Alarms")]
[Parallelizable]
public sealed class AlarmClientStateMachineTests
{
private Mock<ISessionClient> m_sessionMock = 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_client = new AlarmClient(m_sessionMock.Object, NUnitTelemetryContext.Create());
m_conditionId = new NodeId(77u, 4);
}
[Test]
public async Task GetShelvingStateAsyncForwardsConditionIdToShelvedStateMachineTypeClient()
{
ArrayOf<BrowsePath> captured = default;
SetupTranslate(allEmpty: true, capture: p => captured = p);
FiniteStateSnapshot snapshot = await m_client
.GetShelvingStateAsync(m_conditionId).ConfigureAwait(false);
Assert.That(snapshot, Is.Not.Null);
Assert.That(captured.Count, Is.EqualTo(4));
foreach (BrowsePath bp in captured)
{
Assert.That(bp.StartingNode, Is.EqualTo(m_conditionId));
}
}
[Test]
public async Task GetShelvingStateAsyncReturnsBadNotFoundWhenNoBrowsePathsResolve()
{
SetupTranslate(allEmpty: true, capture: null);
FiniteStateSnapshot snapshot = await m_client
.GetShelvingStateAsync(m_conditionId).ConfigureAwait(false);
Assert.That(snapshot.StateMachineId, Is.EqualTo(m_conditionId));
Assert.That(snapshot.CurrentState.IsNull, Is.True);
Assert.That(snapshot.CurrentStateId.IsNull, Is.True);
Assert.That(snapshot.Status, Is.EqualTo(StatusCodes.BadNotFound));
}
[Test]
public async Task GetShelvingStateAsyncReturnsParsedLocalizedTextFromRead()
{
// Resolve CurrentState only (path 0). The remaining 3 paths
// return empty targets — the snapshot is built from a single
// Read of the CurrentState variable.
var currentStateNodeId = new NodeId(101u, 0);
SetupTranslate(
results:
[
MakeResult((ExpandedNodeId)currentStateNodeId),
MakeEmptyResult(),
MakeEmptyResult(),
MakeEmptyResult()
],
capture: null);
var expected = new LocalizedText("en", "Unshelved");
m_sessionMock.Setup(s => s.ReadAsync(
It.IsAny<RequestHeader>(),
It.IsAny<double>(),
It.IsAny<TimestampsToReturn>(),
It.IsAny<ArrayOf<ReadValueId>>(),
It.IsAny<CancellationToken>()))
.Returns(new ValueTask<ReadResponse>(new ReadResponse
{
ResponseHeader = new ResponseHeader(),
Results = ArrayOf.Wrapped(
[
new DataValue(Variant.From(expected))
]),
DiagnosticInfos = []
}));
FiniteStateSnapshot snapshot = await m_client
.GetShelvingStateAsync(m_conditionId).ConfigureAwait(false);
Assert.That(snapshot.CurrentState, Is.EqualTo(expected));
Assert.That(snapshot.StateMachineId, Is.EqualTo(m_conditionId));
}
[Test]
public async Task ObserveShelvingTransitionsAsyncReturnsNonNullEnumerableForFakeStream()
{
SetupTranslate(allEmpty: true, capture: null);
var streaming = new EmptyStreamingSubscription();
IAsyncEnumerable<FiniteStateSnapshot> enumerable =
m_client.ObserveShelvingTransitionsAsync(m_conditionId, streaming);
Assert.That(enumerable, Is.Not.Null);
// When no CurrentState.Id child resolves, the underlying
// implementation yields no items but iterates cleanly.
int count = 0;
await foreach (FiniteStateSnapshot _ in enumerable.ConfigureAwait(false))
{
count++;
}
Assert.That(count, Is.Zero);
}
private void SetupTranslate(
bool allEmpty,
Action<ArrayOf<BrowsePath>>? capture)
{
var results = ArrayOf.Wrapped(
[
MakeEmptyResult(),
MakeEmptyResult(),
MakeEmptyResult(),
MakeEmptyResult()
]);
_ = allEmpty;
SetupTranslate(results, capture);
}
private void SetupTranslate(
ArrayOf<BrowsePathResult> results,
Action<ArrayOf<BrowsePath>>? capture)
{
m_sessionMock.Setup(s => s.TranslateBrowsePathsToNodeIdsAsync(
It.IsAny<RequestHeader>(),
It.IsAny<ArrayOf<BrowsePath>>(),
It.IsAny<CancellationToken>()))
.Callback<RequestHeader, ArrayOf<BrowsePath>, CancellationToken>(
(_, r, _) => capture?.Invoke(r))
.Returns(new ValueTask<TranslateBrowsePathsToNodeIdsResponse>(
new TranslateBrowsePathsToNodeIdsResponse
{
ResponseHeader = new ResponseHeader(),
Results = results,
DiagnosticInfos = []
}));
}
private static BrowsePathResult MakeResult(ExpandedNodeId target)
{
return new()
{
StatusCode = StatusCodes.Good,
Targets = ArrayOf.Wrapped(
[
new BrowsePathTarget { TargetId = target }
])
};
}
private static BrowsePathResult MakeEmptyResult()
{
return new()
{
StatusCode = StatusCodes.Good,
Targets = default
};
}
/// <summary>
/// Minimal <see cref="IStreamingSubscription"/> that yields no
/// notifications. Used for tests where the underlying state
/// machine resolves no CurrentState.Id child node.
/// </summary>
private sealed class EmptyStreamingSubscription : IStreamingSubscription
{
public async IAsyncEnumerable<DataValueChange> SubscribeDataChangesAsync(
NodeId nodeId,
MonitoringOptions? options = null,
[EnumeratorCancellation] CancellationToken ct = default)
{
await Task.Yield();
yield break;
}
public async IAsyncEnumerable<DataValueChange> SubscribeDataChangesAsync(
IReadOnlyList<NodeId> nodeIds,
MonitoringOptions? options = null,
[EnumeratorCancellation] CancellationToken ct = default)
{
await Task.Yield();
yield break;
}
public async IAsyncEnumerable<EventNotification> SubscribeEventsAsync(
NodeId notifierId,
EventFilter filter,
MonitoringOptions? options = null,
[EnumeratorCancellation] CancellationToken ct = default)
{
await Task.Yield();
yield break;
}
public ValueTask DisposeAsync()
{
return default;
}
}
}
}