mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +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>
376 lines
14 KiB
C#
376 lines
14 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.IO;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Xml;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.ComplexTypes;
|
|
using Opc.Ua.Core.TestFramework;
|
|
using Opc.Ua.Test;
|
|
using ComplexStructure = Opc.Ua.Encoders.Structure;
|
|
|
|
namespace Opc.Ua.Client.ComplexTypes.Tests
|
|
{
|
|
/// <summary>
|
|
/// Namespace constants for the default complex type tests.
|
|
/// </summary>
|
|
public static class Namespaces
|
|
{
|
|
/// <summary>
|
|
/// The URI for the OpcUa namespace.
|
|
/// </summary>
|
|
public const string OpcUa = "http://opcfoundation.org/UA/";
|
|
|
|
/// <summary>
|
|
/// The URI for the OpcUaXsd namespace.
|
|
/// </summary>
|
|
public const string OpcUaXsd = "http://opcfoundation.org/UA/2008/02/Types.xsd";
|
|
|
|
/// <summary>
|
|
/// The URI for the test encoder namespace.
|
|
/// </summary>
|
|
public const string OpcUaEncoderTests = "http://opcfoundation.org/UA/DefaultComplexTypeTests/";
|
|
}
|
|
|
|
/// <summary>
|
|
/// Common base class for default complex type tests.
|
|
/// Uses DefaultComplexTypeFactory/Builder instead of Reflection.Emit.
|
|
/// </summary>
|
|
public abstract class DefaultComplexTypesCommon : EncoderCommon
|
|
{
|
|
protected DefaultComplexTypeFactory m_factory;
|
|
protected IComplexTypeBuilder m_complexTypeBuilder;
|
|
protected int m_nodeIdCount;
|
|
|
|
[OneTimeSetUp]
|
|
protected new void OneTimeSetUp()
|
|
{
|
|
m_nodeIdCount = 0;
|
|
m_factory = new DefaultComplexTypeFactory();
|
|
m_complexTypeBuilder = m_factory.Create(
|
|
Namespaces.OpcUaEncoderTests,
|
|
3,
|
|
"DefaultTests");
|
|
}
|
|
|
|
[OneTimeTearDown]
|
|
protected new void OneTimeTearDown()
|
|
{
|
|
}
|
|
|
|
[SetUp]
|
|
protected new void SetUp()
|
|
{
|
|
}
|
|
|
|
[TearDown]
|
|
protected new void TearDown()
|
|
{
|
|
}
|
|
|
|
/// <summary>
|
|
/// Parameter class for structure field tests.
|
|
/// </summary>
|
|
public class StructureFieldParameter : IFormattable
|
|
{
|
|
public StructureFieldParameter(StructureField structureField)
|
|
{
|
|
Name = structureField.Name;
|
|
BuiltInType = TypeInfo.GetBuiltInType(structureField.DataType);
|
|
}
|
|
|
|
public string Name { get; set; }
|
|
public BuiltInType BuiltInType { get; set; }
|
|
|
|
public string ToString(string format, IFormatProvider formatProvider)
|
|
{
|
|
return Name;
|
|
}
|
|
}
|
|
|
|
[DatapointSource]
|
|
public StructureType[] StructureTypes =
|
|
#if NET8_0_OR_GREATER && !NET_STANDARD_TESTS
|
|
Enum.GetValues<StructureType>();
|
|
#else
|
|
(StructureType[])Enum.GetValues(typeof(StructureType));
|
|
#endif
|
|
|
|
[DatapointSource]
|
|
public StructureFieldParameter[] StructureField =
|
|
[
|
|
.. GetAllBuiltInTypesFields().Select(s => new StructureFieldParameter(s))
|
|
];
|
|
|
|
internal IEncodeableType BuildComplexTypeWithAllBuiltInTypes(
|
|
StructureType structureType,
|
|
string testFunc)
|
|
{
|
|
return BuildComplexTypeWithAllBuiltInTypes(null, structureType, testFunc, out _);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds a complex type with all BuiltInTypes as properties
|
|
/// using the DefaultComplexTypeBuilder.
|
|
/// </summary>
|
|
private IEncodeableType BuildComplexTypeWithAllBuiltInTypes(
|
|
IServiceMessageContext context,
|
|
StructureType structureType,
|
|
string testFunc,
|
|
out ExpandedNodeId nodeId)
|
|
{
|
|
uint typeId = (uint)Interlocked.Add(ref m_nodeIdCount, 100);
|
|
var complexTypeStructure = new StructureDefinition
|
|
{
|
|
BaseDataType = structureType == StructureType.Union
|
|
? DataTypeIds.Union
|
|
: DataTypeIds.Structure,
|
|
DefaultEncodingId = default,
|
|
Fields = GetAllBuiltInTypesFields(),
|
|
StructureType = structureType
|
|
};
|
|
|
|
IComplexTypeFieldBuilder fieldBuilder = m_complexTypeBuilder.AddStructuredType(
|
|
QualifiedName.From(structureType + "." + testFunc),
|
|
complexTypeStructure);
|
|
nodeId = new ExpandedNodeId(typeId++, m_complexTypeBuilder.TargetNamespace);
|
|
var binaryEncodingId = new ExpandedNodeId(
|
|
typeId++,
|
|
m_complexTypeBuilder.TargetNamespace);
|
|
var xmlEncodingId = new ExpandedNodeId(typeId++, m_complexTypeBuilder.TargetNamespace);
|
|
fieldBuilder.AddTypeIdAttribute(nodeId, binaryEncodingId, xmlEncodingId);
|
|
int i = 1;
|
|
foreach (StructureField field in complexTypeStructure.Fields)
|
|
{
|
|
IType fieldType = TypeInfo.GetSystemType(field.DataType, null);
|
|
field.IsOptional = structureType == StructureType.StructureWithOptionalFields;
|
|
fieldBuilder.AddField(field, fieldType, i++, false);
|
|
}
|
|
IEncodeableType complexType = fieldBuilder.CreateType();
|
|
if (context != null)
|
|
{
|
|
context.Factory.Builder.AddEncodeableType(nodeId, complexType).Commit();
|
|
context.Factory.Builder.AddEncodeableType(binaryEncodingId, complexType).Commit();
|
|
context.Factory.Builder.AddEncodeableType(xmlEncodingId, complexType).Commit();
|
|
}
|
|
return complexType;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Return a collection of fields with BuiltInTypes.
|
|
/// </summary>
|
|
private static List<StructureField> GetAllBuiltInTypesFields()
|
|
{
|
|
var collection = new List<StructureField>();
|
|
foreach (BuiltInType builtInType in BuiltInTypes)
|
|
{
|
|
if (builtInType
|
|
is BuiltInType.Null
|
|
or BuiltInType.Variant
|
|
or BuiltInType.DataValue
|
|
or BuiltInType.ExtensionObject
|
|
or >= BuiltInType.Number)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
collection.Add(
|
|
new StructureField
|
|
{
|
|
Name = builtInType.ToString(),
|
|
DataType = new NodeId((uint)builtInType),
|
|
ArrayDimensions = default,
|
|
Description = LocalizedText.From($"A BuiltInType.{builtInType} property."),
|
|
IsOptional = false,
|
|
MaxStringLength = 0,
|
|
ValueRank = -1
|
|
});
|
|
}
|
|
return collection;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create complex types for all structure types and register them.
|
|
/// </summary>
|
|
internal void CreateComplexTypes(
|
|
IServiceMessageContext context,
|
|
Dictionary<StructureType, (ExpandedNodeId, IEncodeableType)> dict,
|
|
string nameExtension)
|
|
{
|
|
foreach (StructureType structureType in StructureTypes)
|
|
{
|
|
IEncodeableType encodeableType = BuildComplexTypeWithAllBuiltInTypes(
|
|
context,
|
|
structureType,
|
|
nameof(CreateComplexTypes) + nameExtension,
|
|
out ExpandedNodeId nodeId);
|
|
dict[structureType] = (nodeId, encodeableType);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Helper to fill a Structure-based type with default or random values.
|
|
/// </summary>
|
|
internal void FillStructWithValues(
|
|
ComplexStructure structType,
|
|
bool randomValues,
|
|
NamespaceTable namespaceUris)
|
|
{
|
|
int index = 0;
|
|
foreach (IStructureField property in structType.GetFields())
|
|
{
|
|
BuiltInType builtInType = property.TypeInfo.BuiltInType;
|
|
Variant newObj = randomValues
|
|
? DataGenerator.GetRandomVariant(builtInType, !property.TypeInfo.IsScalar)
|
|
: Variant.CreateDefault(TypeInfo.Create(builtInType, property.TypeInfo.ValueRank));
|
|
if (newObj.IsNull)
|
|
{
|
|
switch (builtInType)
|
|
{
|
|
case BuiltInType.XmlElement:
|
|
var doc = new XmlDocument();
|
|
newObj = Variant.From(XmlElement.From(doc.CreateElement("name")));
|
|
break;
|
|
case BuiltInType.ByteString:
|
|
newObj = Variant.From(ByteString.From([1, 2, 3]));
|
|
break;
|
|
case BuiltInType.String:
|
|
newObj = Variant.From("This is a test");
|
|
break;
|
|
case BuiltInType.ExtensionObject:
|
|
newObj = Variant.From(ExtensionObject.Null);
|
|
break;
|
|
default:
|
|
newObj = Variant.CreateDefault(property.TypeInfo);
|
|
break;
|
|
}
|
|
}
|
|
structType[property.Name] = newObj;
|
|
Assert.That(newObj, Is.EqualTo(structType[property.Name]));
|
|
Assert.That(newObj, Is.EqualTo(structType[index]));
|
|
index++;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Encode and decode a default complex type, verify the result.
|
|
/// </summary>
|
|
protected void EncodeDecodeComplexType(
|
|
IServiceMessageContext encoderContext,
|
|
MemoryStreamType memoryStreamType,
|
|
EncodingType encoderType,
|
|
JsonEncodingType jsonEncodingType,
|
|
bool useXmlParser,
|
|
StructureType structureType,
|
|
ExpandedNodeId nodeId,
|
|
IEncodeable data)
|
|
{
|
|
string encodeInfo = $"Encoder: {encoderType} Type:{structureType}";
|
|
TestContext.Out.WriteLine(encodeInfo);
|
|
TestContext.Out.WriteLine(data);
|
|
ExtensionObject expected = CreateExtensionObject(structureType, nodeId, data);
|
|
Assert.That(expected.IsNull, Is.False, "Expected DataValue is Null, " + encodeInfo);
|
|
TestContext.Out.WriteLine("Expected:");
|
|
TestContext.Out.WriteLine(expected);
|
|
|
|
byte[] buffer;
|
|
using (MemoryStream encoderStream = CreateEncoderMemoryStream(memoryStreamType))
|
|
{
|
|
using (
|
|
IEncoder encoder = CreateEncoder(
|
|
encoderType,
|
|
encoderContext,
|
|
encoderStream,
|
|
typeof(DataValue),
|
|
jsonEncodingType))
|
|
{
|
|
encoder.WriteExtensionObject("ExtensionObject", expected);
|
|
}
|
|
buffer = encoderStream.ToArray();
|
|
}
|
|
|
|
switch (encoderType)
|
|
{
|
|
case EncodingType.Binary:
|
|
TestContext.Out.WriteLine(PrettifyAndValidateBinary(buffer));
|
|
break;
|
|
case EncodingType.Json:
|
|
TestContext.Out.WriteLine(PrettifyAndValidateJson(buffer));
|
|
break;
|
|
case EncodingType.Xml:
|
|
TestContext.Out.WriteLine(PrettifyAndValidateXml(buffer));
|
|
break;
|
|
}
|
|
|
|
using var decoderStream = new MemoryStream(buffer);
|
|
using IDecoder decoder = CreateDecoder(
|
|
encoderType,
|
|
useXmlParser,
|
|
encoderContext,
|
|
decoderStream,
|
|
typeof(DataValue));
|
|
ExtensionObject result = decoder.ReadExtensionObject("ExtensionObject");
|
|
TestContext.Out.WriteLine("Result:");
|
|
TestContext.Out.WriteLine(result);
|
|
Assert.That(result.IsNull, Is.False, "Resulting DataValue is Null, " + encodeInfo);
|
|
Assert.That(result.Encoding, Is.EqualTo(expected.Encoding), encodeInfo);
|
|
Assert.That(result, Is.EqualTo(expected),
|
|
$"Failed to compare expected and result.\r\n{encodeInfo}.\r\n{expected}\r\n!=\r\n{result}.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create an ExtensionObject for a complex type.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentException"></exception>
|
|
protected ExtensionObject CreateExtensionObject(
|
|
StructureType structureType,
|
|
ExpandedNodeId nodeId,
|
|
object data)
|
|
{
|
|
switch (data)
|
|
{
|
|
case ByteString b:
|
|
return new ExtensionObject(nodeId, b);
|
|
case XmlElement x:
|
|
return new ExtensionObject(nodeId, x);
|
|
case IEncodeable e:
|
|
return new ExtensionObject(nodeId, e, true);
|
|
default:
|
|
throw new ArgumentException(
|
|
$"Unsupported data type {data.GetType()}" +
|
|
$" for structure type {structureType}.");
|
|
}
|
|
}
|
|
}
|
|
}
|