mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +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>
191 lines
8.5 KiB
C#
191 lines
8.5 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 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.IO;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using NUnit.Framework.Interfaces;
|
|
using NUnit.Framework.Internal;
|
|
using Opc.Ua.Server.TestFramework;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
/// <summary>
|
|
/// Keeps exhaustive browse diagnostics out of NUnit's retained output buffers.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// NUnit copies only output from these isolated results to the runner's result, not attachments.
|
|
/// Deleting the inspected isolated attachments therefore does not remove runner-collected diagnostics.
|
|
/// </remarks>
|
|
[TestFixture]
|
|
[Parallelizable(ParallelScope.All)]
|
|
public sealed class CommonTestWorkersOutputTests
|
|
{
|
|
/// <summary>
|
|
/// Preserves all browse results and optional diagnostic lines with bounded inline output.
|
|
/// </summary>
|
|
[TestCase(0, false)]
|
|
[TestCase(0, true)]
|
|
[TestCase(1, false)]
|
|
[TestCase(1, true)]
|
|
[TestCase(4096, false)]
|
|
[TestCase(4096, true)]
|
|
public async Task BrowseFullAddressSpaceKeepsInlineOutputBounded(int referenceCount, bool outputResult)
|
|
{
|
|
ReferenceDescription[] expected = CreateReferences(referenceCount);
|
|
Mock<IServerTestServices> services = CreateServices(expected);
|
|
|
|
using var isolatedContext = new TestExecutionContext.IsolatedContext();
|
|
TestResult result = TestExecutionContext.CurrentContext.CurrentResult;
|
|
try
|
|
{
|
|
ArrayOf<ReferenceDescription> references =
|
|
await CommonTestWorkers.BrowseFullAddressSpaceWorkerAsync(
|
|
services.Object,
|
|
new RequestHeader(),
|
|
outputResult: outputResult).ConfigureAwait(false);
|
|
|
|
Assert.That(references.ToArray(), Is.EqualTo(expected));
|
|
Assert.That(result.Output, Does.StartWith($"Found {referenceCount} references on server."));
|
|
Assert.That(result.Output, Has.Length.LessThan(1024),
|
|
"NUnit and VSTest retain and serialize inline output; exhaustive listings belong in attachments.");
|
|
Assert.That(result.TestAttachments, Has.Count.EqualTo(outputResult ? 1 : 0));
|
|
|
|
if (outputResult)
|
|
{
|
|
await AssertAttachmentAsync(result.TestAttachments.Single(), expected).ConfigureAwait(false);
|
|
}
|
|
services.Verify(service => service.BrowseAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ViewDescription>(),
|
|
It.IsAny<uint>(),
|
|
It.IsAny<ArrayOf<BrowseDescription>>(),
|
|
It.IsAny<CancellationToken>()),
|
|
Times.Exactly(referenceCount == 0 ? 2 : 3));
|
|
}
|
|
finally
|
|
{
|
|
foreach (TestAttachment attachment in result.TestAttachments)
|
|
{
|
|
File.Delete(attachment.FilePath);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Repeated dumps from one test must not overwrite earlier attached diagnostics.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task BrowseFullAddressSpaceCreatesDistinctAttachments()
|
|
{
|
|
using var isolatedContext = new TestExecutionContext.IsolatedContext();
|
|
TestResult result = TestExecutionContext.CurrentContext.CurrentResult;
|
|
try
|
|
{
|
|
for (int count = 1; count <= 2; count++)
|
|
{
|
|
await CommonTestWorkers.BrowseFullAddressSpaceWorkerAsync(
|
|
CreateServices(CreateReferences(count)).Object,
|
|
new RequestHeader(),
|
|
outputResult: true).ConfigureAwait(false);
|
|
}
|
|
|
|
TestAttachment[] attachments = [.. result.TestAttachments];
|
|
Assert.That(attachments, Has.Length.EqualTo(2));
|
|
Assert.That(attachments[0].FilePath, Is.Not.EqualTo(attachments[1].FilePath));
|
|
await AssertAttachmentAsync(attachments[0], CreateReferences(1)).ConfigureAwait(false);
|
|
await AssertAttachmentAsync(attachments[1], CreateReferences(2)).ConfigureAwait(false);
|
|
}
|
|
finally
|
|
{
|
|
foreach (TestAttachment attachment in result.TestAttachments)
|
|
{
|
|
File.Delete(attachment.FilePath);
|
|
}
|
|
}
|
|
}
|
|
|
|
private static ReferenceDescription[] CreateReferences(int count)
|
|
{
|
|
return [.. Enumerable.Range(0, count).Select(index => new ReferenceDescription
|
|
{
|
|
NodeId = new ExpandedNodeId($"leaf-{index:D4}-{new string('x', 256)}", 1),
|
|
NodeClass = NodeClass.Object,
|
|
BrowseName = new QualifiedName($"Node{index:D4}\u00b5", 1)
|
|
})];
|
|
}
|
|
|
|
private static Mock<IServerTestServices> CreateServices(ReferenceDescription[] references)
|
|
{
|
|
var services = new Mock<IServerTestServices>(MockBehavior.Strict);
|
|
var messageContext = new Mock<IServiceMessageContext>();
|
|
messageContext.SetupGet(context => context.NamespaceUris).Returns(new NamespaceTable());
|
|
services.SetupGet(service => service.MessageContext).Returns(messageContext.Object);
|
|
services.SetupGet(service => service.Logger).Returns(NullLogger.Instance);
|
|
services.SetupSequence(service => service.BrowseAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ViewDescription>(),
|
|
It.IsAny<uint>(),
|
|
It.IsAny<ArrayOf<BrowseDescription>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.ThrowsAsync(new ServiceResultException(StatusCodes.BadNothingToDo))
|
|
.ReturnsAsync(new BrowseResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = [new BrowseResult { References = references }]
|
|
})
|
|
.ReturnsAsync(new BrowseResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = references.Select(_ => new BrowseResult()).ToArray()
|
|
});
|
|
return services;
|
|
}
|
|
|
|
private static async Task AssertAttachmentAsync(
|
|
TestAttachment attachment,
|
|
ReferenceDescription[] expected)
|
|
{
|
|
Assert.That(attachment.Description, Is.EqualTo("Full address-space browse results"));
|
|
using var reader = new StreamReader(attachment.FilePath);
|
|
foreach (ReferenceDescription reference in expected)
|
|
{
|
|
string line = (await reader.ReadLineAsync().ConfigureAwait(false))!;
|
|
Assert.That(line,
|
|
Is.EqualTo($"NodeId {reference.NodeId} {reference.NodeClass} {reference.BrowseName}"));
|
|
}
|
|
Assert.That(await reader.ReadLineAsync().ConfigureAwait(false), Is.Null);
|
|
}
|
|
}
|
|
}
|