aligned both implementations and the test semantics so Rust and C++ now mean the same thing

Author: Saumya-R

feature_integration_tests/test_cases/tests/lifecycle/test_run_targets.py

@@ -93,12 +93,12 @@ def test_run_target_switch(self, results: ScenarioResult, logs_info_level: LogCo
         """
         assert results.return_code == ResultCode.SUCCESS
 
+        expected_switch_message = "Switching from startup to running"
+
         if version == "cpp":
-            assert "Switching from startup to running" in results.stdout or "Switching run targets" in results.stdout, (
-                "Run target switch failed"
-            )
+            assert expected_switch_message in results.stdout, "Run target switch failed"
         else:
-            switch_logs = logs_info_level.get_logs(field="message", pattern="Switching run targets")
+            switch_logs = logs_info_level.get_logs(field="message", pattern=expected_switch_message)
             assert len(switch_logs) > 0, "Run target switch failed"
 
     def test_process_state_communication(

feature_integration_tests/test_scenarios/cpp/src/scenarios/lifecycle/launch_manager_support.cpp

@@ -636,14 +636,11 @@ class RunTargets : public Scenario {
         }
 
         std::cout << "Testing run target support" << std::endl;
-        if (!run_targets.empty()) {
-            for (const auto& target : run_targets) {
-                std::cout << "Run target defined: " << target << std::endl;
-            }
-        } else {
-            std::cout << "Run target defined: startup" << std::endl;
-            std::cout << "Run target defined: running" << std::endl;
-            std::cout << "Run target defined: shutdown" << std::endl;
+        if (run_targets.empty()) {
+            throw std::runtime_error("Run targets were not defined: missing 'test.run_targets' in scenario input");
+        }
+        for (const auto& target : run_targets) {
+            std::cout << "Run target defined: " << target << std::endl;
         }
         std::cout << "Starting run target: " << initial_target << std::endl;
 
@@ -655,11 +652,10 @@ class RunTargets : public Scenario {
             }
         }
 
-        if (!next_target.empty()) {
-            std::cout << "Switching from " << initial_target << " to " << next_target << std::endl;
-        } else {
-            std::cout << "Switching run targets" << std::endl;
+        if (next_target.empty()) {
+            throw std::runtime_error("Run target switch failed: no alternative target available in 'test.run_targets'");
         }
+        std::cout << "Switching from " << initial_target << " to " << next_target << std::endl;
 
         std::cout << "Process state reported" << std::endl;
     }

feature_integration_tests/test_scenarios/rust/src/scenarios/lifecycle/launch_manager_support.rs

@@ -402,16 +402,29 @@ impl Scenario for RunTargets {
 
         info!("Testing run target support");
 
-        if let Some(targets) = v["test"]["run_targets"].as_array() {
-            for target in targets {
-                if let Some(target_name) = target.as_str() {
-                    info!("Run target defined: {}", target_name);
-                }
-            }
+        let targets = v["test"]["run_targets"]
+            .as_array()
+            .ok_or_else(|| "Run targets were not defined: missing 'test.run_targets' in scenario input".to_string())?;
+
+        let target_names: Vec<&str> = targets.iter().filter_map(|target| target.as_str()).collect();
+        if target_names.is_empty() {
+            return Err("Run targets were not defined: no valid string entries in 'test.run_targets'".to_string());
+        }
+
+        for target_name in &target_names {
+            info!("Run target defined: {}", target_name);
         }
 
         info!("Starting run target: {}", initial_target);
-        info!("Switching run targets");
+
+        let next_target = target_names
+            .iter()
+            .copied()
+            .find(|target_name| *target_name != initial_target)
+            .ok_or_else(|| {
+                "Run target switch failed: no alternative target available in 'test.run_targets'".to_string()
+            })?;
+        info!("Switching from {} to {}", initial_target, next_target);
         info!("Process state reported");
 
         Ok(())