Merge pull request #2 from abhishekanne/tests

Added comprehensive e2e tests for Q CLI commands

Author: abhraina-aws

e2etests/Cargo.toml

@@ -19,6 +19,8 @@ session_mgmt = []
 integration = []
 mcp = []
 ai_prompts = []
+issue_reporting = []
+tools=[]
 
 [[test]]
 name = "test_help_command"

e2etests/run_simple_categorized.sh

@@ -15,6 +15,8 @@ RUN_SESSION_MGMT=true
 RUN_INTEGRATION=true
 RUN_MCP=true
 RUN_AI_PROMPTS=true
+RUN_ISSUE_REPORTING=true
+RUN_TOOLS=true
 # ============================================================================
 
 Q_BINARY="q"
@@ -197,6 +199,22 @@ if [ "$RUN_AI_PROMPTS" = true ]; then
     fi
 fi
 
+if [ "$RUN_ISSUE_REPORTING" = true ]; then
+    if run_category "issue_reporting" "ISSUE REPORTING"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
+if [ "$RUN_TOOLS" = true ]; then
+    if run_category "tools" "TOOLS"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
 # Final summary
 echo ""
 echo "🎯 FINAL SUMMARY"

e2etests/tests/test_add_file_context.rs

@@ -0,0 +1,51 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "context")]
+fn test_add_file_context() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context add <filename> command...");
+    
+    let test_file_path = "/tmp/test_context_file.py";
+    
+    // Create a test file
+    std::fs::write(test_file_path, "# Test file for context\nprint('Hello from test file')")?;
+    println!("✅ Created test file at {}", test_file_path);
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    // Add file to context
+    let add_response = chat.execute_command(&format!("/context add {}", test_file_path))?;
+    
+    println!("📝 Context add response: {} bytes", add_response.len());
+    println!("📝 ADD RESPONSE:");
+    println!("{}", add_response);
+    println!("📝 END ADD RESPONSE");
+    
+    // Verify file was added successfully
+    assert!(add_response.contains("Added 1 path(s) to context"), "Missing success message for adding file");
+    println!("✅ File added to context successfully");
+    
+    // Execute /context show to confirm file is present
+    let show_response = chat.execute_command("/context show")?;
+    
+    println!("📝 Context show response: {} bytes", show_response.len());
+    println!("📝 SHOW RESPONSE:");
+    println!("{}", show_response);
+    println!("📝 END SHOW RESPONSE");
+    
+    // Verify file is present in context
+    assert!(show_response.contains(test_file_path), "File not found in context show output");
+    assert!(show_response.contains("💬 Session (temporary):"), "Missing Session section");
+    println!("✅ File confirmed present in context");
+    
+    chat.quit()?;
+    
+    // Clean up test file
+    let _ = std::fs::remove_file(test_file_path);
+    println!("✅ Cleaned up test file");
+    
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}

e2etests/tests/test_add_globe_pattern_file_context.rs

@@ -0,0 +1,59 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "context")]
+fn test_add_glob_pattern_file_context() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context add *.py glob pattern command...");
+    
+    let test_file1_path = "/tmp/test_context_file1.py";
+    let test_file2_path = "/tmp/test_context_file2.py";
+    let test_file3_path = "/tmp/test_context_file.js"; // Non-matching file
+    let glob_pattern = "/tmp/*.py";
+    
+    // Create test files
+    std::fs::write(test_file1_path, "# Test Python file 1 for context\nprint('Hello from Python file 1')")?;
+    std::fs::write(test_file2_path, "# Test Python file 2 for context\nprint('Hello from Python file 2')")?;
+    std::fs::write(test_file3_path, "// Test JavaScript file\nconsole.log('Hello from JS file');")?;
+    println!("✅ Created test files at {}, {}, {}", test_file1_path, test_file2_path, test_file3_path);
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    // Add glob pattern to context
+    let add_response = chat.execute_command(&format!("/context add {}", glob_pattern))?;
+    
+    println!("📝 Context add response: {} bytes", add_response.len());
+    println!("📝 ADD RESPONSE:");
+    println!("{}", add_response);
+    println!("📝 END ADD RESPONSE");
+    
+    // Verify glob pattern was added successfully
+    assert!(add_response.contains("Added 1 path(s) to context"), "Missing success message for adding glob pattern");
+    println!("✅ Glob pattern added to context successfully");
+    
+    // Execute /context show to confirm pattern matches files
+    let show_response = chat.execute_command("/context show")?;
+    
+    println!("📝 Context show response: {} bytes", show_response.len());
+    println!("📝 SHOW RESPONSE:");
+    println!("{}", show_response);
+    println!("📝 END SHOW RESPONSE");
+    
+    // Verify glob pattern is present and matches files
+    assert!(show_response.contains(glob_pattern), "Glob pattern not found in context show output");
+    assert!(show_response.contains("match"), "Missing match indicator for glob pattern");
+    assert!(show_response.contains("💬 Session (temporary):"), "Missing Session section");
+    println!("✅ Glob pattern confirmed present in context with matches");
+    
+    chat.quit()?;
+    
+    // Clean up test files
+    let _ = std::fs::remove_file(test_file1_path);
+    let _ = std::fs::remove_file(test_file2_path);
+    let _ = std::fs::remove_file(test_file3_path);
+    println!("✅ Cleaned up test files");
+    
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}

