From 4d4f443c279700ee4ff0714f48b3e752d93c03fe Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Tue, 18 Aug 2026 05:33:00 -0400 Subject: [PATCH] =?UTF-8?q?fix(clients):=20review=20nits=20=E2=80=94=20alp?= =?UTF-8?q?habetize=20the=20Java=20CLI=20alarm=20imports,=20cover=20the=20?= =?UTF-8?q?Rust=20snapshot-status=20render?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Java import block's AlarmFeedMessage already sorted after AlarmProviderStatus before c748361; adding AlarmSnapshotStatus widened the gap. Order all three alphabetically. The Rust CLI tests the sibling ProviderStatus render path but not the new SnapshotStatus arm, so the summary string and the JSON shape were both uncovered. Add the matching test over alarm_feed_message_summary and alarm_feed_message_to_json. --- .../zb/mom/ww/mxgateway/cli/MxGatewayCli.java | 2 +- clients/rust/crates/mxgw-cli/src/main.rs | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/clients/java/zb-mom-ww-mxgateway-cli/src/main/java/com/zb/mom/ww/mxgateway/cli/MxGatewayCli.java b/clients/java/zb-mom-ww-mxgateway-cli/src/main/java/com/zb/mom/ww/mxgateway/cli/MxGatewayCli.java index e4e7649..b40fe5b 100644 --- a/clients/java/zb-mom-ww-mxgateway-cli/src/main/java/com/zb/mom/ww/mxgateway/cli/MxGatewayCli.java +++ b/clients/java/zb-mom-ww-mxgateway-cli/src/main/java/com/zb/mom/ww/mxgateway/cli/MxGatewayCli.java @@ -47,9 +47,9 @@ import java.util.function.Consumer; import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmReply; import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmRequest; import mxaccess_gateway.v1.MxaccessGateway.ActiveAlarmSnapshot; +import mxaccess_gateway.v1.MxaccessGateway.AlarmFeedMessage; import mxaccess_gateway.v1.MxaccessGateway.AlarmProviderStatus; import mxaccess_gateway.v1.MxaccessGateway.AlarmSnapshotStatus; -import mxaccess_gateway.v1.MxaccessGateway.AlarmFeedMessage; import mxaccess_gateway.v1.MxaccessGateway.BulkReadResult; import mxaccess_gateway.v1.MxaccessGateway.BulkWriteResult; import mxaccess_gateway.v1.MxaccessGateway.CloseSessionRequest; diff --git a/clients/rust/crates/mxgw-cli/src/main.rs b/clients/rust/crates/mxgw-cli/src/main.rs index 1529835..41393ec 100644 --- a/clients/rust/crates/mxgw-cli/src/main.rs +++ b/clients/rust/crates/mxgw-cli/src/main.rs @@ -2969,4 +2969,23 @@ mod tests { assert_eq!(provider["reason"], "alarmmgr unavailable"); assert_eq!(provider["since"]["seconds"], 1_777_995_000_i64); } + + #[test] + fn alarm_feed_snapshot_status_renders_in_summary_and_json() { + use zb_mom_ww_mxgateway_client::generated::mxaccess_gateway::v1::{ + alarm_feed_message, AlarmFeedMessage, AlarmSnapshotStatus, + }; + + let message = AlarmFeedMessage { + payload: Some(alarm_feed_message::Payload::SnapshotStatus( + AlarmSnapshotStatus { truncated: true }, + )), + }; + + let summary = super::alarm_feed_message_summary(&message); + assert_eq!(summary, "snapshot-status truncated=true"); + + let value = super::alarm_feed_message_to_json(&message); + assert_eq!(value["snapshotStatus"]["truncated"], true); + } }