Refactor assertions and cleanup in Kiro CLI tests for improved clarity and reliability and Fix the code causing warning during execution

Author: shreyabhagat1

e2etests/tests/ai_prompts/test_prompts_commands.rs

@@ -266,7 +266,7 @@ fn test_prompts_remove_command() -> Result<(), Box<dyn std::error::Error>> {
     println!("📝 END OUTPUT");
 
     assert!(response.contains("Warning"), "Missing Warning");
-    assert!(response.contains("This will permanently remove the local"), "Missing This will permanently remove the local message");
+    assert!(response.contains("This will permanently remove the"), "Missing This will permanently remove the message");
     assert!(response.contains("testprompt"), "Missing testprompt");
 
     let response = chat.send_key_input("y\r")?;
@@ -304,13 +304,11 @@ fn test_create_prompt_with_content_command() -> Result<(), Box<dyn std::error::E
     assert!(response.contains("Created local prompt"), "Expected 'Created local prompt' in response.");
     assert!(response.contains("✓"), "Expected '✓' in response.");
 
-   
-
     //delete created prompt
     let remove_response = chat.execute_command_with_timeout("/prompts remove promptlocaltest",Some(2000))?;
     println!("Remove Response: {}", remove_response);
     if remove_response.contains("Are you sure you want to remove this prompt? (y/n):") {
-         let acknowledge_response = chat.send_key_input("y")?;
+        chat.send_key_input("y")?;
         println!("Now removing the created prompt");
          let enter_response = chat.send_key_input("\r")?;
          if enter_response.contains("Removed") || enter_response.contains("successfully") {

e2etests/tests/kiro_cli_subcommand/test_kiro_cli_quit_subcommand.rs

@@ -28,7 +28,13 @@ fn test_kiro_cli_quit_subcommand() -> Result<(), Box<dyn std::error::Error>> {
     println!("{}", quit_response);
     println!("📝 END OUTPUT");
 
-    assert!(quit_response.contains("Quitting Kiro CLI app"), "Missing Kiro CLI quit message");
+    if quit_response.contains("restart Kiro CLI") {
+        assert!(quit_response.contains("Please restart Kiro CLI from your host machine"),"Expected 'Please restart Kiro CLI from your host machine' in response.");
+    } else {
+         assert!(quit_response.contains("Quitting Kiro CLI app"),"Missing Quitting Kiro CLI app message");
+    }
+
+    println!("✅ kiro-cli quit subcommand test passed.");
     Ok(())
 
 }

e2etests/tests/kiro_cli_subcommand/test_kiro_cli_settings_delete_subcommand.rs

@@ -32,7 +32,7 @@ fn test_kiro_cli_settings_delete_subcommand() -> Result<(), Box<dyn std::error::
                 // Verify deletion
                 let response = q_chat_helper::execute_q_subcommand("kiro-cli", &["settings", key])?;
                 println!("📝 Response: {}", response);
-                assert!(response.contains("No value associated with chat.defaultAgent"), "Expected No value associated with chat.defaultAgent message in response");
+                assert!(response.contains("No value associated with chat.defaultAgent"), "Expected No value associated with chat.defaultAgent message missing in response");
 
                 // Restore the setting
                 let restore_response = q_chat_helper::execute_q_subcommand("kiro-cli", &["settings", key, value])?;

e2etests/tests/kiro_steering/test_kiro_global_steering.rs

@@ -1,8 +1,10 @@
 #[allow(unused_imports)]
 use q_cli_e2e_tests::q_chat_helper;
+#[allow(unused_imports)]
 use std::fs;
 #[allow(unused_imports)]
 use std::env;
+#[allow(unused_imports)]
 use std::path::PathBuf;
 
 #[test]

e2etests/tests/kiro_steering/test_kiro_local_steering.rs

@@ -1,8 +1,10 @@
 #[allow(unused_imports)]
 use q_cli_e2e_tests::q_chat_helper;
+#[allow(unused_imports)]
 use std::fs;
 #[allow(unused_imports)]
 use std::env;
+#[allow(unused_imports)]
 use std::path::PathBuf;
 
 #[test]

e2etests/tests/mcp/test_mcp_command.rs

@@ -21,7 +21,7 @@ fn test_mcp_help_command() -> Result<(), Box<dyn std::error::Error>> {
 
     // Verify Usage section
     assert!(response.contains("Usage"), "Missing Usage section");
-    assert!(response.contains("/mcp"), "Missing /mcp command in usage section");;
+    assert!(response.contains("/mcp"), "Missing /mcp command in usage section");
 
     // Verify Options section
     assert!(response.contains("Options"), "Missing Options section");

e2etests/tests/tools/test_tools_command.rs

@@ -564,7 +564,7 @@ fn test_shell_tool() -> Result<(), Box<dyn std::error::Error>> {
     println!("✅ Kiro CLI chat session started");
 
     // Test shell tool by asking to run pwd command
-    let mut response = chat.execute_command_with_timeout("Run pwd",Some(3000))?;
+    let response = chat.execute_command_with_timeout("Run pwd",Some(3000))?;
 
     println!("📝 shell response: {} bytes", response.len());
     println!("📝 FULL OUTPUT:");