mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 04:59:55 +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>
407 lines
15 KiB
C#
407 lines
15 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 Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.Fluent;
|
|
|
|
#nullable enable
|
|
#pragma warning disable CA2000
|
|
|
|
namespace Opc.Ua.Server.Tests.Fluent
|
|
{
|
|
/// <summary>
|
|
/// Tests for <see cref="ReferenceBuilderExtensions"/> — fluent
|
|
/// <c>Organizes</c> / <c>HasComponent</c> / <c>AddReference</c> /
|
|
/// <c>AddObject</c> helpers.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Fluent")]
|
|
public class ReferenceBuilderExtensionsTests
|
|
{
|
|
private const ushort kNs = 2;
|
|
|
|
private static SystemContext CreateContext()
|
|
{
|
|
var ns = new NamespaceTable();
|
|
ns.Append(Ua.Namespaces.OpcUa);
|
|
return new SystemContext(telemetry: null!)
|
|
{
|
|
NamespaceUris = ns
|
|
};
|
|
}
|
|
|
|
private static (NodeManagerBuilder Builder, BaseObjectState Root,
|
|
BaseDataVariableState Target1, BaseDataVariableState Target2)
|
|
CreateBuilder()
|
|
{
|
|
SystemContext ctx = CreateContext();
|
|
|
|
var root = new BaseObjectState(parent: null)
|
|
{
|
|
NodeId = new NodeId("Root", kNs),
|
|
BrowseName = new QualifiedName("Root", kNs),
|
|
DisplayName = new LocalizedText("Root")
|
|
};
|
|
|
|
var target1 = new BaseDataVariableState(parent: null)
|
|
{
|
|
NodeId = new NodeId("Target1", kNs),
|
|
BrowseName = new QualifiedName("Target1", kNs),
|
|
DisplayName = new LocalizedText("Target1"),
|
|
DataType = DataTypeIds.Int32,
|
|
ValueRank = ValueRanks.Scalar
|
|
};
|
|
|
|
var target2 = new BaseDataVariableState(parent: null)
|
|
{
|
|
NodeId = new NodeId("Target2", kNs),
|
|
BrowseName = new QualifiedName("Target2", kNs),
|
|
DisplayName = new LocalizedText("Target2"),
|
|
DataType = DataTypeIds.Int32,
|
|
ValueRank = ValueRanks.Scalar
|
|
};
|
|
|
|
var roots = new Dictionary<QualifiedName, NodeState> { [root.BrowseName] = root };
|
|
var byId = new Dictionary<NodeId, NodeState>
|
|
{
|
|
[root.NodeId] = root,
|
|
[target1.NodeId] = target1,
|
|
[target2.NodeId] = target2
|
|
};
|
|
|
|
var builder = new NodeManagerBuilder(
|
|
ctx,
|
|
nodeManager: Mock.Of<IAsyncNodeManager>(),
|
|
defaultNamespaceIndex: kNs,
|
|
rootResolver: q => roots.TryGetValue(q, out NodeState? n) ? n! : null!,
|
|
nodeIdResolver: id => byId.TryGetValue(id, out NodeState? n) ? n! : null!,
|
|
typeIdResolver: _ => []);
|
|
|
|
return (builder, root, target1, target2);
|
|
}
|
|
|
|
[Test]
|
|
public void OrganizesAddsForwardReference()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root, BaseDataVariableState t1, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
nb.Organizes(t1.NodeId);
|
|
|
|
Assert.That(
|
|
root.ReferenceExists(ReferenceTypeIds.Organizes, isInverse: false, t1.NodeId),
|
|
Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void OrganizesNodeStateOverloadAddsReference()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root, BaseDataVariableState t1, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
nb.Organizes(t1);
|
|
|
|
Assert.That(
|
|
root.ReferenceExists(ReferenceTypeIds.Organizes, isInverse: false, t1.NodeId),
|
|
Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void HasComponentAddsForwardReference()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root, BaseDataVariableState t1, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
nb.HasComponent(t1.NodeId);
|
|
|
|
Assert.That(
|
|
root.ReferenceExists(ReferenceTypeIds.HasComponent, isInverse: false, t1.NodeId),
|
|
Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void HasPropertyAddsForwardReference()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root, BaseDataVariableState t1, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
nb.HasProperty(t1.NodeId);
|
|
|
|
Assert.That(
|
|
root.ReferenceExists(ReferenceTypeIds.HasProperty, isInverse: false, t1.NodeId),
|
|
Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void AddReferenceChainsMultipleTargets()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root,
|
|
BaseDataVariableState t1, BaseDataVariableState t2) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
nb.Organizes(t1.NodeId).Organizes(t2.NodeId);
|
|
|
|
Assert.That(root.ReferenceExists(ReferenceTypeIds.Organizes, false, t1.NodeId), Is.True);
|
|
Assert.That(root.ReferenceExists(ReferenceTypeIds.Organizes, false, t2.NodeId), Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void AddReferenceInverseFlagIsRespected()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root, BaseDataVariableState t1, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
nb.AddReference(ReferenceTypeIds.HasNotifier, isInverse: true, t1.NodeId);
|
|
|
|
Assert.That(
|
|
root.ReferenceExists(ReferenceTypeIds.HasNotifier, isInverse: true, t1.NodeId),
|
|
Is.True);
|
|
Assert.That(
|
|
root.ReferenceExists(ReferenceTypeIds.HasNotifier, isInverse: false, t1.NodeId),
|
|
Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void OrganizesNullTargetThrowsArgumentNullException()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
Assert.Throws<ArgumentNullException>(() => nb.Organizes(NodeId.Null));
|
|
Assert.Throws<ArgumentNullException>(() => nb.Organizes(null!));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectCreatesAndAttachesChild()
|
|
{
|
|
(NodeManagerBuilder b, BaseObjectState root, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
Assert.That(child.Node, Is.Not.Null);
|
|
Assert.That(child.Node.BrowseName, Is.EqualTo(new QualifiedName("Group1", kNs)));
|
|
Assert.That(child.Node.Parent, Is.SameAs(root));
|
|
Assert.That(child.Node.NodeId.IdentifierAsString,
|
|
Is.EqualTo("Root_Group1"),
|
|
"Generated NodeId should follow parentId_childName pattern.");
|
|
Assert.That(child.Node.TypeDefinitionId, Is.EqualTo(ObjectTypeIds.BaseObjectType));
|
|
|
|
var children = new List<BaseInstanceState>();
|
|
root.GetChildren(null!, children);
|
|
Assert.That(children, Has.Member(child.Node));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectWithCustomTypeDefinition()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
var customType = new NodeId(1234u, kNs);
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("CustomGroup", kNs),
|
|
customType);
|
|
|
|
Assert.That(child.Node.TypeDefinitionId, Is.EqualTo(customType));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectThenOrganizesWiresFunctionalGroup()
|
|
{
|
|
(NodeManagerBuilder b, _, BaseDataVariableState t1, BaseDataVariableState t2) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> group = nb.AddObject(
|
|
new QualifiedName("Operational", kNs));
|
|
group.Organizes(t1).Organizes(t2);
|
|
|
|
Assert.That(group.Node.ReferenceExists(
|
|
ReferenceTypeIds.Organizes, false, t1.NodeId), Is.True);
|
|
Assert.That(group.Node.ReferenceExists(
|
|
ReferenceTypeIds.Organizes, false, t2.NodeId), Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectNullBrowseNameThrowsArgumentNullException()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => nb.AddObject(QualifiedName.Null));
|
|
}
|
|
|
|
[Test]
|
|
public void AddReferenceNullArgsThrow()
|
|
{
|
|
(NodeManagerBuilder b, _, BaseDataVariableState t1, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => nb.AddReference(NodeId.Null, false, t1.NodeId));
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => nb.AddReference(ReferenceTypeIds.Organizes, false, NodeId.Null));
|
|
}
|
|
|
|
[Test]
|
|
public void AddReferenceNullBuilderThrowsArgumentNullException()
|
|
{
|
|
(_, _, BaseDataVariableState t1, _) = CreateBuilder();
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => ((INodeBuilder)null!).AddReference(
|
|
ReferenceTypeIds.Organizes, false, t1.NodeId));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectNullParentThrowsArgumentNullException()
|
|
{
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => ((INodeBuilder)null!).AddObject(new QualifiedName("X", kNs)));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectReturnedBuilderExposesNodeAndOwnerBuilder()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
Assert.That(child.Builder, Is.SameAs(b));
|
|
Assert.That(((INodeBuilder)child).Node, Is.SameAs(child.Node));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectAsCastsToBaseType()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
INodeBuilder<NodeState> upcast = child.As<NodeState>();
|
|
|
|
Assert.That(upcast.Node, Is.SameAs(child.Node));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectAsThrowsOnTypeMismatch()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(
|
|
() => child.As<BaseDataVariableState>())!;
|
|
Assert.That(ex.StatusCode, Is.EqualTo((uint)StatusCodes.BadTypeMismatch));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectOnReadOnNonVariableThrowsBadInvalidArgument()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(
|
|
() => child.OnRead((c, n, ref v) => ServiceResult.Good))!;
|
|
Assert.That(ex.StatusCode, Is.EqualTo((uint)StatusCodes.BadInvalidArgument));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectOnCallOnNonMethodThrowsBadInvalidArgument()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(
|
|
() => child.OnCall((_, _, _, _, _) => ServiceResult.Good))!;
|
|
Assert.That(ex.StatusCode, Is.EqualTo((uint)StatusCodes.BadInvalidArgument));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectChildMissingThrowsBadNodeIdUnknown()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(
|
|
() => child.Child(new QualifiedName("DoesNotExist", kNs)))!;
|
|
Assert.That(ex.StatusCode, Is.EqualTo((uint)StatusCodes.BadNodeIdUnknown));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectVariableOnNonVariableChildThrowsBadTypeMismatch()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> parent = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
// Attach a non-variable child.
|
|
parent.AddObject(new QualifiedName("SubObj", kNs));
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(
|
|
() => parent.Variable<int>(new QualifiedName("SubObj", kNs)))!;
|
|
Assert.That(ex.StatusCode, Is.EqualTo((uint)StatusCodes.BadTypeMismatch));
|
|
}
|
|
|
|
[Test]
|
|
public void AddObjectOnNodeAddedInvokesHandlerSynchronously()
|
|
{
|
|
(NodeManagerBuilder b, _, _, _) = CreateBuilder();
|
|
INodeBuilder nb = b.Node(new NodeId("Root", kNs));
|
|
|
|
INodeBuilder<BaseObjectState> child = nb.AddObject(
|
|
new QualifiedName("Group1", kNs));
|
|
|
|
NodeState? captured = null;
|
|
child.OnNodeAdded((_, n) => captured = n);
|
|
|
|
Assert.That(captured, Is.SameAs(child.Node));
|
|
}
|
|
}
|
|
}
|