mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 08:41:51 +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>
327 lines
13 KiB
C#
327 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.Client.Alarms;
|
|
using Opc.Ua.Client.StateMachines;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
using Opc.Ua.Client.Subscriptions.Streaming;
|
|
using Opc.Ua.Tests;
|
|
using MonitoringOptions = Opc.Ua.Client.Subscriptions.MonitoredItems.MonitoredItemOptions;
|
|
|
|
// Local fake IStreamingSubscription test types are no-op IAsyncDisposable
|
|
// instances with nothing to dispose; CA2000's leak warning does not apply.
|
|
#pragma warning disable CA2000
|
|
|
|
namespace Opc.Ua.Client.Tests.Alarms
|
|
{
|
|
/// <summary>
|
|
/// Tests for the Part 16 state-machine partial on
|
|
/// <see cref="AlarmClient"/>. Drives the
|
|
/// <c>ShelvedStateMachineTypeClient</c> proxy via a mocked
|
|
/// <see cref="ISessionClient"/> and asserts the wired-up
|
|
/// condition's <c>ShelvingState</c> child is resolved before the
|
|
/// state-machine proxy is used.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("Alarms")]
|
|
[Parallelizable]
|
|
public sealed class AlarmClientStateMachineTests
|
|
{
|
|
private Mock<ISessionClient> m_sessionMock = null!;
|
|
private AlarmClient m_client = null!;
|
|
private NodeId m_conditionId;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_sessionMock = new Mock<ISessionClient>(MockBehavior.Loose);
|
|
m_sessionMock.SetupGet(s => s.MessageContext)
|
|
.Returns(ServiceMessageContext.Create(NUnitTelemetryContext.Create()));
|
|
m_client = new AlarmClient(m_sessionMock.Object, NUnitTelemetryContext.Create());
|
|
m_conditionId = new NodeId(77u, 4);
|
|
}
|
|
|
|
[Test]
|
|
public async Task GetShelvingStateAsyncResolvesShelvingStateChildBeforeReadingStateAsync()
|
|
{
|
|
var shelvingStateId = new NodeId(100u, 4);
|
|
var captured = new List<ArrayOf<BrowsePath>>();
|
|
SetupShelvingTranslate(
|
|
shelvingStateId,
|
|
capture: p => captured.Add(p),
|
|
finiteResults:
|
|
[
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult()
|
|
]);
|
|
|
|
FiniteStateSnapshot snapshot = await m_client
|
|
.GetShelvingStateAsync(m_conditionId).ConfigureAwait(false);
|
|
|
|
Assert.That(snapshot, Is.Not.Null);
|
|
Assert.That(captured, Has.Count.EqualTo(2));
|
|
Assert.That(captured[0][0].StartingNode, Is.EqualTo(m_conditionId));
|
|
Assert.That(captured[0][0].RelativePath.Elements[0].TargetName.Name,
|
|
Is.EqualTo(BrowseNames.ShelvingState));
|
|
Assert.That(captured[1], Has.Count.EqualTo(4));
|
|
Assert.That(captured[1][0].StartingNode, Is.EqualTo(shelvingStateId));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GetShelvingStateAsyncReturnsBadNotFoundWhenNoBrowsePathsResolve()
|
|
{
|
|
SetupTranslate(allEmpty: true, capture: null);
|
|
|
|
FiniteStateSnapshot snapshot = await m_client
|
|
.GetShelvingStateAsync(m_conditionId).ConfigureAwait(false);
|
|
|
|
Assert.That(snapshot.StateMachineId, Is.EqualTo(m_conditionId));
|
|
Assert.That(snapshot.CurrentState.IsNull, Is.True);
|
|
Assert.That(snapshot.CurrentStateId.IsNull, Is.True);
|
|
Assert.That(snapshot.Status, Is.EqualTo(StatusCodes.BadNotFound));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GetShelvingStateAsyncReturnsParsedLocalizedTextFromRead()
|
|
{
|
|
// Resolve CurrentState only (path 0). The remaining 3 paths
|
|
// return empty targets — the snapshot is built from a single
|
|
// Read of the CurrentState variable.
|
|
var currentStateNodeId = new NodeId(101u, 0);
|
|
SetupShelvingTranslate(
|
|
new NodeId(100u, 4),
|
|
capture: null,
|
|
finiteResults:
|
|
[
|
|
MakeResult((ExpandedNodeId)currentStateNodeId),
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult()
|
|
]);
|
|
|
|
var expected = new LocalizedText("en", "Unshelved");
|
|
m_sessionMock.Setup(s => s.ReadAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<double>(),
|
|
It.IsAny<TimestampsToReturn>(),
|
|
It.IsAny<ArrayOf<ReadValueId>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns(new ValueTask<ReadResponse>(new ReadResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped(
|
|
[
|
|
new DataValue(Variant.From(expected))
|
|
]),
|
|
DiagnosticInfos = []
|
|
}));
|
|
|
|
FiniteStateSnapshot snapshot = await m_client
|
|
.GetShelvingStateAsync(m_conditionId).ConfigureAwait(false);
|
|
|
|
Assert.That(snapshot.CurrentState, Is.EqualTo(expected));
|
|
Assert.That(snapshot.StateMachineId, Is.EqualTo(new NodeId(100u, 4)));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ObserveShelvingTransitionsAsyncReturnsNonNullEnumerableForFakeStream()
|
|
{
|
|
SetupTranslate(allEmpty: true, capture: null);
|
|
var streaming = new EmptyStreamingSubscription();
|
|
|
|
IAsyncEnumerable<FiniteStateSnapshot> enumerable =
|
|
m_client.ObserveShelvingTransitionsAsync(m_conditionId, streaming);
|
|
Assert.That(enumerable, Is.Not.Null);
|
|
|
|
// When no CurrentState.Id child resolves, the underlying
|
|
// implementation yields no items but iterates cleanly.
|
|
int count = 0;
|
|
await foreach (FiniteStateSnapshot _ in enumerable.ConfigureAwait(false))
|
|
{
|
|
count++;
|
|
}
|
|
Assert.That(count, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public void ObserveShelvingTransitionsAsyncReturnsEmptyWhenShelvingStateIsAbsent()
|
|
{
|
|
SetupTranslate(allEmpty: true, capture: null);
|
|
|
|
IAsyncEnumerable<FiniteStateSnapshot> enumerable =
|
|
m_client.ObserveShelvingTransitionsAsync(
|
|
m_conditionId,
|
|
new EmptyStreamingSubscription());
|
|
|
|
Assert.That(
|
|
async () =>
|
|
{
|
|
await foreach (FiniteStateSnapshot _ in enumerable.ConfigureAwait(false))
|
|
{
|
|
}
|
|
},
|
|
Throws.Nothing);
|
|
}
|
|
|
|
private void SetupTranslate(
|
|
bool allEmpty,
|
|
Action<ArrayOf<BrowsePath>>? capture)
|
|
{
|
|
var results = ArrayOf.Wrapped(
|
|
[
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult(),
|
|
MakeEmptyResult()
|
|
]);
|
|
_ = allEmpty;
|
|
SetupTranslate(results, capture);
|
|
}
|
|
|
|
private void SetupTranslate(
|
|
ArrayOf<BrowsePathResult> results,
|
|
Action<ArrayOf<BrowsePath>>? capture)
|
|
{
|
|
m_sessionMock.Setup(s => s.TranslateBrowsePathsToNodeIdsAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<BrowsePath>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Callback<RequestHeader, ArrayOf<BrowsePath>, CancellationToken>(
|
|
(_, r, _) => capture?.Invoke(r))
|
|
.Returns(new ValueTask<TranslateBrowsePathsToNodeIdsResponse>(
|
|
new TranslateBrowsePathsToNodeIdsResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = results,
|
|
DiagnosticInfos = []
|
|
}));
|
|
}
|
|
|
|
private void SetupShelvingTranslate(
|
|
NodeId shelvingStateId,
|
|
Action<ArrayOf<BrowsePath>>? capture,
|
|
ArrayOf<BrowsePathResult> finiteResults)
|
|
{
|
|
int callCount = 0;
|
|
m_sessionMock.Setup(s => s.TranslateBrowsePathsToNodeIdsAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<BrowsePath>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Callback<RequestHeader, ArrayOf<BrowsePath>, CancellationToken>(
|
|
(_, paths, _) => capture?.Invoke(paths))
|
|
.Returns<RequestHeader, ArrayOf<BrowsePath>, CancellationToken>(
|
|
(_, _, _) =>
|
|
{
|
|
ArrayOf<BrowsePathResult> results = callCount++ == 0
|
|
? ArrayOf.Wrapped([MakeResult((ExpandedNodeId)shelvingStateId)])
|
|
: finiteResults;
|
|
return new ValueTask<TranslateBrowsePathsToNodeIdsResponse>(
|
|
new TranslateBrowsePathsToNodeIdsResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = results,
|
|
DiagnosticInfos = []
|
|
});
|
|
});
|
|
}
|
|
|
|
private static BrowsePathResult MakeResult(ExpandedNodeId target)
|
|
{
|
|
return new()
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
Targets = ArrayOf.Wrapped(
|
|
[
|
|
new BrowsePathTarget { TargetId = target }
|
|
])
|
|
};
|
|
}
|
|
|
|
private static BrowsePathResult MakeEmptyResult()
|
|
{
|
|
return new()
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
Targets = default
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Minimal <see cref="IStreamingSubscription"/> that yields no
|
|
/// notifications. Used for tests where the underlying state
|
|
/// machine resolves no CurrentState.Id child node.
|
|
/// </summary>
|
|
private sealed class EmptyStreamingSubscription : IStreamingSubscription
|
|
{
|
|
public async IAsyncEnumerable<DataValueChange> SubscribeDataChangesAsync(
|
|
NodeId nodeId,
|
|
MonitoringOptions? options = null,
|
|
[EnumeratorCancellation] CancellationToken ct = default)
|
|
{
|
|
await Task.Yield();
|
|
yield break;
|
|
}
|
|
|
|
public async IAsyncEnumerable<DataValueChange> SubscribeDataChangesAsync(
|
|
IReadOnlyList<NodeId> nodeIds,
|
|
MonitoringOptions? options = null,
|
|
[EnumeratorCancellation] CancellationToken ct = default)
|
|
{
|
|
await Task.Yield();
|
|
yield break;
|
|
}
|
|
|
|
public async IAsyncEnumerable<EventNotification> SubscribeEventsAsync(
|
|
NodeId notifierId,
|
|
EventFilter filter,
|
|
MonitoringOptions? options = null,
|
|
[EnumeratorCancellation] CancellationToken ct = default)
|
|
{
|
|
await Task.Yield();
|
|
yield break;
|
|
}
|
|
|
|
public ValueTask DisposeAsync()
|
|
{
|
|
return default;
|
|
}
|
|
}
|
|
}
|
|
}
|