Improve shell script test consistency and robustness

- Refactor test scripts to use parameter expansion instead of sed
- Use more robust shell practices like command status checking
- Export PROJECT_ROOT to make it available in test scripts
- Add shellcheck-friendly modifications like local variable declarations
- Improve error handling and test reliability across test suite

Author: vgrichina

test/test_runner.sh

@@ -5,6 +5,7 @@
 # Get the directory where the test_runner.sh script is located
 TEST_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$TEST_DIR/.." && pwd)"
+export PROJECT_ROOT  # Export to make it available to test scripts
 
 # Initialize counters
 TESTS_PASSED=0
@@ -42,7 +43,7 @@ for test_file in "${test_files[@]}"; do
         else
             echo "not ok $TEST_NUMBER - $test_name"
             echo "# Test output:"
-            echo "$test_output" | sed 's/^/#  /'
+            echo "${test_output//$'\n'/$'\n'#  }"  # Use parameter expansion instead of sed
             TESTS_FAILED=$((TESTS_FAILED + 1))
         fi
     fi

test/test_utils.sh

@@ -18,15 +18,19 @@ run_test() {
     fi
 
     # Create temporary files for command output and error
-    local output_file=$(mktemp)
-    local error_file=$(mktemp)
+    local output_file
+    output_file=$(mktemp)
+    local error_file
+    error_file=$(mktemp)
 
     # Run the command
     eval "$command" > "$output_file" 2> "$error_file"
     local status=$?
 
-    local output=$(cat "$output_file")
-    local error=$(cat "$error_file")
+    local output
+    output=$(cat "$output_file")
+    local error
+    error=$(cat "$error_file")
 
     # Handle the result
     if [ $status -eq 0 ]; then
@@ -37,12 +41,12 @@ run_test() {
 
         if [ -n "$output" ]; then
             echo "# Output:"
-            echo "$output" | sed 's/^/#  /'
+            echo "${output//$'\n'/$'\n'#  }"  # Use parameter expansion instead of sed
         fi
 
         if [ -n "$error" ]; then
             echo "# Error:"
-            echo "$error" | sed 's/^/#  /'
+            echo "${error//$'\n'/$'\n'#  }"  # Use parameter expansion instead of sed
         fi
 
         # Save the failure status for the exit code
@@ -58,7 +62,8 @@ run_test() {
 # Function to create a temporary directory for tests
 # Usage: create_test_dir
 create_test_dir() {
-    local tmp_dir=$(mktemp -d -t "context-test-XXXXXX")
+    local tmp_dir
+    tmp_dir=$(mktemp -d -t "context-test-XXXXXX")
     echo "$tmp_dir"
 }
 
@@ -105,7 +110,8 @@ create_test_file() {
     echo "It contains exactly $size_bytes bytes of data." >> "$file_path"
 
     # Calculate how many bytes we need to add to reach the desired size
-    local current_size=$(wc -c < "$file_path")
+    local current_size
+    current_size=$(wc -c < "$file_path")
     local remaining_bytes=$((size_bytes - current_size))
 
     if [ $remaining_bytes -gt 0 ]; then
@@ -114,8 +120,9 @@ create_test_file() {
     fi
 
     # Verify the file is the right size
-    local final_size=$(wc -c < "$file_path")
-    if [ $final_size -ne $size_bytes ]; then
+    local final_size
+    final_size=$(wc -c < "$file_path")
+    if [ "$final_size" -ne "$size_bytes" ]; then
         echo "# Warning: Created file size ($final_size) doesn't match requested size ($size_bytes)" >&2
     fi
 }

test/unit/test_apply_md.sh

@@ -95,7 +95,7 @@ fi
 
 # Test 2: Invalid option
 invalid_output=$("$PROJECT_ROOT/apply-md" --invalid-option 2>&1)
-if [ $? -ne 0 ] && echo "$invalid_output" | grep -q "Unknown parameter"; then
+if ! "$PROJECT_ROOT/apply-md" --invalid-option >/dev/null 2>&1 && echo "$invalid_output" | grep -q "Unknown parameter"; then
     echo "ok $((test_number+=1)) - invalid option causes error"
 else
     echo "not ok $((test_number+=1)) - invalid option causes error"
@@ -105,7 +105,7 @@ else
 fi
 
 # Test 3: Combined arguments
-output=$(cd "$test_dir" && cat test_input.md | "$PROJECT_ROOT/apply-md" --dry-run --verbose 2>&1)
+output=$(cd "$test_dir" && "$PROJECT_ROOT/apply-md" --dry-run --verbose < test_input.md 2>&1)
 if echo "$output" | grep -q "DRY RUN" && echo "$output" | grep -q "Starting markdown code application"; then
     echo "ok $((test_number+=1)) - combined arguments work correctly"
 else
@@ -122,7 +122,7 @@ echo "Original content" > "$test_dir/file1.txt"
 echo "Original content" > "$test_dir/file2.txt"
 
 # Test 4: Basic file update
-if cd "$test_dir" && cat test_input.md | "$PROJECT_ROOT/apply-md" && grep -q "Updated content" test_file.txt; then
+if cd "$test_dir" && "$PROJECT_ROOT/apply-md" < test_input.md && grep -q "Updated content" test_file.txt; then
     echo "ok $((test_number+=1)) - basic file update"
 else
     echo "not ok $((test_number+=1)) - basic file update"
@@ -132,7 +132,7 @@ fi
 
 # Test 5: Dry run mode
 echo "Original content" > "$test_dir/test_file.txt"
-output=$(cd "$test_dir" && cat test_input.md | "$PROJECT_ROOT/apply-md" --dry-run 2>&1)
+output=$(cd "$test_dir" && "$PROJECT_ROOT/apply-md" --dry-run < test_input.md 2>&1)
 if grep -q "Original content" "$test_dir/test_file.txt" && echo "$output" | grep -q "Would update file"; then
     echo "ok $((test_number+=1)) - dry run mode"
 else
@@ -143,7 +143,7 @@ else
 fi
 
 # Test 6: Verbose mode
-output=$(cd "$test_dir" && cat test_input.md | "$PROJECT_ROOT/apply-md" --verbose 2>&1)
+output=$(cd "$test_dir" && "$PROJECT_ROOT/apply-md" --verbose < test_input.md 2>&1)
 if echo "$output" | grep -q "Starting markdown code application"; then
     echo "ok $((test_number+=1)) - verbose mode"
 else
@@ -156,7 +156,7 @@ fi
 echo "# Section 3: Create Missing Files Tests"
 
 # Test 7: Without create-missing flag
-output=$(cd "$test_dir" && cat missing_files.md | "$PROJECT_ROOT/apply-md" 2>&1)
+output=$(cd "$test_dir" && "$PROJECT_ROOT/apply-md" < missing_files.md 2>&1)
 if [ ! -f "$test_dir/new_file.txt" ] && echo "$output" | grep -q "Warning: File does not exist"; then
     echo "ok $((test_number+=1)) - without create-missing flag"
 else
@@ -167,7 +167,7 @@ else
 fi
 
 # Test 8: With create-missing flag
-output=$(cd "$test_dir" && cat missing_files.md | "$PROJECT_ROOT/apply-md" --create-missing 2>&1)
+output=$(cd "$test_dir" && "$PROJECT_ROOT/apply-md" --create-missing < missing_files.md 2>&1)
 if [ -f "$test_dir/new_file.txt" ] && [ -f "$test_dir/src/new_folder/script.js" ]; then
     echo "ok $((test_number+=1)) - with create-missing flag"
 else
@@ -180,7 +180,7 @@ fi
 echo "# Section 4: Multiple Blocks Tests"
 
 # Test 9: Multiple file updates
-output=$(cd "$test_dir" && cat multiple_blocks.md | "$PROJECT_ROOT/apply-md" --create-missing 2>&1)
+output=$(cd "$test_dir" && "$PROJECT_ROOT/apply-md" --create-missing < multiple_blocks.md 2>&1)
 if grep -q "Updated content 1" "$test_dir/file1.txt" && grep -q "Updated content 2" "$test_dir/file2.txt"; then
     echo "ok $((test_number+=1)) - multiple file updates"
 else
@@ -205,4 +205,4 @@ echo "# Tests completed, cleaning up"
 cleanup_test_dir "$test_dir"
 
 # Exit with success if all tests passed
-exit $failures
+exit $failures

test/unit/test_context.sh

@@ -124,7 +124,8 @@ fi
 
 # Test 8: Max size limit not exceeded
 small_output=$(cd "$test_dir" && "$PROJECT_ROOT/context" small.txt --max-size=2KB 2>&1)
-if [ $? -eq 0 ]; then
+# Check command status directly instead of using $?
+if "$PROJECT_ROOT/context" small.txt --max-size=2KB >/dev/null 2>&1; then
     echo "ok $((test_number+=1)) - max size limit not exceeded"
 else
     echo "not ok $((test_number+=1)) - max size limit not exceeded"

test/unit/test_git_context.sh

@@ -23,7 +23,7 @@ echo "# Using temporary directory: $test_dir"
 
 # Setup a minimal git repository
 mkdir -p "$test_dir/repo"
-cd "$test_dir/repo"
+cd "$test_dir/repo" || exit 1
 git init > /dev/null 2>&1
 git config --local user.email "[email protected]"
 git config --local user.name "Test User"
@@ -59,7 +59,7 @@ else
 fi
 
 # Test 2: No-prompt option
-no_prompt_output=$(cd "$test_dir/repo" && "$PROJECT_ROOT/git-context" --no-prompt 2>&1)
+no_prompt_output=$(cd "$test_dir/repo" || exit 1 && "$PROJECT_ROOT/git-context" --no-prompt 2>&1)
 if ! echo "$no_prompt_output" | grep -q "Commit Message Guidance"; then
     echo "ok $((test_number+=1)) - no-prompt option suppresses guidance"
 else
@@ -80,11 +80,11 @@ fi
 echo "# Section 2: Output Format Tests"
 
 # Make a change to test file for diff output
-cd "$test_dir/repo"
+cd "$test_dir/repo" || exit 1
 echo "Modified for diff" > test_file.txt
 
 # Test 4: Check for Git Status section
-output=$(cd "$test_dir/repo" && "$PROJECT_ROOT/git-context" 2>&1)
+output=$(cd "$test_dir/repo" || exit 1 && "$PROJECT_ROOT/git-context" 2>&1)
 if echo "$output" | grep -q "## Git Status"; then
     echo "ok $((test_number+=1)) - output contains Git Status section"
 else
@@ -123,7 +123,7 @@ fi
 echo "# Section 3: Prompt Handling Tests"
 
 # Test 8: Default prompt
-prompt_output=$(cd "$test_dir/repo" && "$PROJECT_ROOT/git-context" 2>&1)
+prompt_output=$(cd "$test_dir/repo" || exit 1 && "$PROJECT_ROOT/git-context" 2>&1)
 if echo "$prompt_output" | grep -q "Default prompt content"; then
     echo "ok $((test_number+=1)) - default prompt is included"
 else
@@ -134,7 +134,7 @@ else
 fi
 
 # Test 9: Custom prompt file
-custom_output=$(cd "$test_dir/repo" && "$PROJECT_ROOT/git-context" --prompt=custom_prompt.txt 2>&1)
+custom_output=$(cd "$test_dir/repo" || exit 1 && "$PROJECT_ROOT/git-context" --prompt=custom_prompt.txt 2>&1)
 if echo "$custom_output" | grep -q "Custom prompt content"; then
     echo "ok $((test_number+=1)) - custom prompt file is used"
 else