Files
Marc Schier 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

283 lines
11 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 BenchmarkDotNet.Attributes;
using NUnit.Framework;
using Opc.Ua.Client.TestFramework;
using Opc.Ua.Server.TestFramework;
using Quickstarts.ReferenceServer;
namespace Opc.Ua.Client.ComplexTypes.Tests
{
/// <summary>
/// Data dictionary load tests
/// </summary>
public class DataDictionaryTests : ClientTestFramework
{
public const int MaxByteStringLengthForTest = 4096;
public DataDictionaryTests()
: base(Utils.UriSchemeOpcTcp)
{
}
public DataDictionaryTests(string uriScheme = Utils.UriSchemeOpcTcp)
: base(uriScheme)
{
}
/// <summary>
/// Set up a Server and a Client instance.
/// </summary>
[OneTimeSetUp]
public override Task OneTimeSetUpAsync()
{
SupportsExternalServerUrl = true;
return base.OneTimeSetUpAsync();
}
/// <summary>
/// Tear down the Server and the Client.
/// </summary>
[OneTimeTearDown]
public override Task OneTimeTearDownAsync()
{
return base.OneTimeTearDownAsync();
}
/// <summary>
/// Test setup.
/// </summary>
[SetUp]
public override Task SetUpAsync()
{
return base.SetUpAsync();
}
public override async Task CreateReferenceServerFixtureAsync(
bool enableTracing,
bool disableActivityLogging,
bool securityNone)
{
// start Ref server
ServerFixture = new ServerFixture<ReferenceServer>(
t => new ReferenceServer(t),
enableTracing,
disableActivityLogging)
{
UriScheme = UriScheme,
SecurityNone = securityNone,
AutoAccept = true,
AllNodeManagers = true,
OperationLimits = true
};
await ServerFixture.LoadConfigurationAsync(PkiRoot).ConfigureAwait(false);
ServerFixture.Config.TransportQuotas.MaxMessageSize = TransportQuotaMaxMessageSize;
ServerFixture.Config.TransportQuotas.MaxByteStringLength = MaxByteStringLengthForTest;
ServerFixture.Config.TransportQuotas.MaxStringLength = TransportQuotaMaxStringLength;
ServerFixture.Config.ServerConfiguration.UserTokenPolicies +=
new UserTokenPolicy(UserTokenType.UserName);
ServerFixture.Config.ServerConfiguration.UserTokenPolicies +=
new UserTokenPolicy(UserTokenType.Certificate);
ServerFixture.Config.ServerConfiguration.UserTokenPolicies +=
new UserTokenPolicy(UserTokenType.IssuedToken)
{
IssuedTokenType = Profiles.JwtUserToken
};
ReferenceServer = await ServerFixture.StartAsync()
.ConfigureAwait(false);
ReferenceServer.TokenValidator = TokenValidator;
ServerFixturePort = ServerFixture.Port;
}
/// <summary>
/// Test teardown.
/// </summary>
[TearDown]
public override Task TearDownAsync()
{
return base.TearDownAsync();
}
/// <summary>
/// Global Setup for benchmarks.
/// </summary>
[GlobalSetup]
public override void GlobalSetup()
{
base.GlobalSetup();
}
/// <summary>
/// Global cleanup for benchmarks.
/// </summary>
[GlobalCleanup]
public override void GlobalCleanup()
{
base.GlobalCleanup();
}
[Test]
[Order(100)]
public async Task ReadDictionaryByteStringAsync()
{
var dictionaryIds = new List<NodeId> {
VariableIds.OpcUa_BinarySchema,
await GetTestDataDictionaryNodeIdAsync().ConfigureAwait(false) };
ISession theSession = Session;
foreach (NodeId dataDictionaryId in dictionaryIds)
{
var referenceDescription = new ReferenceDescription
{
NodeId = NodeId.ToExpandedNodeId(
dataDictionaryId,
theSession.NodeCache.NamespaceUris)
};
// make sure the dictionary is too large to fit in a single message
var readValueId = new ReadValueId
{
NodeId = dataDictionaryId,
AttributeId = Attributes.Value,
IndexRange = null,
DataEncoding = default
};
ArrayOf<ReadValueId> nodesToRead = [readValueId];
ServiceResultException x = Assert.ThrowsAsync<ServiceResultException>(async () =>
await theSession.ReadAsync(
null,
0,
TimestampsToReturn.Neither,
nodesToRead,
default).ConfigureAwait(false));
Assert.That(x.StatusCode, Is.EqualTo(StatusCodes.BadEncodingLimitsExceeded));
// now ensure we get the dictionary in chunks
DataDictionary dictionary = await LoadDataDictionaryAsync(
theSession,
referenceDescription).ConfigureAwait(false);
Assert.That(dictionary, Is.Not.Null);
// Sanity checks: verify that some well-known information is present
Assert.That(dictionary.TypeSystemName, Is.EqualTo("OPC Binary"));
if (dataDictionaryId == dictionaryIds[0])
{
Assert.That(dictionary.DataTypes, Has.Count.GreaterThan(160));
Assert.That(
dictionary.DataTypes.ContainsKey(VariableIds.OpcUa_BinarySchema_Union),
Is.True);
Assert.That(
dictionary.DataTypes.ContainsKey(VariableIds.OpcUa_BinarySchema_OptionSet),
Is.True);
Assert.That(
dictionary.TypeDictionary.TargetNamespace,
Is.EqualTo("http://opcfoundation.org/UA/"));
}
else if (dataDictionaryId == dictionaryIds[1])
{
Assert.That(dictionary.DataTypes, Has.Count.GreaterThanOrEqualTo(10));
Assert.That(
dictionary.TypeDictionary.TargetNamespace,
Is.EqualTo("http://test.org/UA/Data/"));
}
}
}
/// <summary>
/// Load the data dictionary from the server.
/// </summary>
private Task<DataDictionary> LoadDataDictionaryAsync(
ISession session,
ReferenceDescription dictionaryNode,
CancellationToken ct = default)
{
// check if the dictionary has already been loaded.
var dictionaryId = ExpandedNodeId.ToNodeId(
dictionaryNode.NodeId,
session.NamespaceUris);
var nodeCacheResolver = new NodeCacheResolver(session, Telemetry);
// load the dictionary.
return nodeCacheResolver.LoadDictionaryAsync(dictionaryId, dictionaryNode.ToString(), ct);
}
/// <summary>
/// retrieve the node id of the test data dictionary without relying on
/// hard coded identifiers
/// </summary>
/// <exception cref="InvalidOperationException"></exception>
private async Task<NodeId> GetTestDataDictionaryNodeIdAsync(CancellationToken ct = default)
{
var browseDescription = new BrowseDescription
{
NodeId = ObjectIds.OPCBinarySchema_TypeSystem,
BrowseDirection = BrowseDirection.Forward,
ReferenceTypeId = ReferenceTypeIds.HasComponent,
IncludeSubtypes = true,
NodeClassMask = (uint)NodeClass.Variable,
ResultMask = (uint)BrowseResultMask.All
};
ArrayOf<BrowseDescription> browseDescriptions = [browseDescription];
Assert.That(Session, Is.Not.Null, "Client not connected to Server.");
BrowseResponse response = await Session.BrowseAsync(
null,
null,
0,
browseDescriptions,
ct).ConfigureAwait(false);
ArrayOf<BrowseResult> results = response.Results;
ArrayOf<DiagnosticInfo> diagnosticInfos = response.DiagnosticInfos;
if (results[0] == null || results[0].StatusCode != StatusCodes.Good)
{
throw new InvalidOperationException("cannot read the id of the test dictionary");
}
ReferenceDescription referenceDescription = results[0]
.References.Find(a => a.BrowseName.Name == "TestData");
Assert.That(referenceDescription, Is.Not.Null, "cannot find the test dictionary node");
return ExpandedNodeId.ToNodeId(referenceDescription.NodeId, Session.NamespaceUris);
}
}
}