Fix unit tests following mapper bridge changes

Signed-off-by: James Rhodes <jarhodes314@gmail.com>

Author: jarhodes314

crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs

@@ -454,14 +454,15 @@ define_tedge_config! {
             },
 
             #[tedge_config(default(value = false))]
-            #[doku(skip)]
+            #[doku(skip)] // Hide the configuration in `tedge config list --doc`
             in_mapper: bool,
 
             // TODO validation
             /// The topic prefix that will be used for the mapper bridge MQTT topic. For instance,
             /// if this is set to "c8y", then messages published to `c8y/s/us` will be
             /// forwarded by to Cumulocity on the `s/us` topic
             #[tedge_config(example = "c8y", default(value = "c8y"))]
+            #[doku(skip)] // Hide the configuration in `tedge config list --doc`
             topic_prefix: TopicPrefix,
         },
 
@@ -817,9 +818,11 @@ define_tedge_config! {
 }
 
 impl ReadableKey {
+    // This is designed to be simple way of
     pub fn is_printable_value(self, value: &str) -> bool {
         match self {
             Self::C8yBridgeInMapper => value != "false",
+            Self::C8yBridgeTopicPrefix => value != "c8y",
             _ => true,
         }
     }

crates/core/c8y_api/src/utils.rs

@@ -50,6 +50,7 @@ mod tests {
     use mqtt_channel::Topic;
     use test_case::test_case;
 
+    use crate::utils::bridge::is_c8y_bridge_established;
     use crate::utils::bridge::is_c8y_bridge_up;
 
     const C8Y_BRIDGE_HEALTH_TOPIC: &str =
@@ -76,7 +77,7 @@ mod tests {
         let topic = Topic::new(topic).unwrap();
         let message = Message::new(&topic, payload);
 
-        let actual = is_c8y_bridge_up(&message, "tedge-mapper-bridge-c8y");
+        let actual = is_c8y_bridge_established(&message, "tedge-mapper-bridge-c8y");
         assert_eq!(actual, expected);
     }
 }

crates/core/tedge/src/bridge/aws.rs

@@ -126,6 +126,7 @@ fn test_bridge_config_from_aws_params() -> anyhow::Result<()> {
         notifications_local_only: true,
         notification_topic: MOSQUITTO_BRIDGE_TOPIC.into(),
         bridge_attempt_unsubscribe: false,
+        bridge_location: BridgeLocation::Mosquitto,
     };
 
     assert_eq!(bridge, expected);

crates/core/tedge/src/bridge/azure.rs

@@ -126,6 +126,7 @@ fn test_bridge_config_from_azure_params() -> anyhow::Result<()> {
         notifications_local_only: true,
         notification_topic: MOSQUITTO_BRIDGE_TOPIC.into(),
         bridge_attempt_unsubscribe: false,
+        bridge_location: BridgeLocation::Mosquitto,
     };
 
     assert_eq!(bridge, expected);

crates/core/tedge/src/bridge/c8y.rs

@@ -167,6 +167,7 @@ mod tests {
             bridge_keyfile: "./test-private-key.pem".into(),
             smartrest_templates: TemplatesSet::try_from(vec!["abc", "def"])?,
             include_local_clean_session: AutoFlag::False,
+            bridge_location: BridgeLocation::Mosquitto,
         };
 
         let bridge = BridgeConfig::from(params);
@@ -229,6 +230,7 @@ mod tests {
             notifications_local_only: true,
             notification_topic: C8Y_BRIDGE_HEALTH_TOPIC.into(),
             bridge_attempt_unsubscribe: false,
+            bridge_location: BridgeLocation::Mosquitto,
         };
 
         assert_eq!(bridge, expected);

crates/core/tedge/src/bridge/config.rs

@@ -173,6 +173,7 @@ mod test {
             notifications_local_only: false,
             notification_topic: "test_topic".into(),
             bridge_attempt_unsubscribe: false,
+            bridge_location: BridgeLocation::Mosquitto,
         };
 
         let mut serialized_config = Vec::<u8>::new();
@@ -238,6 +239,7 @@ bridge_attempt_unsubscribe false
             notifications_local_only: false,
             notification_topic: "test_topic".into(),
             bridge_attempt_unsubscribe: false,
+            bridge_location: BridgeLocation::Mosquitto,
         };
         let mut serialized_config = Vec::<u8>::new();
         bridge.serialize(&mut serialized_config)?;
@@ -305,6 +307,7 @@ bridge_attempt_unsubscribe false
             notifications_local_only: false,
             notification_topic: "test_topic".into(),
             bridge_attempt_unsubscribe: false,
+            bridge_location: BridgeLocation::Mosquitto,
         };
 
         let mut buffer = Vec::new();
@@ -442,6 +445,7 @@ bridge_attempt_unsubscribe false
             notification_topic: "test_topic".into(),
             bridge_attempt_unsubscribe: false,
             topics: vec![],
+            bridge_location: BridgeLocation::Mosquitto,
         }
     }
 }

crates/extensions/c8y_mapper_ext/src/converter.rs

@@ -3193,6 +3193,7 @@ pub(crate) mod tests {
             true,
             true,
             "c8y".into(),
+            false,
         )
     }
 

crates/extensions/c8y_mapper_ext/src/tests.rs

@@ -2420,6 +2420,7 @@ pub(crate) async fn spawn_c8y_mapper_actor(
         true,
         true,
         "c8y".into(),
+        false,
     );
 
     let mut mqtt_builder: SimpleMessageBoxBuilder<MqttMessage, MqttMessage> =