Merge pull request #3 from abhishekanne/tests

Add new e2e tests and improvements

Author: abhraina-aws

e2etests/Cargo.toml

@@ -21,6 +21,11 @@ mcp = []
 ai_prompts = []
 issue_reporting = []
 tools=[]
+compact=[]
+hooks=[]
+usage=[]
+editor=[]
+subscribe=[]
 
 [[test]]
 name = "test_help_command"

e2etests/run_simple_categorized.sh

@@ -17,6 +17,11 @@ RUN_MCP=true
 RUN_AI_PROMPTS=true
 RUN_ISSUE_REPORTING=true
 RUN_TOOLS=true
+RUN_COMPACT=true
+RUN_HOOKS=true
+RUN_USAGE=true
+RUN_EDITOR=true
+RUN_SUBSCRIBE=true
 # ============================================================================
 
 Q_BINARY="q"
@@ -215,6 +220,46 @@ if [ "$RUN_TOOLS" = true ]; then
     fi
 fi
 
+if [ "$RUN_COMPACT" = true ]; then
+    if run_category "compact" "COMPACT"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
+if [ "$RUN_HOOKS" = true ]; then
+    if run_category "hooks" "HOOKS"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
+if [ "$RUN_USAGE" = true ]; then
+    if run_category "usage" "USAGE"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
+if [ "$RUN_EDITOR" = true ]; then
+    if run_category "editor" "EDITOR"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
+if [ "$RUN_SUBSCRIBE" = true ]; then
+    if run_category "subscribe" "SUBSCRIBE"; then
+        ((total_passed++))
+    else
+        ((total_failed++))
+    fi
+fi
+
 # Final summary
 echo ""
 echo "🎯 FINAL SUMMARY"

e2etests/src/lib.rs

@@ -1,6 +1,37 @@
 // Q CLI E2E Test Framework
 // This library provides end-to-end testing utilities for Amazon Q CLI
 
+use std::sync::{Mutex, Once, atomic::{AtomicUsize, Ordering}};
+
+static INIT: Once = Once::new();
+static mut CHAT_SESSION: Option<Mutex<q_chat_helper::QChatSession>> = None;
+
+pub fn get_chat_session() -> &'static Mutex<q_chat_helper::QChatSession> {
+    unsafe {
+        INIT.call_once(|| {
+            let chat = q_chat_helper::QChatSession::new().expect("Failed to create chat session");
+            println!("✅ Q Chat session started");
+            CHAT_SESSION = Some(Mutex::new(chat));
+        });
+        CHAT_SESSION.as_ref().unwrap()
+    }
+}
+
+pub fn cleanup_if_last_test(test_count: &AtomicUsize, total_tests: usize) -> Result<usize, Box<dyn std::error::Error>> {
+    let count = test_count.fetch_add(1, Ordering::SeqCst) + 1;
+    if count == total_tests {
+        unsafe {
+            if let Some(session) = &CHAT_SESSION {
+                if let Ok(mut chat) = session.lock() {
+                    chat.quit()?;
+                    println!("✅ Test completed successfully");
+                }
+            }
+        }
+    }
+    Ok(count)
+}
+
 pub mod q_chat_helper {
     //! Helper module for Q CLI testing with hybrid approach
     //! - expectrl for commands (/help, /tools)
@@ -107,17 +138,25 @@ pub mod q_chat_helper {
                     },
                     Ok(_) => {
                         // No more data, but wait a bit more in case there's more coming
-                        std::thread::sleep(Duration::from_millis(200));
+                        std::thread::sleep(Duration::from_millis(2500));
                         if total_content.len() > 0 { break; }
                     },
                     Err(_) => break,
                 }
-                std::thread::sleep(Duration::from_millis(200));
+                std::thread::sleep(Duration::from_millis(2500));
             }
 
             Ok(total_content)
         }
 
+        /// Send key input (like arrow keys, Enter, etc.)
+        pub fn send_key_input(&mut self, key_sequence: &str) -> Result<String, Error> {
+            self.session.write_all(key_sequence.as_bytes())?;
+            self.session.flush()?;
+            std::thread::sleep(Duration::from_millis(200));
+            self.read_response()
+        }
+        
         /// Quit the Q Chat session
         pub fn quit(&mut self) -> Result<(), Error> {
             self.session.send_line("/quit")?;