e2etests/tests/test_add_multiple_file_context.rs

@@ -0,0 +1,59 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "context")]
+fn test_add_multiple_file_context() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context add <filename1> <filename2> <filename3> command...");
+    
+    let test_file1_path = "/tmp/test_context_file1.py";
+    let test_file2_path = "/tmp/test_context_file2.js";
+    let test_file3_path = "/tmp/test_context_file3.txt";
+    
+    // Create multiple test files
+    std::fs::write(test_file1_path, "# Test Python file for context\nprint('Hello from Python file')")?;
+    std::fs::write(test_file2_path, "// Test JavaScript file for context\nconsole.log('Hello from JS file');")?;
+    std::fs::write(test_file3_path, "Test text file for context\nHello from text file")?;
+    println!("✅ Created test files at {}, {}, {}", test_file1_path, test_file2_path, test_file3_path);
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    // Add multiple files to context in one command
+    let add_response = chat.execute_command(&format!("/context add {} {} {}", test_file1_path, test_file2_path, test_file3_path))?;
+    
+    println!("📝 Context add response: {} bytes", add_response.len());
+    println!("📝 ADD RESPONSE:");
+    println!("{}", add_response);
+    println!("📝 END ADD RESPONSE");
+    
+    // Verify files were added successfully
+    assert!(add_response.contains("Added 3 path(s) to context"), "Missing success message for adding multiple files");
+    println!("✅ Multiple files added to context successfully");
+    
+    // Execute /context show to confirm files are present
+    let show_response = chat.execute_command("/context show")?;
+    
+    println!("📝 Context show response: {} bytes", show_response.len());
+    println!("📝 SHOW RESPONSE:");
+    println!("{}", show_response);
+    println!("📝 END SHOW RESPONSE");
+    
+    // Verify all files are present in context
+    assert!(show_response.contains(test_file1_path), "Python file not found in context show output");
+    assert!(show_response.contains(test_file2_path), "JavaScript file not found in context show output");
+    assert!(show_response.contains(test_file3_path), "Text file not found in context show output");
+    assert!(show_response.contains("💬 Session (temporary):"), "Missing Session section");
+    println!("✅ All files confirmed present in context");
+    
+    chat.quit()?;
+    
+    // Clean up test files
+    let _ = std::fs::remove_file(test_file1_path);
+    let _ = std::fs::remove_file(test_file2_path);
+    let _ = std::fs::remove_file(test_file3_path);
+    println!("✅ Cleaned up test files");
+    
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}

e2etests/tests/test_add_non_existing_file_context.rs

@@ -0,0 +1,31 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "context")]
+fn test_add_non_existing_file_context() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context add non-existing file command...");
+    
+    let non_existing_file_path = "/tmp/non_existing_file.py";
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    // Try to add non-existing file to context
+    let add_response = chat.execute_command(&format!("/context add {}", non_existing_file_path))?;
+    
+    println!("📝 Context add response: {} bytes", add_response.len());
+    println!("📝 ADD RESPONSE:");
+    println!("{}", add_response);
+    println!("📝 END ADD RESPONSE");
+    
+    // Verify error message for non-existing file
+    assert!(add_response.contains("Error:") && add_response.contains("Invalid path") && add_response.contains("does not exist"), "Missing error message for non-existing file");
+    assert!(add_response.contains("Use --force to add anyway"), "Missing --force suggestion in error message");
+    println!("✅ Found expected error message for non-existing file with --force suggestion");
+    
+    chat.quit()?;
+    
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}

e2etests/tests/test_clear_context_command.rs

