mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-28 22:55:49 +08:00
# Description
Fixes the SourceGeneration findings of a read-only bug audit of
`a05a36055` — sections 15 (host generators, Roslyn side), 16
(SourceGeneration.Core schema / ModelDesign loader) and 17
(SourceGeneration.Core generators). 36 of the 39 findings are fixed;
each has a regression test.
### Generated-code correctness
- **State machine NodeId constants** were emitted as `const uint` even
when the aliased `Objects` constant is a `string`, so every model using
string NodeIds with a `FiniteStateMachineType` subtype failed with
CS0029. The constant type now follows the aliased node, looked up from
the same source `NodeIdGenerator` emits from — top-level nodes **plus
each node's instance hierarchy**, since a state or transition only ever
exists as a hierarchy entry.
- `NodeIdGenerator` emitted string identifiers into C# string literals
without escaping them.
- Structure field names are authored data, so they can be C# keywords or
collide with the members every generated data type carries. Properties
and `{Type}Fields` members now go through a sanitizing,
collision-breaking mapping (including two siblings that sanitize to the
same identifier). **Wire names are untouched** — OPC 10000-3 §8.51
requires the StructureField name to match the BrowseName, and the
`DataMember`/encode/decode names still come from `Parameter.Name`.
- `NodeStateGenerator`'s copy-on-write cast now uses the fully qualified
data type name, which a cross-model structure needs.
- `GetScalarValueAsCode` emitted `(double)NaN` and the infinities, which
do not compile.
- `TemplateWriter` formatted with the current culture, so a machine with
a comma decimal separator emitted invalid generated source.
### Served schema documents
- The binary schema described a **different wire layout than the
generated `Encode`/`Decode`**: unions carried no
`SwitchField`/`SwitchValue`, and structures with optional fields carried
no encoding-mask presence bits. Both are now emitted per **OPC 10000-6
§5.2.7**, matching the layout the runtime `BsdSchemaGenerator` produces.
A structure with more than 32 optional fields now fails generation
instead of silently wrapping `1 << 32` back onto the first field's bit.
- Documentation text and attribute values are XML-escaped.
### ModelDesign loading and validation
- Identifiers pinned in a CSV were dropped whenever any other loaded
namespace declared the same symbolic name. Removal is now scoped to the
file's target namespace, and explicit `NumericId`s are keyed by
`(namespace, id)` so the same number in two namespaces is legal.
- Declaration order inside a design file no longer matters — base types
are imported and validated ahead of their subtypes.
- OptionSet `OptionSetValues` were truncated at bit 31 (signed shift)
and bits 32–63 of a 64-bit option set were never emitted.
- An authored `ValueRank` is no longer overwritten by the shape of the
default value (OPC 10000-3 §6.2.8: a ValueRank may only be further
restricted), and a VariableType data type may be narrowed any number of
levels deep rather than exactly one.
- NodeSet import: `AccessRestrictions="0"` means "no restrictions", not
`EncryptionRequired` (OPC 10000-3 §8.56) — an unrecognised mask stays
**fail-closed**; a NodeSet without `<Models>` reports what is wrong; an
optional `<References>` no longer throws; the parent/child reference
scan looks at the parent's references; and `IsTypeOf` terminates on the
self-referential root reference types NodeSets routinely declare.
- Version comparison is numeric per component (ordinally `"1.05.9"`
sorts above `"1.05.10"`) and now lives on `SemVer`, so the NodeSet
collection and the dependency tie-break cannot pick different winners; a
publication-date version no longer outranks a real one.
### Host generator
- `[DataType]` on an `enum` is matched again (an enum is not a
`TypeDeclarationSyntax`), MODELGEN003 renders its arguments instead of
the raw template, and the Types hint name keeps the namespace's dots so
`A.BC` and `AB.C` cannot claim the same one.
- Compilation-derived pipeline stages carry value comparers, so editing
a file no longer re-runs the entire model generation on every keystroke.
- A NodeSet that fails to load skips that file rather than every
remaining one; a file listed twice as an `AdditionalFile` is deduped;
superseded NodeSet versions are still recognised as NodeSet inputs and
not generated a second time by the ModelDesign pass.
- `LogLevel.Critical` maps to a diagnostic instead of being silently
dropped.
### Client
- `EventRecordFieldReaders` gained the readers the event record
generator needs (including `Variant`, enumerations and the array forms).
Fields whose type had no reader were declared on the record but never
populated, so they read as `null`/`default` for every event.
## Not fixed (deliberately)
- **Forward same-namespace hierarchical references in
`NodeSetToModelDesign.ImportReferences`** — the audit flags the
inverse-only handling as asymmetric. Making it symmetric compiles and
passes every generator unit test, but regresses the address space: all
17 `RobotOpenUsdE2eTests` fail in `OneTimeSetUpAsync` because the hosted
server never finishes starting. Reverted, with a comment at the site
recording why.
- **§17.10 and §15.10** (both low + PLAUSIBLE) — each needs a wider
refactor than this PR: a consistent NodeId-constant rename across ~6
cross-reference sites, and replacing `Location` with a serializable
equivalent for incremental cache equality.
## Spec cross-check
The encoding/schema changes were checked against the specification: OPC
10000-6 §5.2.7 (32-bit EncodingMask, one bit per optional field in
order, padded), the union `SwitchField` encoding, OPC 10000-3 §8.56
(AccessRestrictionType bit mask), §6.2.8 and §5.6.2/§5.6.5 (ValueRank),
§8.51 (StructureField name == BrowseName).
`GenerateStackTests.OptionalFieldBitsAgreeBetweenBsdAndGeneratedEncoder`
pins the BSD presence-bit order against the generated encoder's
`LogRecordFields` so the two cannot drift apart again.
## Related Issues
_No tracking issue — this PR implements the SourceGeneration sections of
a bug audit. Happy to open one if 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.
- [x] I have added all necessary documentation.
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings.
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed.
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
> Note on the test checkbox: verified on **net10.0 only** — `UA.slnx`
builds clean (0 warnings, 0 errors) and
`Opc.Ua.SourceGeneration.Core.Tests` (3915),
`Opc.Ua.SourceGeneration.Tests` (184), `Opc.Ua.Di.Tests` (425, including
the `RobotOpenUsdE2eTests` end-to-end fixture that catches address-space
content changes) and the `EventRecordFieldReaders` tests (16) all pass.
.NET Framework has **not** been run locally; CI needs to confirm it.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
347 lines
15 KiB
C#
347 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.Collections.Generic;
|
|
using System.Xml;
|
|
using NUnit.Framework;
|
|
|
|
namespace Opc.Ua.SourceGeneration.Shared.Tests
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for the <see cref="SourceGenerationUtils"/> class.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("SourceGeneration")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class SourceGenerationUtilsTests
|
|
{
|
|
[TestCase("Foo", false, "foo")]
|
|
[TestCase("foo", false, "foo")]
|
|
[TestCase("Class", false, "@class")]
|
|
[TestCase("@class", false, "@class")]
|
|
[TestCase("some-value", false, "some_value")]
|
|
[TestCase("1 Value", false, "_1value")]
|
|
[TestCase("Class", true, "Class")]
|
|
[TestCase("__arglist", false, "@__arglist")]
|
|
[TestCase("__makeref", false, "@__makeref")]
|
|
[TestCase("__reftype", false, "@__reftype")]
|
|
[TestCase("__refvalue", false, "@__refvalue")]
|
|
public void ToCSharpIdentifierCanonicalizesAndEscapes(
|
|
string input,
|
|
bool upperCamelCase,
|
|
string expected)
|
|
{
|
|
Assert.That(
|
|
input.ToCSharpIdentifier(upperCamelCase),
|
|
Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: the preserve-case overload must sanitize the name into a
|
|
/// legal identifier without touching the casing the model author chose.
|
|
/// Used for constants whose name is part of the generated public API.
|
|
/// </summary>
|
|
[TestCase("Pump 1", "Pump1")]
|
|
[TestCase("pump", "pump")]
|
|
[TestCase("Pump-1", "Pump_1")]
|
|
[TestCase("1Pump", "_1Pump")]
|
|
[TestCase("class", "@class")]
|
|
[TestCase("", "Value")]
|
|
[TestCase(null, "Value")]
|
|
public void ToCSharpIdentifierPreserveCaseKeepsCasing(string input, string expected)
|
|
{
|
|
Assert.That(input.ToCSharpIdentifierPreserveCase(), Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: descriptions taken from a NodeSet go into BSD/XSD schema
|
|
/// documents as character data, so the XML markup characters have to be
|
|
/// escaped or the emitted schema is not well formed.
|
|
/// </summary>
|
|
[TestCase("A&C", "A&C")]
|
|
[TestCase("a < b > c", "a < b > c")]
|
|
[TestCase("plain", "plain")]
|
|
[TestCase("", "")]
|
|
[TestCase(null, "")]
|
|
public void AsXmlTextEscapesMarkupCharacters(string input, string expected)
|
|
{
|
|
Assert.That(input.AsXmlText(), Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attribute values additionally need the double quote escaped.
|
|
/// </summary>
|
|
[TestCase("a\"b", "a"b")]
|
|
[TestCase("A&C", "A&C")]
|
|
public void AsXmlAttributeValueEscapesQuotes(string input, string expected)
|
|
{
|
|
Assert.That(input.AsXmlAttributeValue(), Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// An element name is not character data, so escaping cannot rescue one
|
|
/// that is not an NCName - "Read&Write" written as "Read&amp;Write"
|
|
/// still decodes to something xs:element/@name does not accept.
|
|
/// </summary>
|
|
[TestCase("Value", true)]
|
|
[TestCase("_value", true)]
|
|
[TestCase("Value1", true)]
|
|
[TestCase("Read&Write", false)]
|
|
[TestCase("Value Id", false)]
|
|
[TestCase("1Value", false)]
|
|
[TestCase("a:b", false)]
|
|
[TestCase("a<b", false)]
|
|
[TestCase("", false)]
|
|
[TestCase(null, false)]
|
|
public void IsValidXmlNameAcceptsOnlyNCNames(string input, bool expected)
|
|
{
|
|
Assert.That(input.IsValidXmlName(), Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: NodeIdGenerator interpolated the string identifier into a
|
|
/// C# literal unescaped, so a PLC style id with a backslash produced
|
|
/// source that does not compile.
|
|
/// </summary>
|
|
[Test]
|
|
public void AsStringLiteralEscapesBackslashAndQuote()
|
|
{
|
|
Assert.That(
|
|
"PLC1\\DB10.Tag".AsStringLiteral(),
|
|
Is.EqualTo("\"PLC1\\\\DB10.Tag\""));
|
|
Assert.That(
|
|
"say \"hi\"".AsStringLiteral(),
|
|
Is.EqualTo("\"say \\\"hi\\\"\""));
|
|
}
|
|
|
|
[Test]
|
|
public void AsStringLiteralEscapesUnicodeLineSeparators()
|
|
{
|
|
const string value = "Next\u0085Line\u2028Paragraph\u2029End";
|
|
|
|
Assert.That(
|
|
value.AsStringLiteral(),
|
|
Is.EqualTo("\"Next\\u0085Line\\u2028Paragraph\\u2029End\""));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests that IsNull returns the expected result for various XmlQualifiedName inputs.
|
|
/// </summary>
|
|
/// <param name="qname">The XmlQualifiedName to test.</param>
|
|
/// <param name="expected">The expected result.</param>
|
|
[TestCaseSource(nameof(IsNullTestCases))]
|
|
public void IsNull_VariousInputs_ReturnsExpectedResult(XmlQualifiedName qname, bool expected)
|
|
{
|
|
// Act
|
|
bool result = qname.IsNull();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
}
|
|
|
|
private static IEnumerable<TestCaseData> IsNullTestCases()
|
|
{
|
|
yield return new TestCaseData(null, true);
|
|
yield return new TestCaseData(new XmlQualifiedName(null), true);
|
|
yield return new TestCaseData(new XmlQualifiedName(string.Empty), true);
|
|
yield return new TestCaseData(new XmlQualifiedName("ValidName"), false);
|
|
yield return new TestCaseData(new XmlQualifiedName("ValidName", "http://namespace.com"), false);
|
|
yield return new TestCaseData(new XmlQualifiedName(" "), false);
|
|
yield return new TestCaseData(new XmlQualifiedName(" \t\n\r "), false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with a null input.
|
|
/// Verifies that a null input returns null.
|
|
/// </summary>
|
|
[Test]
|
|
public void ToLowerCamelCase_NullInput_ReturnsNull()
|
|
{
|
|
// Arrange
|
|
const string input = null;
|
|
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.Null);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with an empty string.
|
|
/// Verifies that an empty string returns an empty string.
|
|
/// </summary>
|
|
[Test]
|
|
public void ToLowerCamelCase_EmptyString_ReturnsEmptyString()
|
|
{
|
|
// Arrange
|
|
string input = string.Empty;
|
|
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(string.Empty));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with various string inputs.
|
|
/// Verifies that the first character is converted to lowercase when needed,
|
|
/// and returns the input unchanged when the first character is already lowercase
|
|
/// or is not an alphabetic character.
|
|
/// </summary>
|
|
/// <param name="input">The input string to test.</param>
|
|
/// <param name="expected">The expected output string.</param>
|
|
[TestCase("a", "a", Description = "Single lowercase character")]
|
|
[TestCase("A", "a", Description = "Single uppercase character")]
|
|
[TestCase("helloWorld", "helloWorld", Description = "Already lowercase first character")]
|
|
[TestCase("HelloWorld", "helloWorld", Description = "Uppercase first character")]
|
|
[TestCase("HELLO", "hELLO", Description = "All uppercase string")]
|
|
[TestCase("Ab", "ab", Description = "Two characters, uppercase first")]
|
|
[TestCase("ab", "ab", Description = "Two characters, lowercase first")]
|
|
[TestCase("X", "x", Description = "Single uppercase letter X")]
|
|
[TestCase("z", "z", Description = "Single lowercase letter z")]
|
|
[TestCase("MyProperty", "myProperty", Description = "Typical property name")]
|
|
[TestCase("thisIsAlreadyLowerCamel", "thisIsAlreadyLowerCamel", Description = "Already in lower camel case")]
|
|
[TestCase("URL", "uRL", Description = "Acronym")]
|
|
public void ToLowerCamelCase_AlphabeticStrings_ConvertsFirstCharacterCorrectly(string input, string expected)
|
|
{
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with strings starting with non-alphabetic characters.
|
|
/// Verifies that strings starting with digits, symbols, or whitespace are returned unchanged.
|
|
/// </summary>
|
|
/// <param name="input">The input string to test.</param>
|
|
/// <param name="expected">The expected output string.</param>
|
|
[TestCase("123Test", "123Test", Description = "String starting with digit")]
|
|
[TestCase("0Value", "0Value", Description = "String starting with zero")]
|
|
[TestCase("_test", "_test", Description = "String starting with underscore")]
|
|
[TestCase("$value", "$value", Description = "String starting with dollar sign")]
|
|
[TestCase(" Test", " Test", Description = "String starting with space")]
|
|
[TestCase("\tTest", "\tTest", Description = "String starting with tab")]
|
|
[TestCase("@Property", "@Property", Description = "String starting with at symbol")]
|
|
[TestCase("-negative", "-negative", Description = "String starting with hyphen")]
|
|
public void ToLowerCamelCase_NonAlphabeticStart_ReturnsUnchanged(string input, string expected)
|
|
{
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with Unicode characters.
|
|
/// Verifies that Unicode uppercase characters are correctly converted to lowercase,
|
|
/// and lowercase Unicode characters remain unchanged.
|
|
/// </summary>
|
|
/// <param name="input">The input string to test.</param>
|
|
/// <param name="expected">The expected output string.</param>
|
|
[TestCase("Über", "über", Description = "German umlaut uppercase")]
|
|
[TestCase("über", "über", Description = "German umlaut lowercase")]
|
|
[TestCase("École", "école", Description = "French accented character uppercase")]
|
|
[TestCase("école", "école", Description = "French accented character lowercase")]
|
|
[TestCase("Ñame", "ñame", Description = "Spanish ñ uppercase")]
|
|
[TestCase("ñame", "ñame", Description = "Spanish ñ lowercase")]
|
|
public void ToLowerCamelCase_UnicodeCharacters_HandlesCorrectly(string input, string expected)
|
|
{
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with a very long string.
|
|
/// Verifies that the method handles long strings correctly without performance issues.
|
|
/// </summary>
|
|
[Test]
|
|
public void ToLowerCamelCase_VeryLongString_ConvertsCorrectly()
|
|
{
|
|
// Arrange
|
|
string input = "A" + new string('x', 10000);
|
|
string expected = "a" + new string('x', 10000);
|
|
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
Assert.That(result, Has.Length.EqualTo(10001));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with whitespace-only strings.
|
|
/// Verifies that strings containing only whitespace characters are handled correctly.
|
|
/// </summary>
|
|
/// <param name="input">The input string to test.</param>
|
|
/// <param name="expected">The expected output string.</param>
|
|
[TestCase(" ", " ", Description = "Multiple spaces")]
|
|
[TestCase("\t\t", "\t\t", Description = "Multiple tabs")]
|
|
[TestCase("\n", "\n", Description = "Newline character")]
|
|
[TestCase("\r\n", "\r\n", Description = "Carriage return and newline")]
|
|
public void ToLowerCamelCase_WhitespaceOnly_ReturnsUnchanged(string input, string expected)
|
|
{
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the ToLowerCamelCase method with special character strings.
|
|
/// Verifies that strings consisting entirely of special characters are handled correctly.
|
|
/// </summary>
|
|
/// <param name="input">The input string to test.</param>
|
|
/// <param name="expected">The expected output string.</param>
|
|
[TestCase("_", "_", Description = "Single underscore")]
|
|
[TestCase("$", "$", Description = "Single dollar sign")]
|
|
[TestCase("@#$%", "@#$%", Description = "Multiple special characters")]
|
|
[TestCase("123", "123", Description = "Only digits")]
|
|
public void ToLowerCamelCase_SpecialCharactersOnly_ReturnsUnchanged(string input, string expected)
|
|
{
|
|
// Act
|
|
string result = input.ToLowerCamelCase();
|
|
|
|
// Assert
|
|
Assert.That(result, Is.EqualTo(expected));
|
|
}
|
|
}
|
|
}
|