dohertj2/mxaccessgw
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

server(alarms): drop redundant null-coalesce; tidy validator tests (review fixes)

Browse Source
This commit is contained in:
Joseph Doherty
2026-06-13 09:27:37 -04:00
parent fbc9cf56df
commit 5f6655de27
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZB.MOM.WW.MxGateway.Server/Metrics/GatewayMetrics.cs
+1 -1
View File
@@ -399,7 +399,7 @@ public sealed class GatewayMetrics : IDisposable
1, 1,
new KeyValuePair<string, object?>("from", fromMode.ToString(CultureInfo.InvariantCulture)), new KeyValuePair<string, object?>("from", fromMode.ToString(CultureInfo.InvariantCulture)),
new KeyValuePair<string, object?>("to", toMode.ToString(CultureInfo.InvariantCulture)), new KeyValuePair<string, object?>("to", toMode.ToString(CultureInfo.InvariantCulture)),
new KeyValuePair<string, object?>("reason", reason ?? string.Empty)); new KeyValuePair<string, object?>("reason", reason));
} }
/// <summary> /// <summary>
src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs
+1 -7
View File
@@ -178,10 +178,7 @@ public sealed class GatewayOptionsValidatorTests
[InlineData("FORCESUBTAG")] [InlineData("FORCESUBTAG")]
public void Validate_Succeeds_WhenAlarmsEnabled_RecognisedMode(string mode) public void Validate_Succeeds_WhenAlarmsEnabled_RecognisedMode(string mode)
{ {
AlarmsOptions alarms = mode.Equals("ForceSubtag", StringComparison.OrdinalIgnoreCase) AlarmsOptions alarms = EnabledAlarmsWithFallback(new AlarmFallbackOptions { Mode = mode });
// ForceSubtag needs either UseGalaxyRepository=true (default) or IncludeAttributes.
? EnabledAlarmsWithFallback(new AlarmFallbackOptions { Mode = mode })
: EnabledAlarmsWithFallback(new AlarmFallbackOptions { Mode = mode });
GatewayOptions options = CloneWithAlarms(ValidOptions(), alarms); GatewayOptions options = CloneWithAlarms(ValidOptions(), alarms);
ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options);
Assert.True(result.Succeeded); Assert.True(result.Succeeded);
@@ -265,7 +262,6 @@ public sealed class GatewayOptionsValidatorTests
ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options);
Assert.True(result.Failed); Assert.True(result.Failed);
Assert.Contains(result.Failures!, f => f.Contains(keyPart)); Assert.Contains(result.Failures!, f => f.Contains(keyPart));
_ = keyPart; // suppress unused-param warning
} }
[Theory] [Theory]
@@ -279,7 +275,6 @@ public sealed class GatewayOptionsValidatorTests
ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options);
Assert.True(result.Failed); Assert.True(result.Failed);
Assert.Contains(result.Failures!, f => f.Contains(keyPart)); Assert.Contains(result.Failures!, f => f.Contains(keyPart));
_ = keyPart;
} }
[Theory] [Theory]
@@ -293,6 +288,5 @@ public sealed class GatewayOptionsValidatorTests
ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options);
Assert.True(result.Failed); Assert.True(result.Failed);
Assert.Contains(result.Failures!, f => f.Contains(keyPart)); Assert.Contains(result.Failures!, f => f.Contains(keyPart));
_ = keyPart;
} }
} }