From 5f6655de27f88e8aa4580374fda67e77e008b5bb Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Sat, 13 Jun 2026 09:27:37 -0400 Subject: [PATCH] server(alarms): drop redundant null-coalesce; tidy validator tests (review fixes) --- src/ZB.MOM.WW.MxGateway.Server/Metrics/GatewayMetrics.cs | 2 +- .../Configuration/GatewayOptionsValidatorTests.cs | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ZB.MOM.WW.MxGateway.Server/Metrics/GatewayMetrics.cs b/src/ZB.MOM.WW.MxGateway.Server/Metrics/GatewayMetrics.cs index 623dac2..2ba722a 100644 --- a/src/ZB.MOM.WW.MxGateway.Server/Metrics/GatewayMetrics.cs +++ b/src/ZB.MOM.WW.MxGateway.Server/Metrics/GatewayMetrics.cs @@ -399,7 +399,7 @@ public sealed class GatewayMetrics : IDisposable 1, new KeyValuePair("from", fromMode.ToString(CultureInfo.InvariantCulture)), new KeyValuePair("to", toMode.ToString(CultureInfo.InvariantCulture)), - new KeyValuePair("reason", reason ?? string.Empty)); + new KeyValuePair("reason", reason)); } /// diff --git a/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs b/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs index eea5285..fef9630 100644 --- a/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs +++ b/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs @@ -178,10 +178,7 @@ public sealed class GatewayOptionsValidatorTests [InlineData("FORCESUBTAG")] public void Validate_Succeeds_WhenAlarmsEnabled_RecognisedMode(string mode) { - AlarmsOptions alarms = mode.Equals("ForceSubtag", StringComparison.OrdinalIgnoreCase) - // ForceSubtag needs either UseGalaxyRepository=true (default) or IncludeAttributes. - ? EnabledAlarmsWithFallback(new AlarmFallbackOptions { Mode = mode }) - : EnabledAlarmsWithFallback(new AlarmFallbackOptions { Mode = mode }); + AlarmsOptions alarms = EnabledAlarmsWithFallback(new AlarmFallbackOptions { Mode = mode }); GatewayOptions options = CloneWithAlarms(ValidOptions(), alarms); ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); Assert.True(result.Succeeded); @@ -265,7 +262,6 @@ public sealed class GatewayOptionsValidatorTests ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); Assert.True(result.Failed); Assert.Contains(result.Failures!, f => f.Contains(keyPart)); - _ = keyPart; // suppress unused-param warning } [Theory] @@ -279,7 +275,6 @@ public sealed class GatewayOptionsValidatorTests ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); Assert.True(result.Failed); Assert.Contains(result.Failures!, f => f.Contains(keyPart)); - _ = keyPart; } [Theory] @@ -293,6 +288,5 @@ public sealed class GatewayOptionsValidatorTests ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); Assert.True(result.Failed); Assert.Contains(result.Failures!, f => f.Contains(keyPart)); - _ = keyPart; } }