mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 17:16:16 +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>
428 lines
16 KiB
C#
428 lines
16 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.Channels;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.ModelChange;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
using Opc.Ua.Client.Subscriptions.Streaming;
|
|
using MonitoringOptions = Opc.Ua.Client.Subscriptions.MonitoredItems.MonitoredItemOptions;
|
|
|
|
// Tests run on the default TaskScheduler so CA2007's sync-context
|
|
// risk does not apply. The local FakeStreamingSubscription is a
|
|
// no-op IAsyncDisposable fake with nothing to dispose; CA2000's leak
|
|
// warning does not apply.
|
|
#pragma warning disable CA2007, CA2000
|
|
|
|
namespace Opc.Ua.Client.Tests.ModelChange
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for <see cref="ModelChangeTracker"/>. Drives the
|
|
/// tracker through a fake <see cref="IStreamingSubscription"/>
|
|
/// that pushes <see cref="EventNotification"/>s on demand and
|
|
/// uses a <see cref="Mock{INodeCache}"/> to observe cache
|
|
/// invalidation calls.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("ModelChange")]
|
|
[Parallelizable]
|
|
public sealed class ModelChangeTrackerTests
|
|
{
|
|
[Test]
|
|
public void ConstructorWithNullStreamingThrowsArgumentNullException()
|
|
{
|
|
Assert.That(
|
|
() => new ModelChangeTracker(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public async Task IsTrackingIsFalseBeforeStartAsync()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
await using var tracker = new ModelChangeTracker(fake);
|
|
|
|
Assert.That(tracker.IsTracking, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public async Task IsTrackingIsTrueAfterStartAsync()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
await using var tracker = new ModelChangeTracker(fake);
|
|
|
|
await tracker.StartTrackingAsync();
|
|
|
|
Assert.That(tracker.IsTracking, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public async Task StartTrackingAsyncIsIdempotent()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
await using var tracker = new ModelChangeTracker(fake);
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
await tracker.StartTrackingAsync();
|
|
|
|
Assert.That(tracker.IsTracking, Is.True);
|
|
|
|
// The pump task is started exactly once — a second
|
|
// call must not subscribe again.
|
|
Assert.That(fake.SubscribeCallCount, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task StopTrackingAsyncCompletesPumpTaskAndFlipsIsTrackingToFalse()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
await using var tracker = new ModelChangeTracker(fake);
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
await tracker.StopTrackingAsync();
|
|
|
|
Assert.That(tracker.IsTracking, Is.False);
|
|
Assert.That(fake.PumpCancellationObserved, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DisposeAsyncIsIdempotent()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
var tracker = new ModelChangeTracker(fake);
|
|
await tracker.StartTrackingAsync();
|
|
|
|
await tracker.DisposeAsync();
|
|
// Second dispose must be a no-op (does not throw).
|
|
await tracker.DisposeAsync();
|
|
|
|
Assert.That(tracker.IsTracking, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DisposeAsyncCallsStopTracking()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
var tracker = new ModelChangeTracker(fake);
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
|
|
await tracker.DisposeAsync();
|
|
|
|
Assert.That(tracker.IsTracking, Is.False);
|
|
Assert.That(fake.PumpCancellationObserved, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public async Task NotificationWithFewerThanThreeFieldsDoesNotRaiseModelChanged()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
var cache = new Mock<INodeCache>(MockBehavior.Strict);
|
|
await using var tracker = new ModelChangeTracker(fake, cache.Object);
|
|
|
|
int raised = 0;
|
|
tracker.ModelChanged += (_, _) => Interlocked.Increment(ref raised);
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
|
|
// Fields.Count < 3 — fast-path return, no event, no cache call.
|
|
fake.Push(new EventNotification(
|
|
null, ArrayOf.Wrapped<Variant>(default, default)));
|
|
|
|
await fake.QuiesceAsync();
|
|
|
|
Assert.That(raised, Is.Zero);
|
|
cache.VerifyNoOtherCalls();
|
|
}
|
|
|
|
[Test]
|
|
public async Task NotificationWithMalformedFieldsTriggersFullCacheInvalidation()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
var cache = new Mock<INodeCache>(MockBehavior.Loose);
|
|
await using var tracker = new ModelChangeTracker(fake, cache.Object);
|
|
|
|
ModelChangedEventArgs? observed = null;
|
|
tracker.ModelChanged += (_, e) => observed = e;
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
|
|
// fields[2] is a scalar string — definitively NOT an
|
|
// ExtensionObject[] of ModelChangeStructureDataType, so the
|
|
// tracker must fall back to full cache invalidation.
|
|
fake.Push(new EventNotification(
|
|
null,
|
|
ArrayOf.Wrapped(
|
|
default,
|
|
default,
|
|
Variant.From("not-an-extension-object-array"))));
|
|
|
|
await fake.QuiesceAsync();
|
|
|
|
cache.Verify(c => c.Clear(), Times.Once);
|
|
cache.Verify(c => c.InvalidateNode(It.IsAny<NodeId>()), Times.Never);
|
|
|
|
Assert.That(observed, Is.Not.Null);
|
|
Assert.That(observed!.RequiresFullCacheInvalidation, Is.True);
|
|
Assert.That(observed.Changes, Is.Empty);
|
|
}
|
|
|
|
[Test]
|
|
public async Task NotificationWithNullChangesFieldTriggersFullCacheInvalidation()
|
|
{
|
|
// changesVariant.IsNull -> boxed is null -> still NOT
|
|
// ExtensionObject[] -> full invalidation path.
|
|
var fake = new FakeStreamingSubscription();
|
|
var cache = new Mock<INodeCache>(MockBehavior.Loose);
|
|
await using var tracker = new ModelChangeTracker(fake, cache.Object);
|
|
|
|
ModelChangedEventArgs? observed = null;
|
|
tracker.ModelChanged += (_, e) => observed = e;
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
|
|
fake.Push(new EventNotification(
|
|
null,
|
|
ArrayOf.Wrapped<Variant>(default, default, default)));
|
|
|
|
await fake.QuiesceAsync();
|
|
|
|
cache.Verify(c => c.Clear(), Times.Once);
|
|
Assert.That(observed, Is.Not.Null);
|
|
Assert.That(observed!.RequiresFullCacheInvalidation, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public async Task CacheInvalidationExceptionsAreLoggedButDoNotStopTracking()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
var cache = new Mock<INodeCache>();
|
|
cache.Setup(c => c.Clear())
|
|
.Throws(new InvalidOperationException("boom"));
|
|
|
|
await using var tracker = new ModelChangeTracker(fake, cache.Object);
|
|
|
|
int raised = 0;
|
|
tracker.ModelChanged += (_, _) => Interlocked.Increment(ref raised);
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
|
|
// First malformed notification — Clear() throws, must be swallowed,
|
|
// ModelChanged must still fire.
|
|
fake.Push(new EventNotification(
|
|
null,
|
|
ArrayOf.Wrapped(
|
|
default, default, Variant.From("garbage"))));
|
|
await fake.QuiesceAsync();
|
|
|
|
// Second notification — pump must still be alive.
|
|
fake.Push(new EventNotification(
|
|
null,
|
|
ArrayOf.Wrapped(
|
|
default, default, Variant.From("garbage-2"))));
|
|
await fake.QuiesceAsync();
|
|
|
|
Assert.That(raised, Is.EqualTo(2));
|
|
Assert.That(tracker.IsTracking, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public async Task SubscriberHandlerExceptionsAreSwallowed()
|
|
{
|
|
var fake = new FakeStreamingSubscription();
|
|
await using var tracker = new ModelChangeTracker(fake);
|
|
|
|
int raised = 0;
|
|
tracker.ModelChanged += (_, _) =>
|
|
{
|
|
Interlocked.Increment(ref raised);
|
|
throw new InvalidOperationException("subscriber failure");
|
|
};
|
|
|
|
await tracker.StartTrackingAsync();
|
|
await fake.WaitForSubscribeAsync();
|
|
|
|
fake.Push(new EventNotification(
|
|
null,
|
|
ArrayOf.Wrapped(
|
|
default, default, Variant.From("garbage-1"))));
|
|
await fake.QuiesceAsync();
|
|
|
|
// Pump still alive — a second notification is delivered.
|
|
fake.Push(new EventNotification(
|
|
null,
|
|
ArrayOf.Wrapped(
|
|
default, default, Variant.From("garbage-2"))));
|
|
await fake.QuiesceAsync();
|
|
|
|
Assert.That(raised, Is.EqualTo(2));
|
|
Assert.That(tracker.IsTracking, Is.True);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fake streaming subscription that exposes a deterministic
|
|
/// <see cref="EventNotification"/> channel for tests. Each call
|
|
/// to <see cref="SubscribeEventsAsync"/> increments
|
|
/// <see cref="SubscribeCallCount"/>, signals
|
|
/// <see cref="WaitForSubscribeAsync"/>, and then yields every
|
|
/// notification pushed via <see cref="Push"/>. The enumerator
|
|
/// completes when <see cref="Complete"/> is called or the
|
|
/// supplied cancellation token fires.
|
|
/// </summary>
|
|
private sealed class FakeStreamingSubscription : IStreamingSubscription
|
|
{
|
|
private readonly Channel<EventNotification> m_channel =
|
|
Channel.CreateUnbounded<EventNotification>(
|
|
new UnboundedChannelOptions
|
|
{
|
|
SingleReader = true,
|
|
SingleWriter = false
|
|
});
|
|
|
|
private readonly TaskCompletionSource<bool> m_subscribed =
|
|
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
|
|
private int m_subscribeCallCount;
|
|
private int m_pumpCancellationObserved;
|
|
private int m_pushed;
|
|
private int m_handled;
|
|
|
|
public int SubscribeCallCount => m_subscribeCallCount;
|
|
|
|
public bool PumpCancellationObserved =>
|
|
Volatile.Read(ref m_pumpCancellationObserved) != 0;
|
|
|
|
public void Push(EventNotification notification)
|
|
{
|
|
Interlocked.Increment(ref m_pushed);
|
|
m_channel.Writer.TryWrite(notification);
|
|
}
|
|
|
|
public void Complete()
|
|
{
|
|
m_channel.Writer.TryComplete();
|
|
}
|
|
|
|
public Task<bool> WaitForSubscribeAsync()
|
|
{
|
|
return m_subscribed.Task;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Spins briefly until every <see cref="Push"/>ed notification
|
|
/// has been observed by the production-code consumer. The
|
|
/// counter is incremented in the iterator <i>after</i> the
|
|
/// <c>yield return</c>, i.e. once the consumer's
|
|
/// <c>HandleNotification</c> call has returned and the
|
|
/// foreach loop has requested the next item.
|
|
/// </summary>
|
|
public async Task QuiesceAsync()
|
|
{
|
|
for (int i = 0; i < 400; i++)
|
|
{
|
|
if (Volatile.Read(ref m_handled) >= Volatile.Read(ref m_pushed))
|
|
{
|
|
return;
|
|
}
|
|
await Task.Delay(5).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
public async IAsyncEnumerable<EventNotification> SubscribeEventsAsync(
|
|
NodeId notifierId,
|
|
EventFilter filter,
|
|
MonitoringOptions? options = null,
|
|
[EnumeratorCancellation] CancellationToken ct = default)
|
|
{
|
|
Interlocked.Increment(ref m_subscribeCallCount);
|
|
m_subscribed.TrySetResult(true);
|
|
|
|
try
|
|
{
|
|
await foreach (EventNotification n in m_channel.Reader
|
|
.ReadAllAsync(ct).ConfigureAwait(false))
|
|
{
|
|
yield return n;
|
|
// Reached only after the consumer's
|
|
// HandleNotification returned and asked for the
|
|
// next item, so we can declare this push handled.
|
|
Interlocked.Increment(ref m_handled);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
if (ct.IsCancellationRequested)
|
|
{
|
|
Interlocked.Exchange(ref m_pumpCancellationObserved, 1);
|
|
}
|
|
}
|
|
}
|
|
|
|
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 ValueTask DisposeAsync()
|
|
{
|
|
Complete();
|
|
return default;
|
|
}
|
|
}
|
|
}
|
|
}
|