mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 09:37:12 +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>
331 lines
13 KiB
C#
331 lines
13 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.Runtime.CompilerServices;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.Fluent;
|
|
|
|
#pragma warning disable CA2000
|
|
|
|
namespace Opc.Ua.Server.Tests.Fluent
|
|
{
|
|
/// <summary>
|
|
/// Tests for <see cref="RuntimeValueBuilderExtensions"/> and
|
|
/// <see cref="IValueUpdater{TValue}"/> — the runtime value-update surface
|
|
/// that pushes changes to subscribed MonitoredItems after the fluent
|
|
/// builder is sealed (issue #3973).
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Fluent")]
|
|
public class RuntimeValueBuilderExtensionsTests
|
|
{
|
|
private const ushort kNs = 2;
|
|
|
|
[Test]
|
|
public void BindThrowsOnNullBuilder()
|
|
{
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => RuntimeValueBuilderExtensions.Bind<double>(
|
|
null!, out _));
|
|
}
|
|
|
|
[Test]
|
|
public void BindSetValueUpdatesNodeAndRaisesValueChange()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
IVariableBuilder<double> vb = h.Builder.Variable<double>(h.VariableId);
|
|
vb.Bind(out IValueUpdater<double> updater);
|
|
|
|
Func<int> notifications = CountValueChanges(h.Variable);
|
|
|
|
updater.SetValue(42.5);
|
|
|
|
Assert.That(
|
|
h.Variable.WrappedValue.TryGetValue(out double stored), Is.True);
|
|
Assert.That(stored, Is.EqualTo(42.5));
|
|
Assert.That(
|
|
(uint)h.Variable.StatusCode.Code,
|
|
Is.EqualTo((uint)StatusCodes.Good));
|
|
Assert.That(notifications(), Is.GreaterThanOrEqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void SetValueAppliesStatusCodeAndTimestamp()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
IVariableBuilder<double> vb = h.Builder.Variable<double>(h.VariableId);
|
|
vb.Bind(out IValueUpdater<double> updater);
|
|
|
|
var timestamp = new DateTime(2030, 1, 2, 3, 4, 5, DateTimeKind.Utc);
|
|
updater.SetValue(7.0, StatusCodes.BadNoData, timestamp);
|
|
|
|
Assert.That(
|
|
(uint)h.Variable.StatusCode.Code,
|
|
Is.EqualTo((uint)StatusCodes.BadNoData));
|
|
Assert.That(
|
|
((DateTime)h.Variable.Timestamp).ToUniversalTime(),
|
|
Is.EqualTo(timestamp));
|
|
}
|
|
|
|
[Test]
|
|
public void NotifyChangeRaisesValueChangeWithoutMutatingValue()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
IVariableBuilder<double> vb = h.Builder.Variable<double>(h.VariableId);
|
|
vb.Bind(out IValueUpdater<double> updater);
|
|
updater.SetValue(11.0);
|
|
|
|
Func<int> notifications = CountValueChanges(h.Variable);
|
|
updater.NotifyChange();
|
|
|
|
Assert.That(h.Variable.WrappedValue.TryGetValue(out double stored), Is.True);
|
|
Assert.That(stored, Is.EqualTo(11.0));
|
|
Assert.That(notifications(), Is.GreaterThanOrEqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void PollEveryThrowsWhenManagerIsNotFluent()
|
|
{
|
|
using var h = RuntimeHarness.CreateWithoutFluentBase();
|
|
IVariableBuilder<double> vb = h.Builder.Variable<double>(h.VariableId);
|
|
|
|
ServiceResultException ex = Assert.Throws<ServiceResultException>(
|
|
() => vb.PollEvery(TimeSpan.FromMilliseconds(25), () => 1.0))!;
|
|
Assert.That(
|
|
ex.StatusCode, Is.EqualTo((uint)StatusCodes.BadConfigurationError));
|
|
}
|
|
|
|
[Test]
|
|
public void PollEveryValidatesArguments()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
IVariableBuilder<double> vb = h.Builder.Variable<double>(h.VariableId);
|
|
|
|
Assert.Throws<ArgumentNullException>(
|
|
() => vb.PollEvery(TimeSpan.FromMilliseconds(25), (Func<double>)null!));
|
|
Assert.Throws<ArgumentOutOfRangeException>(
|
|
() => vb.PollEvery(TimeSpan.Zero, () => 1.0));
|
|
}
|
|
|
|
[Test]
|
|
public void PollEveryPrimesInitialValueImmediately()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
h.Builder.Variable<double>(h.VariableId)
|
|
.PollEvery(TimeSpan.FromMilliseconds(25), () => 3.25);
|
|
|
|
Assert.That(h.Variable.WrappedValue.TryGetValue(out double stored), Is.True);
|
|
Assert.That(stored, Is.EqualTo(3.25));
|
|
}
|
|
|
|
[Test]
|
|
public async Task PollEveryPushesChangesToSubscribers()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
double current = 1.0;
|
|
h.Builder.Variable<double>(h.VariableId)
|
|
.PollEvery(TimeSpan.FromMilliseconds(25), () => Volatile.Read(ref current));
|
|
|
|
Func<int> notifications = CountValueChanges(h.Variable);
|
|
await h.Builder.SealAsync();
|
|
|
|
Volatile.Write(ref current, 2.0);
|
|
|
|
await WaitForAsync(
|
|
() => h.Variable.WrappedValue.TryGetValue(out double d) && d == 2.0,
|
|
"Sampled value change should update the node.")
|
|
.ConfigureAwait(false);
|
|
Assert.That(
|
|
notifications(),
|
|
Is.GreaterThanOrEqualTo(1),
|
|
"A change notification should reach subscribed MonitoredItems.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task PollEveryDoesNotNotifyWhenValueUnchanged()
|
|
{
|
|
using var h = RuntimeHarness.Create();
|
|
h.Builder.Variable<double>(h.VariableId)
|
|
.PollEvery(TimeSpan.FromMilliseconds(25), () => 5.0);
|
|
|
|
Func<int> notifications = CountValueChanges(h.Variable);
|
|
await h.Builder.SealAsync();
|
|
|
|
// Let several ticks elapse; the constant getter must not raise
|
|
// repeated value-change notifications.
|
|
await Task.Delay(150).ConfigureAwait(false);
|
|
Assert.That(notifications(), Is.Zero);
|
|
}
|
|
|
|
private static Func<int> CountValueChanges(BaseVariableState variable)
|
|
{
|
|
var box = new StrongBox<int>(0);
|
|
NodeStateChangedHandler? previous = variable.OnStateChanged;
|
|
variable.OnStateChanged = (ctx, node, mask) =>
|
|
{
|
|
previous?.Invoke(ctx, node, mask);
|
|
if ((mask & NodeStateChangeMasks.Value) != 0)
|
|
{
|
|
Interlocked.Increment(ref box.Value);
|
|
}
|
|
};
|
|
return () => Volatile.Read(ref box.Value);
|
|
}
|
|
|
|
private static async Task WaitForAsync(
|
|
Func<bool> condition,
|
|
string? message = null,
|
|
int timeoutMs = 5000)
|
|
{
|
|
DateTime end = DateTime.UtcNow + TimeSpan.FromMilliseconds(timeoutMs);
|
|
while (!condition())
|
|
{
|
|
if (DateTime.UtcNow > end)
|
|
{
|
|
Assert.Fail(
|
|
message ?? $"Condition not satisfied within {timeoutMs}ms.");
|
|
}
|
|
await Task.Delay(10).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Test harness with a resolvable <see cref="BaseDataVariableState{T}"/>
|
|
/// and (optionally) a <see cref="FluentNodeManagerBase"/> owner so the
|
|
/// <c>PollEvery</c> sampling loop has a simulation registry to attach to.
|
|
/// </summary>
|
|
private sealed class RuntimeHarness : IDisposable
|
|
{
|
|
internal NodeManagerBuilder Builder { get; private set; } = null!;
|
|
internal BaseDataVariableState<double> Variable { get; private set; } = null!;
|
|
internal NodeId VariableId { get; private set; }
|
|
|
|
private TestFluentManager? m_manager;
|
|
|
|
internal static RuntimeHarness Create()
|
|
{
|
|
var harness = new RuntimeHarness
|
|
{
|
|
m_manager = new TestFluentManager()
|
|
};
|
|
ServerSystemContext ctx = harness.m_manager.SystemContext;
|
|
harness.BuildVariable();
|
|
harness.Builder = harness.CreateBuilder(ctx, harness.m_manager);
|
|
harness.m_manager.AttachToBuilder(harness.Builder);
|
|
return harness;
|
|
}
|
|
|
|
internal static RuntimeHarness CreateWithoutFluentBase()
|
|
{
|
|
var harness = new RuntimeHarness();
|
|
var ctx = new SystemContext(telemetry: null!)
|
|
{
|
|
NamespaceUris = CreateNamespaceTable()
|
|
};
|
|
harness.BuildVariable();
|
|
harness.Builder = harness.CreateBuilder(ctx, FluentTestNodeManager.Create(kNs));
|
|
return harness;
|
|
}
|
|
|
|
private NodeManagerBuilder CreateBuilder(
|
|
ISystemContext ctx, IAsyncNodeManager manager)
|
|
{
|
|
var byId = new Dictionary<NodeId, NodeState> { [Variable.NodeId] = Variable };
|
|
return new NodeManagerBuilder(
|
|
ctx,
|
|
manager,
|
|
defaultNamespaceIndex: kNs,
|
|
rootResolver: _ => null!,
|
|
nodeIdResolver: id => byId.TryGetValue(id, out NodeState? n) ? n! : null!,
|
|
typeIdResolver: _ => []);
|
|
}
|
|
|
|
private void BuildVariable()
|
|
{
|
|
var variable = BaseDataVariableState<double>.With<VariantBuilder>(parent: null!);
|
|
variable.NodeId = new NodeId("Root.Value", kNs);
|
|
variable.BrowseName = new QualifiedName("Value", kNs);
|
|
variable.DisplayName = new LocalizedText("Value");
|
|
variable.DataType = DataTypeIds.Double;
|
|
variable.ValueRank = ValueRanks.Scalar;
|
|
variable.Value = 0.0;
|
|
Variable = variable;
|
|
VariableId = variable.NodeId;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
m_manager?.Dispose();
|
|
m_manager = null;
|
|
}
|
|
}
|
|
|
|
private static NamespaceTable CreateNamespaceTable()
|
|
{
|
|
var ns = new NamespaceTable();
|
|
ns.Append(Ua.Namespaces.OpcUa);
|
|
return ns;
|
|
}
|
|
|
|
private sealed class TestFluentManager : FluentNodeManagerBase
|
|
{
|
|
public TestFluentManager()
|
|
: base(CreateMockServer(), TestNamespaceUri)
|
|
{
|
|
}
|
|
|
|
private const string TestNamespaceUri = "urn:test:runtime-value";
|
|
|
|
private static IServerInternal CreateMockServer()
|
|
{
|
|
NamespaceTable ns = CreateNamespaceTable();
|
|
|
|
var mockTelemetry = new Mock<ITelemetryContext>();
|
|
var mock = new Mock<IServerInternal>();
|
|
mock.SetupGet(m => m.NamespaceUris).Returns(ns);
|
|
|
|
// Sealing activates behaviors, and PollEvery registers one, so the
|
|
// type table has to be real rather than absent.
|
|
mock.SetupGet(m => m.TypeTree).Returns(new TypeTable(ns));
|
|
mock.SetupGet(m => m.Telemetry).Returns(mockTelemetry.Object);
|
|
IServiceMessageContext msgCtx = ServiceMessageContext.Create(mockTelemetry.Object);
|
|
mock.SetupGet(m => m.MessageContext).Returns(msgCtx);
|
|
mock.SetupGet(m => m.DefaultSystemContext).Returns(
|
|
new ServerSystemContext(mock.Object));
|
|
return mock.Object;
|
|
}
|
|
}
|
|
}
|
|
}
|