mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +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>
271 lines
11 KiB
C#
271 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 NUnit.Framework;
|
|
|
|
namespace Opc.Ua.Core.Tests.Stack.Client
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for <see cref="EventRecordDecoderRegistry"/> covering
|
|
/// the registration semantics, dispatch routing, composed
|
|
/// <c>StandardFields</c>, child-scope inheritance, and super-type
|
|
/// fallback walk.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Core")]
|
|
[Category("EventRecord")]
|
|
[Parallelizable]
|
|
public sealed class EventRecordDecoderRegistryTests
|
|
{
|
|
[Test]
|
|
public void TryRegisterReturnsTrueForNewEntry()
|
|
{
|
|
var registry = new EventRecordDecoderRegistry();
|
|
|
|
bool added = registry.TryRegister(
|
|
eventTypeId: ObjectTypeIds.BaseEventType,
|
|
standardFields: BaseEventTypeRecord.Decoder.StandardFields,
|
|
decode: BaseEventTypeRecord.Decoder.Decode);
|
|
|
|
Assert.That(added, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void TryRegisterReturnsFalseForDuplicate()
|
|
{
|
|
var registry = new EventRecordDecoderRegistry();
|
|
registry.TryRegister(
|
|
ObjectTypeIds.BaseEventType,
|
|
BaseEventTypeRecord.Decoder.StandardFields,
|
|
BaseEventTypeRecord.Decoder.Decode);
|
|
|
|
bool added = registry.TryRegister(
|
|
ObjectTypeIds.BaseEventType,
|
|
BaseEventTypeRecord.Decoder.StandardFields,
|
|
BaseEventTypeRecord.Decoder.Decode);
|
|
|
|
Assert.That(added, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void RegisterThrowsForDuplicate()
|
|
{
|
|
var registry = new EventRecordDecoderRegistry();
|
|
registry.Register(
|
|
ObjectTypeIds.BaseEventType,
|
|
BaseEventTypeRecord.Decoder.StandardFields,
|
|
BaseEventTypeRecord.Decoder.Decode);
|
|
|
|
Assert.That(() => registry.Register(
|
|
ObjectTypeIds.BaseEventType,
|
|
BaseEventTypeRecord.Decoder.StandardFields,
|
|
BaseEventTypeRecord.Decoder.Decode),
|
|
Throws.InvalidOperationException);
|
|
}
|
|
|
|
[Test]
|
|
public void DefaultRegistryDecodesBaseEventTypeRecord()
|
|
{
|
|
EventRecordDecoderRegistry registry = EventRecordDecoderRegistry.Default;
|
|
|
|
// Default ships with the standard UA model pre-registered.
|
|
// A fields array with just the EventType pointing at
|
|
// BaseEventType should resolve to a BaseEventTypeRecord.
|
|
int eventTypePosition = FindEventTypeIndex(registry.StandardFields);
|
|
Assert.That(eventTypePosition, Is.GreaterThanOrEqualTo(0),
|
|
"Default registry must expose the EventType browse path "
|
|
+ "for filter construction.");
|
|
|
|
var fields = new Variant[registry.StandardFields.Length];
|
|
fields[eventTypePosition] = Variant.From(ObjectTypeIds.BaseEventType);
|
|
|
|
EventRecord record = registry.Decode(fields);
|
|
|
|
Assert.That(record, Is.Not.Null);
|
|
Assert.That(record, Is.InstanceOf<BaseEventTypeRecord>());
|
|
}
|
|
|
|
[Test]
|
|
public void DecodeReturnsNullWhenFieldsEmpty()
|
|
{
|
|
EventRecordDecoderRegistry registry = EventRecordDecoderRegistry.Default;
|
|
Assert.That(registry.Decode([]), Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void ChildScopeInheritsParentRegistrations()
|
|
{
|
|
EventRecordDecoderRegistry parent = EventRecordDecoderRegistry.Default;
|
|
EventRecordDecoderRegistry child = parent.CreateChildScope();
|
|
|
|
// The child inherits the parent's registrations transparently
|
|
// — composed StandardFields contains every parent path.
|
|
Assert.That(child.StandardFields,
|
|
Has.Length.EqualTo(parent.StandardFields.Length));
|
|
|
|
// New registrations on the child do not affect the parent.
|
|
int parentCount = parent.StandardFields.Length;
|
|
child.TryRegister(
|
|
new NodeId(987654321u),
|
|
[[new QualifiedName("VendorField", 0)]],
|
|
_ => null);
|
|
Assert.That(child.StandardFields, Has.Length.GreaterThan(parentCount));
|
|
Assert.That(parent.StandardFields, Has.Length.EqualTo(parentCount),
|
|
"Child mutations must not leak into the parent scope.");
|
|
}
|
|
|
|
[Test]
|
|
public void DecodeAsWalksSuperTypeChain()
|
|
{
|
|
var registry = new EventRecordDecoderRegistry();
|
|
registry.TryRegister(
|
|
ObjectTypeIds.BaseEventType,
|
|
BaseEventTypeRecord.Decoder.StandardFields,
|
|
BaseEventTypeRecord.Decoder.Decode);
|
|
|
|
// Simulate a vendor event type the registry has never seen
|
|
// — the super-type resolver walks up to BaseEventType which
|
|
// IS registered.
|
|
var unknownVendor = new NodeId(42u, 5);
|
|
registry.SuperTypeResolver = current =>
|
|
current == unknownVendor ? ObjectTypeIds.BaseEventType : null;
|
|
|
|
EventRecord record = registry.DecodeAs(
|
|
unknownVendor,
|
|
[default, Variant.From(unknownVendor)]);
|
|
|
|
Assert.That(record, Is.InstanceOf<BaseEventTypeRecord>());
|
|
}
|
|
|
|
[Test]
|
|
public void DecodeAsReturnsNullWhenNoAncestorRegistered()
|
|
{
|
|
var registry = new EventRecordDecoderRegistry();
|
|
var unknownType = new NodeId(987u, 7);
|
|
|
|
EventRecord record = registry.DecodeAs(unknownType, [Variant.From(1)]);
|
|
|
|
Assert.That(record, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void StandardFieldsContainsEventTypePath()
|
|
{
|
|
EventRecordDecoderRegistry registry = EventRecordDecoderRegistry.Default;
|
|
int eventTypeIndex = FindEventTypeIndex(registry.StandardFields);
|
|
|
|
Assert.That(eventTypeIndex, Is.GreaterThanOrEqualTo(0),
|
|
"EventType browse path must be present in the composed "
|
|
+ "StandardFields so the registry can route on it.");
|
|
}
|
|
|
|
[Test]
|
|
public void TryRegisterThrowsForNullEventTypeId()
|
|
{
|
|
var registry = new EventRecordDecoderRegistry();
|
|
Assert.That(() => registry.TryRegister(
|
|
NodeId.Null,
|
|
BaseEventTypeRecord.Decoder.StandardFields,
|
|
BaseEventTypeRecord.Decoder.Decode),
|
|
Throws.ArgumentException);
|
|
}
|
|
|
|
[Test]
|
|
public void DecodeRemapsCallerFieldsToDecoderLocalLayout()
|
|
{
|
|
// Build a registry with two distinct decoders. The composed
|
|
// StandardFields contains both layouts deduplicated, with
|
|
// positions different from each decoder's local layout. The
|
|
// registry must remap before invoking the decoder.
|
|
EventRecordDecoderRegistry registry = EventRecordDecoderRegistry.Default;
|
|
|
|
QualifiedName[][] composed = registry.StandardFields;
|
|
int eventTypePosition = FindEventTypeIndex(composed);
|
|
int severityPosition = FindPath(composed, BrowseNames.Severity);
|
|
Assert.That(eventTypePosition, Is.GreaterThanOrEqualTo(0));
|
|
Assert.That(severityPosition, Is.GreaterThanOrEqualTo(0));
|
|
|
|
var fields = new Variant[composed.Length];
|
|
fields[eventTypePosition] = Variant.From(ObjectTypeIds.BaseEventType);
|
|
fields[severityPosition] = Variant.From((ushort)999);
|
|
|
|
EventRecord record = registry.Decode(fields);
|
|
|
|
Assert.That(record, Is.InstanceOf<BaseEventTypeRecord>());
|
|
var baseRecord = (BaseEventTypeRecord)record;
|
|
Assert.That(baseRecord.Severity, Is.EqualTo((ushort)999),
|
|
"Registry must remap composed-layout fields to each "
|
|
+ "decoder's local positional layout before decoding.");
|
|
}
|
|
|
|
[Test]
|
|
public void DecodeReturnsNullForExplicitNullEventTypeField()
|
|
{
|
|
EventRecordDecoderRegistry registry = EventRecordDecoderRegistry.Default;
|
|
int eventTypePosition = FindEventTypeIndex(registry.StandardFields);
|
|
|
|
var fields = new Variant[registry.StandardFields.Length];
|
|
fields[eventTypePosition] = Variant.From(NodeId.Null);
|
|
|
|
EventRecord record = registry.Decode(fields);
|
|
|
|
Assert.That(record, Is.Null);
|
|
}
|
|
|
|
private static int FindPath(QualifiedName[][] standardFields, string browseName)
|
|
{
|
|
for (int i = 0; i < standardFields.Length; i++)
|
|
{
|
|
QualifiedName[] path = standardFields[i];
|
|
if (path.Length == 1 &&
|
|
path[0].NamespaceIndex == 0 &&
|
|
path[0].Name == browseName)
|
|
{
|
|
return i;
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
private static int FindEventTypeIndex(QualifiedName[][] standardFields)
|
|
{
|
|
for (int i = 0; i < standardFields.Length; i++)
|
|
{
|
|
QualifiedName[] path = standardFields[i];
|
|
if (path.Length == 1 &&
|
|
path[0].NamespaceIndex == 0 &&
|
|
path[0].Name == BrowseNames.EventType)
|
|
{
|
|
return i;
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
}
|
|
}
|