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>
339 lines
13 KiB
C#
339 lines
13 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.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Di.Server;
|
|
using Opc.Ua.Di.Server.Hosting;
|
|
using Opc.Ua.Server;
|
|
using Opc.Ua.Server.Hosting;
|
|
|
|
namespace Opc.Ua.Di.Tests
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for the DI server hosting integration
|
|
/// (<c>AddOpcUaDi</c>, <c>ConfigureDevicesFor</c>,
|
|
/// <see cref="DiPostSetupRunner"/>). These tests exercise the
|
|
/// service-collection registrations and the runner orchestration
|
|
/// without booting a full hosted server — see
|
|
/// <see cref="DeviceBuilderTests"/> for end-to-end coverage.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("DI")]
|
|
[Category("Hosting")]
|
|
public sealed class HostingIntegrationTests
|
|
{
|
|
private static readonly int[] s_expectedConfigOrder = [1, 2, 3];
|
|
|
|
// ---------------------------------------------------------------
|
|
// Service registration
|
|
// ---------------------------------------------------------------
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersDiNodeManagerFactory()
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; })
|
|
.AddOpcUaDi();
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
var factory = provider.GetService<DiNodeManagerFactory>();
|
|
Assert.That(factory, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersPostSetupRunner()
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; })
|
|
.AddOpcUaDi();
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
var runner = provider.GetService<IDiPostSetupRunner>();
|
|
Assert.That(runner, Is.Not.Null);
|
|
Assert.That(runner, Is.InstanceOf<DiPostSetupRunner>());
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiCalledTwiceThrows()
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
IOpcUaServerBuilder serverBuilder = services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; });
|
|
|
|
serverBuilder.AddOpcUaDi();
|
|
|
|
InvalidOperationException ex = Assert.Throws<InvalidOperationException>(
|
|
() => serverBuilder.AddOpcUaDi())!;
|
|
Assert.That(ex.Message, Does.Contain("AddOpcUaDi has already been called"));
|
|
}
|
|
|
|
[Test]
|
|
public void ConfigureDevicesForRegistersConfigurator()
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; })
|
|
.ConfigureDevicesFor<DiNodeManager>(_ => { });
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
IEnumerable<IDiPostSetupConfigurator> configurators =
|
|
provider.GetServices<IDiPostSetupConfigurator>();
|
|
|
|
Assert.That(configurators, Has.Exactly(1).Items);
|
|
Assert.That(
|
|
System.Linq.Enumerable.First(configurators).TargetManagerType,
|
|
Is.EqualTo(typeof(DiNodeManager)));
|
|
}
|
|
|
|
[Test]
|
|
public void MultipleConfigureDevicesForCallsAccumulate()
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; })
|
|
.ConfigureDevicesFor<DiNodeManager>(_ => { })
|
|
.ConfigureDevicesFor<DiNodeManager>(_ => { });
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
IEnumerable<IDiPostSetupConfigurator> configurators =
|
|
provider.GetServices<IDiPostSetupConfigurator>();
|
|
|
|
Assert.That(configurators, Has.Exactly(2).Items);
|
|
}
|
|
|
|
// ---------------------------------------------------------------
|
|
// Runner orchestration
|
|
// ---------------------------------------------------------------
|
|
|
|
[Test]
|
|
public async Task RunnerInvokesMatchingConfiguratorsInOrder()
|
|
{
|
|
DiServerFixture fixture = new DiServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
try
|
|
{
|
|
var calls = new List<int>();
|
|
DiPostSetupRunner runner = BuildRunner(
|
|
Configurator(typeof(DiNodeManager), _ => { calls.Add(1); return default; }),
|
|
Configurator(typeof(DiNodeManager), _ => { calls.Add(2); return default; }),
|
|
Configurator(typeof(DiNodeManager), _ => { calls.Add(3); return default; }));
|
|
|
|
await runner.RunAsync(fixture.Manager, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(calls, Is.EqualTo(s_expectedConfigOrder));
|
|
}
|
|
finally
|
|
{
|
|
await fixture.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task RunnerFiltersByTargetManagerType()
|
|
{
|
|
DiServerFixture fixture = new DiServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
try
|
|
{
|
|
bool diRan = false;
|
|
bool unrelatedRan = false;
|
|
DiPostSetupRunner runner = BuildRunner(
|
|
Configurator(typeof(DiNodeManager), _ => { diRan = true; return default; }),
|
|
Configurator(
|
|
typeof(UnrelatedSubclass),
|
|
_ => { unrelatedRan = true; return default; }));
|
|
|
|
await runner.RunAsync(fixture.Manager, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(diRan, Is.True);
|
|
Assert.That(unrelatedRan, Is.False,
|
|
"Configurator targeting an unrelated subclass should not run.");
|
|
}
|
|
finally
|
|
{
|
|
await fixture.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task RunnerPropagatesConfiguratorException()
|
|
{
|
|
DiServerFixture fixture = new DiServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
try
|
|
{
|
|
DiPostSetupRunner runner = BuildRunner(
|
|
Configurator(typeof(DiNodeManager), _ =>
|
|
throw new InvalidOperationException("boom")));
|
|
|
|
InvalidOperationException ex = Assert.ThrowsAsync<InvalidOperationException>(
|
|
async () => await runner.RunAsync(
|
|
fixture.Manager, CancellationToken.None).ConfigureAwait(false))!;
|
|
|
|
Assert.That(ex.Message, Does.Contain("DI post-setup configurator"));
|
|
Assert.That(ex.InnerException, Is.Not.Null);
|
|
Assert.That(ex.InnerException!.Message, Is.EqualTo("boom"));
|
|
}
|
|
finally
|
|
{
|
|
await fixture.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task ConfigureDevicesForRunsConfiguratorOnDiNodeManager()
|
|
{
|
|
DiServerFixture fixture = new DiServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
try
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
bool wasCalled = false;
|
|
services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; })
|
|
.ConfigureDevicesFor<DiNodeManager>(ctx =>
|
|
{
|
|
wasCalled = true;
|
|
Assert.That(ctx.Manager, Is.SameAs(fixture.Manager));
|
|
});
|
|
services.AddSingleton<IDiPostSetupRunner, DiPostSetupRunner>();
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
IDiPostSetupRunner runner = provider.GetRequiredService<IDiPostSetupRunner>();
|
|
|
|
await runner.RunAsync(fixture.Manager, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(wasCalled, Is.True);
|
|
}
|
|
finally
|
|
{
|
|
await fixture.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task ContextExposesNarrowGetRequiredService()
|
|
{
|
|
DiServerFixture fixture = new DiServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
try
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddSingleton<SomeApplicationService>();
|
|
services.AddOpcUa()
|
|
.AddServer(o => { o.ApplicationName = "test"; })
|
|
.ConfigureDevicesFor<DiNodeManager>(ctx =>
|
|
{
|
|
SomeApplicationService svc = ctx.GetRequiredService<SomeApplicationService>();
|
|
svc.Touched = true;
|
|
});
|
|
services.AddSingleton<IDiPostSetupRunner, DiPostSetupRunner>();
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
IDiPostSetupRunner runner = provider.GetRequiredService<IDiPostSetupRunner>();
|
|
SomeApplicationService svc =
|
|
provider.GetRequiredService<SomeApplicationService>();
|
|
|
|
await runner.RunAsync(fixture.Manager, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(svc.Touched, Is.True);
|
|
}
|
|
finally
|
|
{
|
|
await fixture.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------
|
|
// Test helpers
|
|
// ---------------------------------------------------------------
|
|
|
|
private static DiPostSetupRunner BuildRunner(params IDiPostSetupConfigurator[] configurators)
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
foreach (IDiPostSetupConfigurator c in configurators)
|
|
{
|
|
services.AddSingleton(c);
|
|
}
|
|
ServiceProvider sp = services.BuildServiceProvider();
|
|
return new DiPostSetupRunner(sp, sp.GetServices<IDiPostSetupConfigurator>());
|
|
}
|
|
|
|
private static InlineConfigurator Configurator(
|
|
Type target,
|
|
Func<IDiPostSetupContext, ValueTask> run)
|
|
=> new InlineConfigurator(target, run);
|
|
|
|
private sealed class InlineConfigurator : IDiPostSetupConfigurator
|
|
{
|
|
private readonly Func<IDiPostSetupContext, ValueTask> m_run;
|
|
|
|
public InlineConfigurator(Type target, Func<IDiPostSetupContext, ValueTask> run)
|
|
{
|
|
TargetManagerType = target;
|
|
m_run = run;
|
|
}
|
|
|
|
public Type TargetManagerType { get; }
|
|
|
|
public ValueTask RunAsync(IDiPostSetupContext context) => m_run(context);
|
|
}
|
|
|
|
// Dummy subclass used to verify TargetManagerType filtering.
|
|
// Referenced only via typeof(); never instantiated, hence CA1812.
|
|
#pragma warning disable CA1812
|
|
private sealed class UnrelatedSubclass : DiNodeManager
|
|
{
|
|
private UnrelatedSubclass(IServerInternal s, ApplicationConfiguration c)
|
|
: base(s, c) { }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Activated by Microsoft.Extensions.DependencyInjection.AddSingleton;
|
|
/// the analyzer doesn't see runtime DI activation, hence CA1812.
|
|
/// </summary>
|
|
private sealed class SomeApplicationService
|
|
{
|
|
public bool Touched { get; set; }
|
|
}
|
|
#pragma warning restore CA1812
|
|
}
|
|
}
|