mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
a81d981755
# 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>
358 lines
14 KiB
C#
358 lines
14 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/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
|
|
namespace Opc.Ua.Client.TestFramework
|
|
{
|
|
/// <summary>
|
|
/// Reusable <see cref="ISubscriptionNotificationHandler"/> for V2
|
|
/// subscription integration tests. Counts data changes, keep-alives,
|
|
/// and events; tracks the per-subscription last sequence number;
|
|
/// records all <see cref="DataValueChange"/>s for inspection; exposes
|
|
/// helpers to wait for the first data change, the first keep-alive,
|
|
/// or a specific data-change count.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Safe to use from concurrent V2 publish dispatches — counters use
|
|
/// <see cref="Interlocked"/>, the per-subscription sequence-number
|
|
/// table is a <see cref="ConcurrentDictionary{TKey,TValue}"/>, and
|
|
/// the captured-values list is wrapped in a lock on its accessor.
|
|
/// </remarks>
|
|
public sealed class RecordingSubscriptionHandler : ISubscriptionNotificationHandler
|
|
{
|
|
/// <summary>
|
|
/// Total number of <see cref="DataValueChange"/> records observed
|
|
/// across every <see cref="OnDataChangeNotificationAsync"/>
|
|
/// dispatch.
|
|
/// </summary>
|
|
public int DataChangeCount => Volatile.Read(ref m_dataChangeCount);
|
|
|
|
/// <summary>
|
|
/// Total number of <see cref="EventNotification"/> records observed.
|
|
/// </summary>
|
|
public int EventCount => Volatile.Read(ref m_eventCount);
|
|
|
|
/// <summary>
|
|
/// Total number of keep-alive notifications observed.
|
|
/// </summary>
|
|
public int KeepAliveCount => Volatile.Read(ref m_keepAliveCount);
|
|
|
|
/// <summary>
|
|
/// Most recently observed publish time across all dispatch
|
|
/// callbacks for this handler.
|
|
/// </summary>
|
|
public DateTime LastPublishTime { get; private set; }
|
|
|
|
/// <summary>
|
|
/// Last observed sequence number per subscription instance. Use
|
|
/// the subscription as the key.
|
|
/// </summary>
|
|
public IReadOnlyDictionary<ISubscription, uint> LastSequenceNumberBySubscription
|
|
=> m_lastSequenceNumber;
|
|
|
|
/// <summary>
|
|
/// Captured data-value changes. Use <see cref="GetSnapshot"/>
|
|
/// for a stable read; this exposes the raw list for callers
|
|
/// that need direct access.
|
|
/// </summary>
|
|
public List<RecordedDataValueChange> RecordedChanges
|
|
{
|
|
get
|
|
{
|
|
lock (m_recordedChangesLock)
|
|
{
|
|
return [.. m_recordedChanges];
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Take a snapshot of the recorded data-value changes.
|
|
/// </summary>
|
|
public IReadOnlyList<RecordedDataValueChange> GetSnapshot()
|
|
{
|
|
lock (m_recordedChangesLock)
|
|
{
|
|
return [.. m_recordedChanges];
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask OnDataChangeNotificationAsync(
|
|
ISubscription subscription,
|
|
uint sequenceNumber,
|
|
DateTime publishTime,
|
|
ReadOnlyMemory<DataValueChange> notification,
|
|
PublishState publishStateMask,
|
|
IReadOnlyList<string> stringTable)
|
|
{
|
|
m_lastSequenceNumber[subscription] = sequenceNumber;
|
|
LastPublishTime = publishTime;
|
|
int added = notification.Length;
|
|
Interlocked.Add(ref m_dataChangeCount, added);
|
|
|
|
// Project each pooled DataValueChange struct into a stable
|
|
// record we own. The DataValue reference inside the V2
|
|
// notification is safe to retain (the lifetime note on
|
|
// ISubscriptionNotificationHandler.DataValueChange spells
|
|
// that out), but the wrapping struct is on a pooled buffer.
|
|
lock (m_recordedChangesLock)
|
|
{
|
|
ReadOnlySpan<DataValueChange> span = notification.Span;
|
|
for (int i = 0; i < span.Length; i++)
|
|
{
|
|
DataValueChange ch = span[i];
|
|
m_recordedChanges.Add(new RecordedDataValueChange(
|
|
ch.MonitoredItem,
|
|
ch.Value,
|
|
sequenceNumber,
|
|
publishTime));
|
|
}
|
|
}
|
|
|
|
m_firstData.TrySetResult(true);
|
|
return default;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask OnEventDataNotificationAsync(
|
|
ISubscription subscription,
|
|
uint sequenceNumber,
|
|
DateTime publishTime,
|
|
ReadOnlyMemory<EventNotification> notification,
|
|
PublishState publishStateMask,
|
|
IReadOnlyList<string> stringTable)
|
|
{
|
|
m_lastSequenceNumber[subscription] = sequenceNumber;
|
|
LastPublishTime = publishTime;
|
|
Interlocked.Add(ref m_eventCount, notification.Length);
|
|
m_firstEvent.TrySetResult(true);
|
|
return default;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask OnKeepAliveNotificationAsync(
|
|
ISubscription subscription,
|
|
uint sequenceNumber,
|
|
DateTime publishTime,
|
|
PublishState publishStateMask)
|
|
{
|
|
m_lastSequenceNumber[subscription] = sequenceNumber;
|
|
LastPublishTime = publishTime;
|
|
Interlocked.Increment(ref m_keepAliveCount);
|
|
m_firstKeepAlive.TrySetResult(true);
|
|
return default;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask OnSubscriptionStateChangedAsync(
|
|
ISubscription subscription,
|
|
Subscriptions.SubscriptionState state,
|
|
PublishState publishStateMask,
|
|
CancellationToken ct = default)
|
|
{
|
|
Interlocked.Increment(ref m_stateChangedCount);
|
|
lock (m_stateChangesLock)
|
|
{
|
|
m_stateChanges.Add(new RecordedStateChange(
|
|
subscription, state, publishStateMask, DateTime.UtcNow));
|
|
}
|
|
if (publishStateMask.HasFlag(PublishState.Transferred))
|
|
{
|
|
m_firstTransferred.TrySetResult(true);
|
|
}
|
|
return default;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wait until at least one data-change notification has been
|
|
/// observed, or until the timeout / cancellation fires.
|
|
/// </summary>
|
|
public Task<bool> WaitForFirstDataAsync(TimeSpan timeout,
|
|
CancellationToken ct = default)
|
|
{
|
|
return WaitAsync(m_firstData, timeout, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wait until at least one keep-alive notification has been
|
|
/// observed.
|
|
/// </summary>
|
|
public Task<bool> WaitForFirstKeepAliveAsync(TimeSpan timeout,
|
|
CancellationToken ct = default)
|
|
{
|
|
return WaitAsync(m_firstKeepAlive, timeout, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wait until at least one event notification has been observed.
|
|
/// </summary>
|
|
public Task<bool> WaitForFirstEventAsync(TimeSpan timeout,
|
|
CancellationToken ct = default)
|
|
{
|
|
return WaitAsync(m_firstEvent, timeout, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wait until a state-change callback with the
|
|
/// <see cref="PublishState.Transferred"/> bit set has been
|
|
/// observed.
|
|
/// </summary>
|
|
public Task<bool> WaitForTransferredStateAsync(TimeSpan timeout,
|
|
CancellationToken ct = default)
|
|
{
|
|
return WaitAsync(m_firstTransferred, timeout, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Total number of <see cref="OnSubscriptionStateChangedAsync"/>
|
|
/// callbacks observed.
|
|
/// </summary>
|
|
public int StateChangedCount => Volatile.Read(ref m_stateChangedCount);
|
|
|
|
/// <summary>
|
|
/// Snapshot of recorded state-change callbacks.
|
|
/// </summary>
|
|
public IReadOnlyList<RecordedStateChange> GetStateChangeSnapshot()
|
|
{
|
|
lock (m_stateChangesLock)
|
|
{
|
|
return [.. m_stateChanges];
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Poll until <see cref="DataChangeCount"/> reaches
|
|
/// <paramref name="atLeast"/>, or until the timeout / cancellation
|
|
/// fires.
|
|
/// </summary>
|
|
public async Task<bool> WaitForDataCountAsync(int atLeast,
|
|
TimeSpan timeout, CancellationToken ct = default)
|
|
{
|
|
DateTime deadline = DateTime.UtcNow + timeout;
|
|
while (DateTime.UtcNow < deadline)
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
if (DataChangeCount >= atLeast)
|
|
{
|
|
return true;
|
|
}
|
|
await Task.Delay(50, ct).ConfigureAwait(false);
|
|
}
|
|
return DataChangeCount >= atLeast;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Reset all counters and recorded data so the handler can be
|
|
/// reused across phases of a test.
|
|
/// </summary>
|
|
public void Reset()
|
|
{
|
|
Interlocked.Exchange(ref m_dataChangeCount, 0);
|
|
Interlocked.Exchange(ref m_eventCount, 0);
|
|
Interlocked.Exchange(ref m_keepAliveCount, 0);
|
|
Interlocked.Exchange(ref m_stateChangedCount, 0);
|
|
m_lastSequenceNumber.Clear();
|
|
lock (m_recordedChangesLock)
|
|
{
|
|
m_recordedChanges.Clear();
|
|
}
|
|
lock (m_stateChangesLock)
|
|
{
|
|
m_stateChanges.Clear();
|
|
}
|
|
m_firstData = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
m_firstEvent = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
m_firstKeepAlive = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
m_firstTransferred = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
}
|
|
|
|
private static async Task<bool> WaitAsync(
|
|
TaskCompletionSource<bool> tcs, TimeSpan timeout,
|
|
CancellationToken ct)
|
|
{
|
|
using var timeoutCts = new CancellationTokenSource(timeout);
|
|
using var linked = CancellationTokenSource
|
|
.CreateLinkedTokenSource(timeoutCts.Token, ct);
|
|
using (linked.Token.Register(() => tcs.TrySetResult(false)))
|
|
{
|
|
return await tcs.Task.ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
private int m_dataChangeCount;
|
|
private int m_eventCount;
|
|
private int m_keepAliveCount;
|
|
private int m_stateChangedCount;
|
|
private TaskCompletionSource<bool> m_firstData =
|
|
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
private TaskCompletionSource<bool> m_firstKeepAlive =
|
|
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
private TaskCompletionSource<bool> m_firstEvent =
|
|
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
private TaskCompletionSource<bool> m_firstTransferred =
|
|
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
private readonly ConcurrentDictionary<ISubscription, uint> m_lastSequenceNumber = new();
|
|
private readonly List<RecordedDataValueChange> m_recordedChanges = [];
|
|
private readonly Lock m_recordedChangesLock = new();
|
|
private readonly List<RecordedStateChange> m_stateChanges = [];
|
|
private readonly Lock m_stateChangesLock = new();
|
|
}
|
|
|
|
/// <summary>
|
|
/// A captured data-value change for inspection in tests. Owns its
|
|
/// <see cref="DataValue"/> reference; safe to retain past the
|
|
/// V2 dispatch return.
|
|
/// </summary>
|
|
public sealed record RecordedDataValueChange(
|
|
Subscriptions.MonitoredItems.IMonitoredItem? MonitoredItem,
|
|
DataValue Value,
|
|
uint SequenceNumber,
|
|
DateTime PublishTime);
|
|
|
|
/// <summary>
|
|
/// A captured state-change callback for inspection in tests.
|
|
/// </summary>
|
|
public sealed record RecordedStateChange(
|
|
ISubscription Subscription,
|
|
Subscriptions.SubscriptionState State,
|
|
PublishState PublishStateMask,
|
|
DateTime ObservedAt);
|
|
}
|