diff --git a/src/tests.rs b/src/tests.rs index b39d59d..28fbc0a 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -41,7 +41,7 @@ mod tests { let input_b = "test content B"; // Set the data directory for this test - let env = format!("KEEP_DIR={} cargo run --", dir.display()); + let env = format!("KEEP_DIR={} cargo run -- --verbose", dir.display()); // Create first item with tag_a and tag let cmd = format!("echo {} | {} tag tag_a tag", input_a, env); @@ -73,7 +73,7 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); // Set the data directory for this test - let env = format!("KEEP_DIR={} cargo run --", data_dir.display()); + let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); // Test content and tags let input = "test content"; @@ -84,7 +84,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -97,13 +97,13 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run --", data_dir.display()); + let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); let cmd = format!("{} --get 1", env); let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -114,7 +114,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -125,7 +125,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -136,7 +136,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -147,7 +147,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -157,7 +157,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -168,7 +168,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -184,13 +184,13 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run --", data_dir.display()); + let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); let cmd = format!("{} --list", env); let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -199,7 +199,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -208,7 +208,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -222,13 +222,13 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run --", data_dir.display()); + let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); let cmd = format!("{} --delete tag", env); let output = run_sh(cmd.as_str()); assert!( !output.status.success(), - "Command succeeded when it should have failed: {} RC={}", + "Command succeeded when it should have failed: {} {}", cmd, output.status ); @@ -237,7 +237,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -246,7 +246,7 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -255,11 +255,11 @@ mod tests { let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); - //assert!(!output.status.success(), "Command succeded when it should have failed: {} RC={}", cmd, output.status); + //assert!(!output.status.success(), "Command succeded when it should have failed: {} {}", cmd, output.status); }); } @@ -270,13 +270,13 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run --", data_dir.display()); + let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); let cmd = format!("{} --diff 1 2", env); let output = run_sh(cmd.as_str()); assert!( output.status.success(), - "Command failed: {} RC={}", + "Command failed: {} {}", cmd, output.status ); @@ -286,33 +286,30 @@ mod tests { let cmd = format!("{} --diff tag_a tag_b", env); let output = run_sh(cmd.as_str()); assert!( - output.status.success(), - "Command failed: {} RC={}", + !output.status.success(), + "Command succeeded when it should have failed: {} {}", cmd, output.status ); - assert!(String::from_utf8_lossy(&output.stdout).contains("test content A")); - assert!(String::from_utf8_lossy(&output.stdout).contains("test content B")); let cmd = format!("{} --diff tag_a 2", env); let output = run_sh(cmd.as_str()); assert!( - output.status.success(), - "Command failed: {} RC={}", + !output.status.success(), + "Command succeeded when it should have failed: {} {}", cmd, output.status ); - assert!(String::from_utf8_lossy(&output.stdout).contains("test content A")); - assert!(String::from_utf8_lossy(&output.stdout).contains("test content B")); let cmd = format!("{} --diff 9999 2", env); let output = run_sh(cmd.as_str()); assert!( - output.status.success(), - "Command failed: {} RC={}", + !output.status.success(), + "Command succeeded when it should have failed: {} {}", cmd, output.status ); + // Output should be empty for non-existent item let output_str = String::from_utf8_lossy(&output.stdout).to_string(); assert!(output_str.is_empty(), "Command output is not empty. Command: {} Output: {}", cmd, output_str);