mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## 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. - [ ] 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. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
224 lines
9.0 KiB
C#
224 lines
9.0 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;
|
|
|
|
using ComplexStructure = Opc.Ua.Encoders.Structure;
|
|
using ComplexUnion = Opc.Ua.Encoders.Union;
|
|
|
|
namespace Opc.Ua.Client.ComplexTypes.Tests
|
|
{
|
|
/// <summary>
|
|
/// Tests for creating default complex types using DefaultComplexTypeBuilder.
|
|
/// Mirrors ComplexSampleTypesBuilder from Opc.Ua.Client.ComplexTypes.Tests.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("DefaultComplexTypes")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class DefaultComplexTypesBuilderTests : DefaultComplexTypesCommon
|
|
{
|
|
/// <summary>
|
|
/// Create a structure type from a DataTypeDefinition using DefaultComplexTypeBuilder.
|
|
/// Verify the created type implements IStructure and has expected properties.
|
|
/// </summary>
|
|
[Theory]
|
|
public void CreateComplexType(StructureType structureType)
|
|
{
|
|
int propertyBuiltInTypes = BuiltInTypes.Length - 3;
|
|
IEncodeableType encodeableType = BuildComplexTypeWithAllBuiltInTypes(
|
|
structureType,
|
|
nameof(CreateComplexType));
|
|
Assert.That(encodeableType, Is.Not.Null);
|
|
|
|
IEncodeable instance = encodeableType.CreateInstance();
|
|
Assert.That(instance, Is.Not.Null);
|
|
|
|
var structure = instance as ComplexStructure;
|
|
Assert.That(structure, Is.Not.Null);
|
|
|
|
switch (structureType)
|
|
{
|
|
case StructureType.Structure:
|
|
case StructureType.StructureWithSubtypedValues:
|
|
Assert.That(structure, Is.Not.Null);
|
|
Assert.That(propertyBuiltInTypes, Is.EqualTo(structure.GetFields().Count));
|
|
break;
|
|
case StructureType.StructureWithOptionalFields:
|
|
var optionalFields = instance as Encoders.StructureWithOptionalFields;
|
|
Assert.That(optionalFields, Is.Not.Null);
|
|
Assert.That(optionalFields!.EncodingMask, Is.Zero);
|
|
Assert.That(
|
|
propertyBuiltInTypes,
|
|
Is.EqualTo(optionalFields.GetFields().Count));
|
|
break;
|
|
case StructureType.Union:
|
|
case StructureType.UnionWithSubtypedValues:
|
|
var union = instance as ComplexUnion;
|
|
Assert.That(union, Is.Not.Null);
|
|
Assert.That(union!.SwitchField, Is.Zero);
|
|
Assert.That(propertyBuiltInTypes, Is.EqualTo(union.GetFields().Count));
|
|
Assert.That(union.Value.IsNull, Is.True);
|
|
break;
|
|
}
|
|
|
|
IEncodeable encodeable = instance;
|
|
Assert.That(encodeable, Is.Not.Null);
|
|
|
|
foreach (IStructureField accessorName in structure!.GetFields())
|
|
{
|
|
_ = structure[accessorName.Name!];
|
|
}
|
|
|
|
for (int i = 0; i < structure.GetFields().Count; i++)
|
|
{
|
|
_ = structure[i];
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create a complex type with one data field set with default or random value.
|
|
/// </summary>
|
|
[Theory]
|
|
public void CreateComplexTypeWithData(StructureType structureType, bool randomValue)
|
|
{
|
|
int propertyBuiltInTypes = BuiltInTypes.Length - 1;
|
|
IEncodeableType encodeableType = BuildComplexTypeWithAllBuiltInTypes(
|
|
structureType,
|
|
nameof(CreateComplexTypeWithData) + "." + randomValue.ToString());
|
|
Assert.That(encodeableType, Is.Not.Null);
|
|
|
|
IEncodeable instance = encodeableType.CreateInstance();
|
|
var structure = instance as ComplexStructure;
|
|
Assert.That(structure, Is.Not.Null);
|
|
|
|
FillStructWithValues(structure, randomValue, NameSpaceUris);
|
|
|
|
var union = structure as ComplexUnion;
|
|
for (int i = 0; i < structure.GetFields().Count; i++)
|
|
{
|
|
Variant obj = structure[i];
|
|
if (structureType is StructureType.Union or StructureType.UnionWithSubtypedValues)
|
|
{
|
|
Assert.That(union, Is.Not.Null);
|
|
if (union.SwitchField == i + 1)
|
|
{
|
|
Assert.That(obj.IsNull, Is.False);
|
|
}
|
|
else
|
|
{
|
|
Assert.That(obj.IsNull, Is.True);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Assert.That(obj.IsNull, Is.False);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verify that the factory creates builders with correct namespace info.
|
|
/// </summary>
|
|
[Test]
|
|
public void CreateFactoryAndBuilder()
|
|
{
|
|
var factory = new DefaultComplexTypeFactory();
|
|
Assert.That(factory, Is.Not.Null);
|
|
|
|
IComplexTypeBuilder builder = factory.Create(
|
|
Namespaces.OpcUaEncoderTests, 5, "TestModule");
|
|
Assert.That(builder, Is.Not.Null);
|
|
Assert.That(builder.TargetNamespace, Is.EqualTo(Namespaces.OpcUaEncoderTests));
|
|
Assert.That(builder.TargetNamespaceIndex, Is.EqualTo(5));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verify that Clone/CreateInstance produces an equivalent but separate instance.
|
|
/// </summary>
|
|
[Theory]
|
|
public void CloneComplexType(StructureType structureType)
|
|
{
|
|
IEncodeableType encodeableType = BuildComplexTypeWithAllBuiltInTypes(
|
|
structureType,
|
|
nameof(CloneComplexType));
|
|
Assert.That(encodeableType, Is.Not.Null);
|
|
|
|
IEncodeable instance = encodeableType.CreateInstance();
|
|
var structure = instance as ComplexStructure;
|
|
Assert.That(structure, Is.Not.Null);
|
|
|
|
FillStructWithValues(structure, true, NameSpaceUris);
|
|
|
|
var cloned = structure.Clone() as ComplexStructure;
|
|
Assert.That(cloned, Is.Not.Null);
|
|
Assert.That(structure.IsEqual(cloned), Is.True);
|
|
Assert.That(ReferenceEquals(structure, cloned), Is.False);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verify the StructureType property of each type variant.
|
|
/// </summary>
|
|
[Theory]
|
|
public void VerifyStructureType(StructureType structureType)
|
|
{
|
|
IEncodeableType encodeableType = BuildComplexTypeWithAllBuiltInTypes(
|
|
structureType,
|
|
nameof(VerifyStructureType));
|
|
Assert.That(encodeableType, Is.Not.Null);
|
|
|
|
IEncodeable instance = encodeableType.CreateInstance();
|
|
var structureTypeInfo = instance as IStructureTypeInfo;
|
|
Assert.That(structureTypeInfo, Is.Not.Null);
|
|
|
|
switch (structureType)
|
|
{
|
|
case StructureType.Structure:
|
|
case StructureType.StructureWithSubtypedValues:
|
|
Assert.That(
|
|
structureTypeInfo.StructureType,
|
|
Is.EqualTo(StructureType.Structure));
|
|
break;
|
|
case StructureType.StructureWithOptionalFields:
|
|
Assert.That(
|
|
structureTypeInfo.StructureType,
|
|
Is.EqualTo(StructureType.StructureWithOptionalFields));
|
|
break;
|
|
case StructureType.Union:
|
|
case StructureType.UnionWithSubtypedValues:
|
|
Assert.That(
|
|
structureTypeInfo.StructureType,
|
|
Is.EqualTo(StructureType.Union));
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|