mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 07:07:24 +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>
280 lines
12 KiB
C#
280 lines
12 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
|
|
|
|
#pragma warning disable CA2016
|
|
|
|
using System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
|
|
using Opc.Ua.Client.TestFramework;
|
|
|
|
namespace Opc.Ua.Subscriptions.Tests
|
|
{
|
|
/// <summary>
|
|
/// V2 failover-style transfer tests. Force a transport channel
|
|
/// break and verify the subscription survives — either via
|
|
/// <see cref="ISubscriptionManager.TransferSubscriptionsOnRecreate"/>
|
|
/// (server kept the subscription) or via the V2 manager's
|
|
/// internal recreate fallback (server discarded). Both outcomes
|
|
/// must result in the subscription continuing to deliver data.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("V2")]
|
|
[Category("Failover")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
public class SubscriptionFailoverTests : ClientTestFramework
|
|
{
|
|
[OneTimeSetUp]
|
|
public override Task OneTimeSetUpAsync()
|
|
{
|
|
SupportsExternalServerUrl = true;
|
|
SingleSession = false;
|
|
return OneTimeSetUpCoreAsync(securityNone: true);
|
|
}
|
|
|
|
[OneTimeTearDown]
|
|
public override Task OneTimeTearDownAsync()
|
|
{
|
|
return base.OneTimeTearDownAsync();
|
|
}
|
|
|
|
[SetUp]
|
|
public override Task SetUpAsync()
|
|
{
|
|
return base.SetUpAsync();
|
|
}
|
|
|
|
[TearDown]
|
|
public override Task TearDownAsync()
|
|
{
|
|
return base.TearDownAsync();
|
|
}
|
|
|
|
[Test]
|
|
[Order(100)]
|
|
[CancelAfter(120_000)]
|
|
public async Task FailoverChannelBreakWithTransferOnRecreateV2Async(
|
|
CancellationToken ct)
|
|
{
|
|
ManagedSession session = await ConnectFailoverAsync(
|
|
nameof(FailoverChannelBreakWithTransferOnRecreateV2Async),
|
|
transferOnRecreate: true, ct).ConfigureAwait(false);
|
|
try
|
|
{
|
|
var handler = new RecordingSubscriptionHandler();
|
|
ISubscription sub = session.AddSubscription(handler,
|
|
new Client.Subscriptions.SubscriptionOptions
|
|
{
|
|
PublishingInterval = TimeSpan.FromMilliseconds(500),
|
|
KeepAliveCount = 10,
|
|
LifetimeCount = 100,
|
|
PublishingEnabled = true
|
|
});
|
|
bool created = await WaitForAsync(() => sub.Created,
|
|
TimeSpan.FromSeconds(15), ct).ConfigureAwait(false);
|
|
Assert.That(created, Is.True);
|
|
Assert.That(sub.TryAddMonitoredItem(
|
|
"Time",
|
|
VariableIds.Server_ServerStatus_CurrentTime,
|
|
o => o with { SamplingInterval = TimeSpan.FromMilliseconds(250) },
|
|
out _), Is.True);
|
|
|
|
bool firstData = await handler.WaitForFirstDataAsync(
|
|
TimeSpan.FromSeconds(15), ct).ConfigureAwait(false);
|
|
Assert.That(firstData, Is.True);
|
|
|
|
// Force channel break. The V2 manager + ManagedSession
|
|
// reconnect logic must restore the channel and then
|
|
// run TransferSubscriptions (with recreate fallback if
|
|
// the server has discarded the subscription).
|
|
int preCount = handler.DataChangeCount;
|
|
ITransportChannel? channel = session.InnerSession?.TransportChannel;
|
|
if (channel == null)
|
|
{
|
|
Assert.Inconclusive(
|
|
"InnerSession.TransportChannel is null; cannot force channel break.");
|
|
return;
|
|
}
|
|
TestContext.Out.WriteLine(
|
|
"Closing transport channel to force V2 transfer/recreate…");
|
|
channel.Dispose();
|
|
|
|
bool reconnected = await WaitForAsync(
|
|
() => session.Connected,
|
|
TimeSpan.FromSeconds(60), ct).ConfigureAwait(false);
|
|
Assert.That(reconnected, Is.True,
|
|
"Session must auto-reconnect after channel loss.");
|
|
|
|
bool subStillCreated = await WaitForAsync(
|
|
() => sub.Created, TimeSpan.FromSeconds(30), ct)
|
|
.ConfigureAwait(false);
|
|
Assert.That(subStillCreated, Is.True,
|
|
"Subscription must remain Created after the V2 " +
|
|
"TransferSubscriptions / recreate fallback path.");
|
|
|
|
// Either transfer succeeded (same ServerId) or the V2
|
|
// manager re-created the subscription (possibly with a
|
|
// new ServerId). Either way: new data must flow.
|
|
bool postData = await WaitForAsync(
|
|
() => handler.DataChangeCount > preCount,
|
|
TimeSpan.FromSeconds(30), ct).ConfigureAwait(false);
|
|
Assert.That(postData, Is.True,
|
|
"Subscription must continue to deliver data after the " +
|
|
"failover (TransferSubscriptions succeeded or recreate fallback ran).");
|
|
|
|
await sub.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
finally
|
|
{
|
|
try
|
|
{ await session.CloseAsync().ConfigureAwait(false); }
|
|
catch { /* best effort */ }
|
|
try
|
|
{ await session.DisposeAsync().ConfigureAwait(false); }
|
|
catch { /* best effort */ }
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
[Order(200)]
|
|
[CancelAfter(120_000)]
|
|
public async Task FailoverChannelBreakWithoutTransferOnRecreateV2Async(
|
|
CancellationToken ct)
|
|
{
|
|
// With TransferSubscriptionsOnRecreate=false the V2 manager
|
|
// does NOT call TransferSubscriptions after a reconnect.
|
|
// The server-side subscription, however, survives the
|
|
// transport-level reconnect because the inner Session keeps
|
|
// its SessionId. So this configuration must also continue
|
|
// to deliver data without the explicit transfer call.
|
|
ManagedSession session = await ConnectFailoverAsync(
|
|
nameof(FailoverChannelBreakWithoutTransferOnRecreateV2Async),
|
|
transferOnRecreate: false, ct).ConfigureAwait(false);
|
|
try
|
|
{
|
|
var handler = new RecordingSubscriptionHandler();
|
|
ISubscription sub = session.AddSubscription(handler,
|
|
new Client.Subscriptions.SubscriptionOptions
|
|
{
|
|
PublishingInterval = TimeSpan.FromMilliseconds(500),
|
|
KeepAliveCount = 10,
|
|
LifetimeCount = 100,
|
|
PublishingEnabled = true
|
|
});
|
|
Assert.That(await WaitForAsync(() => sub.Created,
|
|
TimeSpan.FromSeconds(15), ct).ConfigureAwait(false), Is.True);
|
|
Assert.That(sub.TryAddMonitoredItem(
|
|
"Time",
|
|
VariableIds.Server_ServerStatus_CurrentTime,
|
|
o => o with { SamplingInterval = TimeSpan.FromMilliseconds(250) },
|
|
out _), Is.True);
|
|
Assert.That(await handler.WaitForFirstDataAsync(
|
|
TimeSpan.FromSeconds(15), ct).ConfigureAwait(false), Is.True);
|
|
|
|
uint preServerId = ((Client.Subscriptions.Subscription)sub).ServerId;
|
|
int preCount = handler.DataChangeCount;
|
|
ITransportChannel? channel = session.InnerSession?.TransportChannel;
|
|
if (channel == null)
|
|
{
|
|
Assert.Inconclusive(
|
|
"InnerSession.TransportChannel is null; cannot force channel break.");
|
|
return;
|
|
}
|
|
TestContext.Out.WriteLine(
|
|
"Closing transport channel — no TransferSubscriptions on recreate…");
|
|
channel.Dispose();
|
|
|
|
Assert.That(await WaitForAsync(() => session.Connected,
|
|
TimeSpan.FromSeconds(60), ct).ConfigureAwait(false), Is.True);
|
|
Assert.That(await WaitForAsync(() => sub.Created,
|
|
TimeSpan.FromSeconds(30), ct).ConfigureAwait(false), Is.True);
|
|
Assert.That(await WaitForAsync(
|
|
() => handler.DataChangeCount > preCount,
|
|
TimeSpan.FromSeconds(30), ct).ConfigureAwait(false), Is.True,
|
|
"Subscription must continue to deliver after channel reconnect");
|
|
Assert.That(((Client.Subscriptions.Subscription)sub).ServerId, Is.EqualTo(preServerId),
|
|
"Without TransferSubscriptions on recreate, the server-side " +
|
|
"ServerId should be preserved across a transport-level reconnect.");
|
|
|
|
await sub.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
finally
|
|
{
|
|
try
|
|
{ await session.CloseAsync().ConfigureAwait(false); }
|
|
catch { /* best effort */ }
|
|
try
|
|
{ await session.DisposeAsync().ConfigureAwait(false); }
|
|
catch { /* best effort */ }
|
|
}
|
|
}
|
|
|
|
private async Task<ManagedSession> ConnectFailoverAsync(
|
|
string sessionName, bool transferOnRecreate, CancellationToken ct)
|
|
{
|
|
ConfiguredEndpoint endpoint = await ClientFixture
|
|
.GetEndpointAsync(ServerUrl, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
ManagedSessionBuilder builder = new ManagedSessionBuilder(ClientFixture.Config, Telemetry)
|
|
.UseEndpoint(endpoint)
|
|
.WithSessionName(sessionName)
|
|
.WithSessionTimeout(TimeSpan.FromSeconds(120));
|
|
if (transferOnRecreate)
|
|
{
|
|
builder = builder.WithTransferSubscriptionsOnRecreate();
|
|
}
|
|
return await builder.ConnectAsync(ct).ConfigureAwait(false);
|
|
}
|
|
|
|
private static async Task<bool> WaitForAsync(
|
|
Func<bool> predicate, TimeSpan timeout, CancellationToken ct)
|
|
{
|
|
DateTime deadline = DateTime.UtcNow + timeout;
|
|
while (DateTime.UtcNow < deadline)
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
if (predicate())
|
|
{
|
|
return true;
|
|
}
|
|
await Task.Delay(50, ct).ConfigureAwait(false);
|
|
}
|
|
return predicate();
|
|
}
|
|
}
|
|
}
|