mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55: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>
203 lines
7.9 KiB
C#
203 lines
7.9 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 Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Core.Tests.Stack.State
|
|
{
|
|
/// <summary>
|
|
/// Tests for the handwritten MultiStateValueDiscreteState write validation which
|
|
/// rejects numeric writes that do not match an EnumValues entry and refreshes the
|
|
/// ValueAsText property on a successful scalar write.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("NodeState")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class MultiStateValueDiscreteStateTests
|
|
{
|
|
// Deliberately sparse / non-zero-based to exercise the EnumValues lookup.
|
|
private static readonly (long Value, string Name)[] s_states =
|
|
[(1, "one"), (2, "two"), (4, "four"), (8, "eight")];
|
|
|
|
private SystemContext m_context;
|
|
|
|
[OneTimeSetUp]
|
|
public void OneTimeSetUp()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var messageContext = ServiceMessageContext.CreateEmpty(telemetry);
|
|
m_context = new SystemContext(telemetry)
|
|
{
|
|
NamespaceUris = messageContext.NamespaceUris,
|
|
ServerUris = messageContext.ServerUris,
|
|
EncodeableFactory = messageContext.Factory,
|
|
TypeTable = new TypeTable(messageContext.NamespaceUris)
|
|
};
|
|
}
|
|
|
|
[Test]
|
|
public void WriteMatchingSparseValueSucceeds()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode(s_states);
|
|
|
|
ServiceResult result = WriteValue(node, Variant.From((uint)4));
|
|
|
|
Assert.That(ServiceResult.IsGood(result), Is.True);
|
|
Assert.That(node.WrappedValue.TryGetValue(out uint written), Is.True);
|
|
Assert.That(written, Is.EqualTo(4u));
|
|
}
|
|
|
|
[Test]
|
|
public void WriteMatchingValueUpdatesValueAsText()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode(s_states);
|
|
|
|
ServiceResult result = WriteValue(node, Variant.From((uint)8));
|
|
|
|
Assert.That(ServiceResult.IsGood(result), Is.True);
|
|
Assert.That(node.ValueAsText, Is.Not.Null);
|
|
Assert.That(node.ValueAsText.WrappedValue.TryGetValue(out LocalizedText text), Is.True);
|
|
Assert.That(text.Text, Is.EqualTo("eight"));
|
|
}
|
|
|
|
[Test]
|
|
public void WriteValueBetweenGapsReturnsBadOutOfRange()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode(s_states);
|
|
|
|
ServiceResult result = WriteValue(node, Variant.From((uint)3));
|
|
|
|
Assert.That(result.StatusCode.Code, Is.EqualTo(StatusCodes.BadOutOfRange));
|
|
}
|
|
|
|
[Test]
|
|
public void WriteValueBetweenGapsLeavesValueAsTextUnchanged()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode(s_states);
|
|
|
|
_ = WriteValue(node, Variant.From((uint)3));
|
|
|
|
Assert.That(node.ValueAsText, Is.Not.Null);
|
|
Assert.That(node.ValueAsText.WrappedValue.TryGetValue(out LocalizedText text), Is.True);
|
|
Assert.That(text.Text, Is.EqualTo("initial"));
|
|
}
|
|
|
|
[Test]
|
|
public void WriteWithEmptyEnumValuesRejectsEveryValue()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode([]);
|
|
|
|
ServiceResult result = WriteValue(node, Variant.From((uint)1));
|
|
|
|
Assert.That(result.StatusCode.Code, Is.EqualTo(StatusCodes.BadOutOfRange));
|
|
}
|
|
|
|
[Test]
|
|
public void WriteWithoutEnumValuesChildFallsThroughToBase()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode(null!);
|
|
|
|
ServiceResult result = WriteValue(node, Variant.From((uint)99));
|
|
|
|
Assert.That(ServiceResult.IsGood(result), Is.True);
|
|
Assert.That(node.WrappedValue.TryGetValue(out uint written), Is.True);
|
|
Assert.That(written, Is.EqualTo(99u));
|
|
}
|
|
|
|
[Test]
|
|
public void WriteMatchingButNotWritableReturnsBadNotWritable()
|
|
{
|
|
MultiStateValueDiscreteState node = CreateNode(s_states);
|
|
node.AccessLevel = AccessLevels.CurrentRead;
|
|
node.UserAccessLevel = AccessLevels.CurrentRead;
|
|
|
|
ServiceResult result = WriteValue(node, Variant.From((uint)4));
|
|
|
|
Assert.That(result.StatusCode.Code, Is.EqualTo(StatusCodes.BadNotWritable));
|
|
}
|
|
|
|
private MultiStateValueDiscreteState CreateNode((long Value, string Name)[] states)
|
|
{
|
|
var node = new MultiStateValueDiscreteState(null)
|
|
{
|
|
NodeId = new NodeId(1000),
|
|
BrowseName = new QualifiedName("States"),
|
|
DataType = DataTypeIds.UInt32,
|
|
ValueRank = ValueRanks.Scalar,
|
|
AccessLevel = AccessLevels.CurrentReadOrWrite,
|
|
UserAccessLevel = AccessLevels.CurrentReadOrWrite,
|
|
Value = Variant.From((uint)0)
|
|
};
|
|
|
|
if (states != null)
|
|
{
|
|
var values = new EnumValueType[states.Length];
|
|
for (int ii = 0; ii < states.Length; ii++)
|
|
{
|
|
LocalizedText text = LocalizedText.From(states[ii].Name);
|
|
values[ii] = new EnumValueType
|
|
{
|
|
Value = states[ii].Value,
|
|
DisplayName = text,
|
|
Description = text
|
|
};
|
|
}
|
|
|
|
node.EnumValues = PropertyState<ArrayOf<EnumValueType>>
|
|
.With<StructureBuilder<EnumValueType>>(node, values.ToArrayOf());
|
|
node.EnumValues.NodeId = new NodeId(1001);
|
|
node.EnumValues.BrowseName = new QualifiedName(BrowseNames.EnumValues);
|
|
node.EnumValues.DataType = DataTypeIds.EnumValueType;
|
|
node.EnumValues.ValueRank = ValueRanks.OneDimension;
|
|
}
|
|
|
|
node.ValueAsText = PropertyState<LocalizedText>.With<VariantBuilder>(
|
|
node, LocalizedText.From("initial"));
|
|
node.ValueAsText.NodeId = new NodeId(1002);
|
|
node.ValueAsText.BrowseName = new QualifiedName(BrowseNames.ValueAsText);
|
|
node.ValueAsText.DataType = DataTypeIds.LocalizedText;
|
|
node.ValueAsText.ValueRank = ValueRanks.Scalar;
|
|
|
|
return node;
|
|
}
|
|
|
|
private ServiceResult WriteValue(MultiStateValueDiscreteState node, Variant value)
|
|
{
|
|
return node.WriteAttribute(
|
|
m_context,
|
|
Attributes.Value,
|
|
NumericRange.Null,
|
|
new DataValue(value));
|
|
}
|
|
}
|
|
}
|