mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-26 04:19:53 +08:00
# 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>
365 lines
15 KiB
C#
365 lines
15 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.Collections.Generic;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
[TestFixture]
|
|
[Category("AverageAggregateCalculator")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public class AverageAggregateCalculatorTests
|
|
{
|
|
private ITelemetryContext m_telemetry;
|
|
private AggregateConfiguration m_configuration;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_telemetry = NUnitTelemetryContext.Create();
|
|
m_configuration = new AggregateConfiguration
|
|
{
|
|
TreatUncertainAsBad = false,
|
|
PercentDataBad = 100,
|
|
PercentDataGood = 100,
|
|
UseSlopedExtrapolation = false
|
|
};
|
|
}
|
|
|
|
private static List<DataValue> CreateDataValues(
|
|
DateTimeUtc startTime, double[] values, double intervalMs = 1000)
|
|
{
|
|
var dataValues = new List<DataValue>();
|
|
for (int i = 0; i < values.Length; i++)
|
|
{
|
|
dataValues.Add(new DataValue(
|
|
new Variant(values[i]),
|
|
StatusCodes.Good,
|
|
startTime.AddMilliseconds(i * intervalMs),
|
|
startTime.AddMilliseconds(i * intervalMs)));
|
|
}
|
|
return dataValues;
|
|
}
|
|
|
|
private DataValue ComputeAggregate(
|
|
NodeId aggregateId,
|
|
List<DataValue> values,
|
|
DateTimeUtc startTime,
|
|
DateTimeUtc endTime,
|
|
double processingInterval)
|
|
{
|
|
IAggregateCalculator calculator = Aggregators.CreateStandardCalculator(
|
|
aggregateId, startTime, endTime, processingInterval, false, m_configuration, m_telemetry)!;
|
|
|
|
foreach (DataValue value in values)
|
|
{
|
|
calculator!.QueueRawValue(value);
|
|
}
|
|
|
|
var results = new List<DataValue>();
|
|
bool hasData = true;
|
|
while (hasData)
|
|
{
|
|
bool _hasresult = calculator!.TryGetProcessedValue(true, out DataValue result);
|
|
if (_hasresult)
|
|
{
|
|
results.Add(result);
|
|
}
|
|
else
|
|
{
|
|
hasData = false;
|
|
}
|
|
}
|
|
|
|
return results.Count > 0 ? results[0] : default;
|
|
}
|
|
|
|
[Test]
|
|
public void AverageReturnsCorrectMean()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 40, 50, 50];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Average,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double avg = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(avg, Is.GreaterThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void AverageIdenticalValuesReturnsThatValue()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [25, 25, 25, 25, 25, 25];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Average,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double avg = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(avg, Is.EqualTo(25.0).Within(0.0001));
|
|
}
|
|
|
|
[Test]
|
|
public void AverageNegativeValues()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [-10, -20, -30, -40, -50, -50];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Average,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double avg = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(avg, Is.LessThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void AverageSingleValueReturnsThatValue()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [42.5, 42.5];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(4000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Average,
|
|
dataValues, startTime, endTime, 4000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void AverageResultHasCalculatedAggregateBits()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 30];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(8000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Average,
|
|
dataValues, startTime, endTime, 8000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.StatusCode.AggregateBits.HasFlag(AggregateBits.Calculated), Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void TimeAverageReturnsResult()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 40, 50, 50];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_TimeAverage,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double timeAvg = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(timeAvg, Is.GreaterThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void TimeAverage2ReturnsResult()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 40, 50, 50];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_TimeAverage2,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double timeAvg2 = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(timeAvg2, Is.GreaterThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void TotalReturnsResult()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 40, 50, 50];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Total,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double total = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(total, Is.GreaterThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void Total2ReturnsResult()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 40, 50, 50];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Total2,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double total2 = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(total2, Is.GreaterThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void TimeAverageWithConstantValueReturnsConstant()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [42, 42, 42, 42, 42, 42];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_TimeAverage,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double timeAvg = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(timeAvg, Is.EqualTo(42.0).Within(0.5));
|
|
}
|
|
|
|
[Test]
|
|
public void TotalResultHasCalculatedAggregateBits()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 30];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(8000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Total,
|
|
dataValues, startTime, endTime, 8000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.StatusCode.AggregateBits.HasFlag(AggregateBits.Calculated), Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void AverageOfSymmetricValuesReturnsMiddle()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 20, 10, 10];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_Average,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
double avg = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(avg, Is.GreaterThan(0));
|
|
}
|
|
|
|
[Test]
|
|
public void TimeAverage2WithConstantValueReturnsConstant()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [100, 100, 100, 100, 100, 100];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(12000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_TimeAverage2,
|
|
dataValues, startTime, endTime, 12000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.WrappedValue.IsNull, Is.False);
|
|
double timeAvg2 = (double)result.WrappedValue.ConvertToDouble();
|
|
Assert.That(timeAvg2, Is.EqualTo(100.0).Within(0.5));
|
|
}
|
|
|
|
[Test]
|
|
public void TimeAverageResultHasCalculatedAggregateBits()
|
|
{
|
|
var startTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
|
|
DateTimeUtc firstValueTime = startTime.AddMilliseconds(500);
|
|
double[] values = [10, 20, 30, 30];
|
|
List<DataValue> dataValues = CreateDataValues(firstValueTime, values, 2000);
|
|
DateTimeUtc endTime = startTime.AddMilliseconds(8000);
|
|
|
|
DataValue result = ComputeAggregate(
|
|
ObjectIds.AggregateFunction_TimeAverage,
|
|
dataValues, startTime, endTime, 8000);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.StatusCode.AggregateBits.HasFlag(AggregateBits.Calculated), Is.True);
|
|
}
|
|
}
|
|
}
|