Refactor test suite to simplify test tracking and reporting

- Remove global test counters and result tracking from individual test scripts
- Use local test number and failure tracking variables
- Eliminate redundant test results file updates
- Simplify test exit strategy by returning failures as exit code
- Remove unnecessary test utility functions like `plan()` and `update_test_results()`

This refactoring improves test script modularity and reduces global state management in the test suite.

Author: vgrichina

test/test_runner.sh

@@ -6,9 +6,6 @@
 TEST_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$TEST_DIR/.." && pwd)"
 
-# Source test utilities
-source "$TEST_DIR/test_utils.sh"
-
 # Initialize counters
 TESTS_PASSED=0
 TESTS_FAILED=0
@@ -22,14 +19,7 @@ test_files=("$TEST_DIR"/unit/test_*.sh)
 total_test_files=${#test_files[@]}
 echo "1..$total_test_files"
 
-# Create or clear the test results file
-echo "PASSED:0" > "$TEST_DIR/test_results.txt"
-echo "FAILED:0" >> "$TEST_DIR/test_results.txt"
-
-# Make test utilities executable
-chmod +x "$TEST_DIR/test_utils.sh"
-
-# Make test scripts executable
+# Make all test scripts executable
 for test_file in "${test_files[@]}"; do
     chmod +x "$test_file"
 done

test/test_utils.sh

@@ -2,32 +2,18 @@
 
 # test_utils.sh - Utilities for testing the context script (TAP-compliant)
 
-# Get the directory where the test_utils.sh script is located
-TEST_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Initialize test counters
-TESTS_PASSED=0
-TESTS_FAILED=0
-TEST_NUMBER_INTERNAL=0
-
-# Function to update test result counts
-update_test_results() {
-    echo "PASSED:$TESTS_PASSED" > "$TEST_DIR/test_results.txt"
-    echo "FAILED:$TESTS_FAILED" >> "$TEST_DIR/test_results.txt"
-}
-
 # Function to run a test and output TAP-compliant results
 # Usage: run_test "test_description" "command_to_run"
 run_test() {
     local description="$1"
     local command="$2"
     local skip_reason="${3:-}"
 
-    TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
+    local test_number=$((test_number + 1))
 
     # Skip test if reason provided
     if [ -n "$skip_reason" ]; then
-        echo "ok $TEST_NUMBER_INTERNAL # SKIP $description - $skip_reason"
+        echo "ok $test_number # SKIP $description - $skip_reason"
         return 0
     fi
 
@@ -44,10 +30,9 @@ run_test() {
 
     # Handle the result
     if [ $status -eq 0 ]; then
-        echo "ok $TEST_NUMBER_INTERNAL - $description"
-        TESTS_PASSED=$((TESTS_PASSED + 1))
+        echo "ok $test_number - $description"
     else
-        echo "not ok $TEST_NUMBER_INTERNAL - $description"
+        echo "not ok $test_number - $description"
         echo "# Command: $command"
 
         if [ -n "$output" ]; then
@@ -60,12 +45,12 @@ run_test() {
             echo "$error" | sed 's/^/#  /'
         fi
 
-        TESTS_FAILED=$((TESTS_FAILED + 1))
+        # Save the failure status for the exit code
+        failures=$((failures + 1))
     fi
 
     # Clean up temporary files
     rm -f "$output_file" "$error_file"
-    update_test_results
 
     return $status
 }
@@ -98,18 +83,15 @@ assert() {
     local condition="$1"
     local description="$2"
 
-    TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
+    local test_number=$((test_number + 1))
 
     if eval "$condition"; then
-        echo "ok $TEST_NUMBER_INTERNAL - $description"
-        TESTS_PASSED=$((TESTS_PASSED + 1))
+        echo "ok $test_number - $description"
     else
-        echo "not ok $TEST_NUMBER_INTERNAL - $description"
+        echo "not ok $test_number - $description"
         echo "# Failed condition: $condition"
-        TESTS_FAILED=$((TESTS_FAILED + 1))
+        failures=$((failures + 1))
     fi
-    
-    update_test_results
 }
 
 # Function to create a test file with a specific size
@@ -137,19 +119,3 @@ create_test_file() {
         echo "# Warning: Created file size ($final_size) doesn't match requested size ($size_bytes)" >&2
     fi
 }
-
-# Print TAP plan for individual test files
-plan() {
-    local count="$1"
-    echo "1..$count"
-}
-
-# Export functions and variables for use in subshells
-export -f run_test
-export -f create_test_dir
-export -f cleanup_test_dir
-export -f tap_diag
-export -f assert
-export -f create_test_file
-export -f plan
-export -f update_test_results

test/unit/test_argument_parsing.sh

@@ -10,13 +10,12 @@ PROJECT_ROOT="$(cd "$TEST_DIR/.." && pwd)"
 # Source test utilities
 source "$TEST_DIR/test_utils.sh"
 
-# Initialize test counters for this file
-TESTS_PASSED=0
-TESTS_FAILED=0
-TEST_NUMBER_INTERNAL=0
+# Initialize variables
+test_number=0
+failures=0
 
 # Print TAP plan
-echo "1..4"  # Reduced from 5 to 4 tests
+echo "1..4"
 
 # Create a temporary directory for this test
 test_dir=$(create_test_dir)
@@ -38,64 +37,48 @@ EOF
 chmod +x "$PROJECT_ROOT/context"
 
 # Test 1: Help option
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 help_output=$("$PROJECT_ROOT/context" --help 2>&1)
 if echo "$help_output" | grep -q "Usage:"; then
-    echo "ok $TEST_NUMBER_INTERNAL - help option displays usage"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - help option displays usage"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - help option displays usage"
+    echo "not ok $((test_number+=1)) - help option displays usage"
     echo "# Help output did not contain 'Usage:'"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Test 2: Summary option
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 summary_output=$(cd "$test_dir" && "$PROJECT_ROOT/context" test.js --summary 2>&1)
 if echo "$summary_output" | grep -q "Summary:"; then
-    echo "ok $TEST_NUMBER_INTERNAL - summary option displays summary"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - summary option displays summary"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - summary option displays summary"
+    echo "not ok $((test_number+=1)) - summary option displays summary"
     echo "# Summary output did not contain 'Summary:'"
     echo "# Output: $summary_output"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Test 3: No ls-files option
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 nolsfiles_output=$(cd "$test_dir" && "$PROJECT_ROOT/context" test.js --no-ls-files 2>&1)
 if ! echo "$nolsfiles_output" | grep -q "Repository Files"; then
-    echo "ok $TEST_NUMBER_INTERNAL - no-ls-files option hides repository files"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - no-ls-files option hides repository files"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - no-ls-files option hides repository files"
+    echo "not ok $((test_number+=1)) - no-ls-files option hides repository files"
     echo "# Output still contained 'Repository Files' despite --no-ls-files"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
-# Test 4: Invalid option (previously Test 5)
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
+# Test 4: Invalid option
 if ! "$PROJECT_ROOT/context" --invalid-option >/dev/null 2>&1; then
-    echo "ok $TEST_NUMBER_INTERNAL - invalid option causes error"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - invalid option causes error"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - invalid option causes error"
+    echo "not ok $((test_number+=1)) - invalid option causes error"
     echo "# Command with invalid option did not fail as expected"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Clean up
 echo "# Tests completed, cleaning up"
 cleanup_test_dir "$test_dir"
 
-# Update test results file
-echo "PASSED:$TESTS_PASSED" > "$TEST_DIR/test_results.txt"
-echo "FAILED:$TESTS_FAILED" >> "$TEST_DIR/test_results.txt"
-
 # Exit with success if all tests passed
-if [ $TESTS_FAILED -eq 0 ]; then
-    exit 0
-else
-    exit 1
-fi
+exit $failures

test/unit/test_file_processing.sh

@@ -10,10 +10,9 @@ PROJECT_ROOT="$(cd "$TEST_DIR/.." && pwd)"
 # Source test utilities
 source "$TEST_DIR/test_utils.sh"
 
-# Initialize test counters for this file
-TESTS_PASSED=0
-TESTS_FAILED=0
-TEST_NUMBER_INTERNAL=0
+# Initialize variables
+test_number=0
+failures=0
 
 # Print TAP plan
 echo "1..4"
@@ -33,62 +32,46 @@ echo "// Should be excluded - node_modules content" > "$test_dir/node_modules/ex
 chmod +x "$PROJECT_ROOT/context"
 
 # Test 1: Basic file inclusion
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 if cd "$test_dir" && "$PROJECT_ROOT/context" src/file1.js | grep -q "Test file 1"; then
-    echo "ok $TEST_NUMBER_INTERNAL - basic file inclusion"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - basic file inclusion"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - basic file inclusion"
+    echo "not ok $((test_number+=1)) - basic file inclusion"
     echo "# Command failed: cd $test_dir && $PROJECT_ROOT/context src/file1.js"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Test 2: File pattern inclusion - simplified
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 if cd "$test_dir" && "$PROJECT_ROOT/context" src/file2.js | grep -q "Test file 2"; then
-    echo "ok $TEST_NUMBER_INTERNAL - file pattern inclusion"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - file pattern inclusion"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - file pattern inclusion"
+    echo "not ok $((test_number+=1)) - file pattern inclusion"
     echo "# Command failed: cd $test_dir && $PROJECT_ROOT/context src/file2.js"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Test 3: Exclude pattern
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 output=$(cd "$test_dir" && "$PROJECT_ROOT/context" src/file1.js --exclude="node_modules/" 2>&1)
 if ! echo "$output" | grep -q "node_modules content"; then
-    echo "ok $TEST_NUMBER_INTERNAL - exclude pattern"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - exclude pattern"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - exclude pattern"
+    echo "not ok $((test_number+=1)) - exclude pattern"
     echo "# Output contained excluded content"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Test 4: Multiple file arguments
-TEST_NUMBER_INTERNAL=$((TEST_NUMBER_INTERNAL + 1))
 output=$(cd "$test_dir" && "$PROJECT_ROOT/context" src/file1.js src/file2.js 2>&1)
 if echo "$output" | grep -q "Test file 1" && echo "$output" | grep -q "Test file 2"; then
-    echo "ok $TEST_NUMBER_INTERNAL - multiple file arguments"
-    TESTS_PASSED=$((TESTS_PASSED + 1))
+    echo "ok $((test_number+=1)) - multiple file arguments"
 else
-    echo "not ok $TEST_NUMBER_INTERNAL - multiple file arguments"
+    echo "not ok $((test_number+=1)) - multiple file arguments"
     echo "# Output did not contain both test files"
-    TESTS_FAILED=$((TESTS_FAILED + 1))
+    failures=$((failures + 1))
 fi
 
 # Clean up
 echo "# Tests completed, cleaning up"
 cleanup_test_dir "$test_dir"
 
-# Update test results file
-echo "PASSED:$TESTS_PASSED" > "$TEST_DIR/test_results.txt"
-echo "FAILED:$TESTS_FAILED" >> "$TEST_DIR/test_results.txt"
-
 # Exit with success if all tests passed
-if [ $TESTS_FAILED -eq 0 ]; then
-    exit 0
-else
-    exit 1
-fi
+exit $failures