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

236 lines
9.4 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.Collections.Generic;
using NUnit.Framework;
using Opc.Ua.Core.TestFramework;
using Opc.Ua.Tests;
using ComplexStructure = Opc.Ua.Encoders.Structure;
namespace Opc.Ua.Client.ComplexTypes.Tests
{
/// <summary>
/// Encoder/decoder tests for default complex types.
/// Mirrors ComplexTypesEncoderTests from Opc.Ua.Client.ComplexTypes.Tests.
/// </summary>
[TestFixture]
[Category("DefaultComplexTypes")]
[Category("Encoder")]
[SetCulture("en-us")]
[SetUICulture("en-us")]
[Parallelizable]
public class DefaultComplexTypesEncoderTests : DefaultComplexTypesCommon
{
public IServiceMessageContext EncoderContext;
public new ITelemetryContext Telemetry;
public Dictionary<StructureType, (ExpandedNodeId, IEncodeableType)> TypeDictionary;
[OneTimeSetUp]
protected new void OneTimeSetUp()
{
Telemetry = NUnitTelemetryContext.Create();
EncoderContext = ServiceMessageContext.Create(Telemetry);
EncoderContext.NamespaceUris.Append("urn:This:is:my:test:encoder");
EncoderContext.NamespaceUris.Append("urn:This:is:another:namespace");
EncoderContext.NamespaceUris.Append(Namespaces.OpcUaEncoderTests);
TypeDictionary = [];
CreateComplexTypes(EncoderContext, TypeDictionary, string.Empty);
}
[OneTimeTearDown]
protected new void OneTimeTearDown()
{
}
[SetUp]
protected new void SetUp()
{
}
[TearDown]
protected new void TearDown()
{
}
/// <summary>
/// Verify encode and decode of a structured type.
/// </summary>
[Theory]
[Category("DefaultComplexTypes")]
public void ReEncodeComplexType(
[ValueSource(
nameof(EncodingTypesJsonBinaryXmlAndJsonCompact))] EncodingTypeGroup encoderTypeGroup,
MemoryStreamType memoryStreamType,
StructureType structureType)
{
EncodingType encoderType = encoderTypeGroup.EncoderType;
JsonEncodingType jsonEncodingType = encoderTypeGroup.JsonEncodingType;
bool useXmlParser = encoderTypeGroup.UseXmlParser;
(ExpandedNodeId nodeId, IEncodeableType encodeableType) = TypeDictionary[structureType];
IEncodeable instance = encodeableType.CreateInstance();
var structure = instance as ComplexStructure;
Assert.That(structure, Is.Not.Null);
FillStructWithValues(structure, true, NameSpaceUris);
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
structureType,
nodeId,
instance);
}
/// <summary>
/// Verify encode and decode of a Structure type with optional fields.
/// </summary>
[Theory]
[Category("DefaultComplexTypes")]
public void ReEncodeStructureWithOptionalFieldsComplexType(
[ValueSource(
nameof(EncodingTypesJsonBinaryXmlAndJsonCompact))] EncodingTypeGroup encoderTypeGroup,
MemoryStreamType memoryStreamType,
StructureFieldParameter structureFieldParameter)
{
EncodingType encoderType = encoderTypeGroup.EncoderType;
JsonEncodingType jsonEncodingType = encoderTypeGroup.JsonEncodingType;
bool useXmlParser = encoderTypeGroup.UseXmlParser;
(ExpandedNodeId nodeId, IEncodeableType encodeableType) =
TypeDictionary[StructureType.StructureWithOptionalFields];
IEncodeable instance = encodeableType.CreateInstance();
var structure = instance as ComplexStructure;
Assert.That(structure, Is.Not.Null);
TestContext.Out.WriteLine(
$"Optional Field: {structureFieldParameter.BuiltInType} is the only value.");
structure[structureFieldParameter.Name] =
DataGenerator.GetRandomVariant(structureFieldParameter.BuiltInType, false);
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
StructureType.StructureWithOptionalFields,
nodeId,
instance);
TestContext.Out.WriteLine(
$"Optional Field: {structureFieldParameter.BuiltInType} is null.");
structure[structureFieldParameter.Name] = default;
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
StructureType.StructureWithOptionalFields,
nodeId,
instance);
TestContext.Out.WriteLine(
$"Optional Field: {structureFieldParameter.BuiltInType} is null, all other fields have random values.");
FillStructWithValues(structure, true, NameSpaceUris);
structure[structureFieldParameter.Name] = default;
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
StructureType.StructureWithOptionalFields,
nodeId,
instance);
TestContext.Out.WriteLine(
$"Optional Field: {structureFieldParameter.BuiltInType} has random value.");
structure[structureFieldParameter.Name] =
DataGenerator.GetRandomVariant(structureFieldParameter.BuiltInType, false);
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
StructureType.StructureWithOptionalFields,
nodeId,
instance);
}
/// <summary>
/// Verify encode and decode of a Union type.
/// </summary>
[Theory]
[Category("DefaultComplexTypes")]
public void ReEncodeUnionComplexType(
[ValueSource(
nameof(EncodingTypesJsonBinaryXmlAndJsonCompact))] EncodingTypeGroup encoderTypeGroup,
MemoryStreamType memoryStreamType,
StructureFieldParameter structureFieldParameter)
{
EncodingType encoderType = encoderTypeGroup.EncoderType;
JsonEncodingType jsonEncodingType = encoderTypeGroup.JsonEncodingType;
bool useXmlParser = encoderTypeGroup.UseXmlParser;
(ExpandedNodeId nodeId, IEncodeableType encodeableType) =
TypeDictionary[StructureType.Union];
IEncodeable instance = encodeableType.CreateInstance();
var structure = instance as ComplexStructure;
Assert.That(structure, Is.Not.Null);
TestContext.Out.WriteLine(
$"Union Field: {structureFieldParameter.BuiltInType} is random.");
structure[structureFieldParameter.Name] =
DataGenerator.GetRandomVariant(structureFieldParameter.BuiltInType, false);
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
StructureType.Union,
nodeId,
instance);
TestContext.Out.WriteLine(
$"Union Field: {structureFieldParameter.BuiltInType} is null.");
structure[structureFieldParameter.Name] = default;
EncodeDecodeComplexType(
EncoderContext,
memoryStreamType,
encoderType,
jsonEncodingType,
useXmlParser,
StructureType.Union,
nodeId,
instance);
}
}
}