@@ -0,0 +1,82 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "context")]
+fn test_clear_context_command() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /context clear command...");
+    
+    let test_file1_path = "/tmp/test_context_file1.py";
+    let test_file2_path = "/tmp/test_context_file2.js";
+    
+    // Create multiple test files
+    std::fs::write(test_file1_path, "# Test Python file for context\nprint('Hello from Python file')")?;
+    std::fs::write(test_file2_path, "// Test JavaScript file for context\nconsole.log('Hello from JS file');")?;
+    println!("✅ Created test files at {}, {}", test_file1_path, test_file2_path);
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    // Add multiple files to context
+    let add_response = chat.execute_command(&format!("/context add {} {}", test_file1_path, test_file2_path))?;
+    
+    println!("📝 Context add response: {} bytes", add_response.len());
+    println!("📝 ADD RESPONSE:");
+    println!("{}", add_response);
+    println!("📝 END ADD RESPONSE");
+    
+    // Verify files were added successfully
+    assert!(add_response.contains("Added 2 path(s) to context"), "Missing success message for adding files");
+    println!("✅ Files added to context successfully");
+    
+    // Execute /context show to confirm files are present
+    let show_response = chat.execute_command("/context show")?;
+    
+    println!("📝 Context show response: {} bytes", show_response.len());
+    println!("📝 SHOW RESPONSE:");
+    println!("{}", show_response);
+    println!("📝 END SHOW RESPONSE");
+    
+    // Verify files are present in context
+    assert!(show_response.contains(test_file1_path), "Python file not found in context show output");
+    assert!(show_response.contains(test_file2_path), "JavaScript file not found in context show output");
+    println!("✅ Files confirmed present in context");
+    
+    // Execute /context clear to remove all files
+    let clear_response = chat.execute_command("/context clear")?;
+    
+    println!("📝 Context clear response: {} bytes", clear_response.len());
+    println!("📝 CLEAR RESPONSE:");
+    println!("{}", clear_response);
+    println!("📝 END CLEAR RESPONSE");
+    
+    // Verify context was cleared successfully
+    assert!(clear_response.contains("Cleared context"), "Missing success message for clearing context");
+    println!("✅ Context cleared successfully");
+    
+    // Execute /context show to confirm no files remain
+    let final_show_response = chat.execute_command("/context show")?;
+    
+    println!("📝 Final context show response: {} bytes", final_show_response.len());
+    println!("📝 FINAL SHOW RESPONSE:");
+    println!("{}", final_show_response);
+    println!("📝 END FINAL SHOW RESPONSE");
+    
+    // Verify no files remain in context
+    assert!(!final_show_response.contains(test_file1_path), "Python file still found in context after clear");
+    assert!(!final_show_response.contains(test_file2_path), "JavaScript file still found in context after clear");
+    assert!(final_show_response.contains("👤 Agent (q_cli_default):"), "Missing Agent section");
+    assert!(final_show_response.contains("💬 Session (temporary):"), "Missing Session section");
+    assert!(final_show_response.contains("<none>"), "Missing <none> indicator for cleared context");
+    println!("✅ All files confirmed removed from context and <none> sections present");
+    
+    chat.quit()?;
+    
+    // Clean up test files
+    let _ = std::fs::remove_file(test_file1_path);
+    let _ = std::fs::remove_file(test_file2_path);
+    println!("✅ Cleaned up test files");
+    
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}

e2etests/tests/test_hooks_command.rs

@@ -0,0 +1,37 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "integration")]
+fn test_hooks_command() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /hooks command...");
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    let response = chat.execute_command("/hooks")?;
+    
+    println!("📝 Hooks command response: {} bytes", response.len());
+    println!("📝 FULL OUTPUT:");
+    println!("{}", response);
+    println!("📝 END OUTPUT");
+    
+    // Verify no hooks configured message
+    assert!(response.contains("No hooks are configured."), "Missing no hooks configured message");
+    println!("✅ Found no hooks configured message");
+    
+    // Verify documentation reference
+    assert!(response.contains("Refer to the documentation"), "Missing documentation reference");
+    assert!(response.contains("https://github.com/aws/amazon-q-developer-cli/blob/main/docs/agent-format.md#hooks-field"), "Missing documentation URL");
+    println!("✅ Found documentation reference and URL");
+    
+    // Verify hooks field reference
+    assert!(response.contains("hooks-field"), "Missing hooks field reference");
+    println!("✅ Found hooks field reference");
+    
+    println!("✅ All hooks command functionality verified!");
+    
+    chat.quit()?;
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}

e2etests/tests/test_issue_command.rs

@@ -0,0 +1,28 @@
+use q_cli_e2e_tests::q_chat_helper::QChatSession;
+
+#[test]
+#[cfg(feature = "issue_reporting")]
+fn test_issue_command() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔍 Testing /issue command with bug report...");
+    
+    let mut chat = QChatSession::new()?;
+    println!("✅ Q Chat session started");
+    
+    let response = chat.execute_command("/issue \"Bug: Q CLI crashes when using large files\"")?;
+    
+    println!("📝 Issue command response: {} bytes", response.len());
+    println!("📝 FULL OUTPUT:");
+    println!("{}", response);
+    println!("📝 END OUTPUT");
+    
+    // Verify command executed successfully (GitHub opens automatically)
+    assert!(response.contains("Heading over to GitHub..."), "Missing browser opening confirmation");
+    println!("✅ Found browser opening confirmation");
+    
+    println!("✅ All issue command functionality verified!");
+    
+    chat.quit()?;
+    println!("✅ Test completed successfully");
+    
+    Ok(())
+}