`cceeb7c`

update 'test bench'

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 11 months ago

SHA: cceeb7cbe5131ef4fa945b26770614b76427cebe
Parents: 63d0695
Tree: 643ed62

2 changed files

Status	File	+	-
M	`test_shtick.py`	212	14
D	`test_shtick.sh`	0	236

test_shtick.pymodified

  #!/usr/bin/env python3
  """
 -test_shtick_fixed.py - Comprehensive test suite for shtick commands
 -Fixed to handle interactive prompts
 +test_shtick_enhanced.py - Comprehensive test suite for shtick commands
 +Enhanced with backup and group management tests
  """
  import subprocess
          """Set up test environment"""
          self.test_dir = tempfile.mkdtemp(prefix="shtick_test_")
          os.environ["HOME"] = self.test_dir
 +        os.environ["SHTICK_ORIGINAL_HOME"] = (
 +            self.original_home
 +        )  # For security.py to work
          os.makedirs(os.path.join(self.test_dir, ".config", "shtick"), exist_ok=True)
          # Create a settings file that disables auto_source_prompt to avoid timeouts
              os.environ["HOME"] = self.original_home
          else:
              os.environ.pop("HOME", None)
 +        os.environ.pop("SHTICK_ORIGINAL_HOME", None)
      def run_command(self, args, input_text=None, env_override=None):
          """Run a shtick command and return (output, return_code)"""
          # Always ensure we're using our test HOME
          env["HOME"] = self.test_dir
 +        env["SHTICK_ORIGINAL_HOME"] = self.original_home  # For security.py
          try:
              # For commands that might prompt, always provide 'n' as input
          description,
          input_text=None,
          env_override=None,
 +        check_output=None,
 +        check_not_output=None,
      ):
          """Run a test and check the result"""
          self.tests_run += 1
          output, actual_status = self.run_command(args, input_text, env_override)
 -        if actual_status == expected_status:
 +        # Check status code
 +        status_ok = actual_status == expected_status
++
 +        # Check output if requested
 +        output_ok = True
 +        if check_output is not None:
 +            output_ok = check_output in output
 +        if check_not_output is not None and output_ok:
 +            output_ok = check_not_output not in output
++
 +        if status_ok and output_ok:
              print(f"{GREEN}PASS{NC}")
              self.tests_passed += 1
          else:
              print(f"{RED}FAIL{NC}")
 -            print(f"  Expected status: {expected_status}, Got: {actual_status}")
 +            if not status_ok:
 +                print(f"  Expected status: {expected_status}, Got: {actual_status}")
 +            if not output_ok:
 +                if check_output is not None:
 +                    print(f"  Expected output to contain: {check_output}")
 +                if check_not_output is not None:
 +                    print(f"  Expected output NOT to contain: {check_not_output}")
              print(f"  Command: {' '.join(self.shtick_cmd + args)}")
              print(f"  Output: {output[:500]}...")  # Truncate long output
              self.tests_failed += 1
      def run_all_tests(self):
          """Run all tests"""
          print("===================================")
 -        print("Shtick Command Test Suite (Python)")
 +        print("Shtick Command Test Suite (Enhanced)")
          print("===================================\n")
          self.setup()
                  "deactivate-inactive",
                  ["deactivate", "work"],
 ,
 -                "Deactivate already inactive group",
 +                "Deactivate already inactive group (idempotent)",
+             )
              # Test 5: Remove operations - provide input for selection
                  "remove-nonexistent",
                  ["remove-persistent", "alias", "nonexistent"],
 ,
 -                "Remove non-existent item",
 +                "Remove non-existent item (no-op)",
+             )
              # Re-add for next test
              # Test 13: Backup functionality
              print(f"\n{YELLOW}Testing backup functionality:{NC}")
 +            # Add some content first
 +            self.run_command(["alias", "backup_test=echo backup"])
              self.test_command("backup-create", ["backup", "create"], 0, "Create backup")
 +            self.test_command(
 +                "backup-create-named",
 +                ["backup", "create", "-n", "test_backup"],
 +                0,
 +                "Create named backup",
 +            )
              self.test_command("backup-list", ["backup", "list"], 0, "List backups")
 -            # Test 14: Group management
 -            print(f"\n{YELLOW}Testing group management:{NC}")
 +            # Modify config
 +            self.run_command(["alias", "after_backup=echo after"])
++
 +            # Restore and verify
 +            self.test_command(
 +                "backup-restore",
 +                ["backup", "restore", "test_backup"],
 +                0,
 +                "Restore from backup",
 +            )
++
 +            # Verify restore worked by checking if the new alias is gone
 +            output, _ = self.run_command(["list"])
 +            if "after_backup" not in output:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-restore: Backup restore worked correctly ... {GREEN}PASS{NC}"
 +                )
 +                self.tests_passed += 1
 +            else:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-restore: Backup restore failed ... {RED}FAIL{NC}"
 +                )
 +                self.tests_failed += 1
 +            self.tests_run += 1
++
 +            # Test 14: Group management - NOW WITH REAL FUNCTIONALITY!
 +            print(f"\n{YELLOW}Testing group management (enhanced):{NC}")
++
 +            # Test creating a new group
 +            self.test_command(
 +                "group-create",
 +                ["group", "create", "testgroup"],
 +                0,
 +                "Create new group",
 +                check_output="✓ Created group 'testgroup'",
 +                check_not_output="will be created when you add",
 +            )
++
 +            # Verify the group exists in status
 +            output, _ = self.run_command(["status"])
 +            if "testgroup: 0 items" in output:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-group-exists: Created group shows in status ... {GREEN}PASS{NC}"
 +                )
 +                self.tests_passed += 1
 +            else:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-group-exists: Created group should show in status ... {RED}FAIL{NC}"
 +                )
 +                print(f"  Status output: {output}")
 +                self.tests_failed += 1
 +            self.tests_run += 1
++
 +            # Verify we can activate the empty group
 +            self.test_command(
 +                "activate-empty-group",
 +                ["activate", "testgroup"],
 +                0,
 +                "Activate empty group",
 +            )
++
 +            # Verify the group shows as active
 +            output, _ = self.run_command(["status"])
 +            if "testgroup: 0 items (ACTIVE)" in output:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-group-active: Empty group shows as active ... {GREEN}PASS{NC}"
 +                )
 +                self.tests_passed += 1
 +            else:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-group-active: Empty group should show as active ... {RED}FAIL{NC}"
 +                )
 +                print(f"  Status output: {output}")
 +                self.tests_failed += 1
 +            self.tests_run += 1
++
 +            # Test adding to the newly created group
 +            self.test_command(
 +                "add-to-created-group",
 +                ["add", "alias", "testgroup", "tg=echo testgroup"],
 +                0,
 +                "Add item to newly created group",
 +            )
++
 +            # Verify the group now has 1 item
 +            output, _ = self.run_command(["status"])
 +            if "testgroup: 1 items (ACTIVE)" in output:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-group-has-item: Group shows 1 item after add ... {GREEN}PASS{NC}"
 +                )
 +                self.tests_passed += 1
 +            else:
 +                print(
 +                    f"[{self.tests_run + 1}] verify-group-has-item: Group should show 1 item ... {RED}FAIL{NC}"
 +                )
 +                print(f"  Status output: {output}")
 +                self.tests_failed += 1
 +            self.tests_run += 1
++
 +            # Test creating duplicate group
              self.test_command(
 -                "group-create", ["group", "create", "testgroup"], 0, "Create new group"
 +                "group-create-duplicate",
 +                ["group", "create", "testgroup"],
 +                1,
 +                "Cannot create duplicate group",
 +                check_output="already exists",
+             )
++
 +            # Check the TOML file contains empty sections
 +            config_path = os.path.join(
 +                self.test_dir, ".config", "shtick", "config.toml"
 +            )
 +            if os.path.exists(config_path):
 +                with open(config_path, "r") as f:
 +                    toml_content = f.read()
 +                    # Check for either nested format (with tomli_w) or flat format (fallback)
 +                    has_nested = (
 +                        "[testgroup]" in toml_content
 +                        and "[testgroup.aliases]" in toml_content
 +                    )
 +                    has_flat = "[testgroup.aliases]" in toml_content
 +                    if has_nested or has_flat:
 +                        print(
 +                            f"[{self.tests_run + 1}] verify-toml-structure: TOML has proper empty group structure ... {GREEN}PASS{NC}"
 +                        )
 +                        self.tests_passed += 1
 +                    else:
 +                        print(
 +                            f"[{self.tests_run + 1}] verify-toml-structure: TOML should have empty group sections ... {RED}FAIL{NC}"
 +                        )
 +                        print(f"  TOML content:\n{toml_content[:500]}")
 +                        self.tests_failed += 1
 +                    self.tests_run += 1
++
 +            # Still test unimplemented features
              self.test_command(
                  "group-rename",
                  ["group", "rename", "testgroup", "newgroup"],
 -                0,
 -                "Rename group",
 +                1,
 +                "Rename group (not implemented)",
 +                check_output="not yet implemented",
+             )
              self.test_command(
 -                "group-remove", ["group", "remove", "newgroup", "-f"], 0, "Remove group"
 +                "group-remove",
 +                ["group", "remove", "testgroup", "-f"],
 +                1,
 +                "Remove group (not implemented)",
 +                check_output="not yet implemented",
 +            )
++
 +            # Test 15: Exit code consistency
 +            print(f"\n{YELLOW}Testing exit code consistency:{NC}")
 +            # Test that user cancellation uses exit code 2
 +            output, status = self.run_command(
 +                ["settings", "init"], input_text="\x03"
 +            )  # Ctrl+C
 +            if status == 2 or "Cancelled" in output:
 +                print(
 +                    f"[{self.tests_run + 1}] user-cancel-exit-code: User cancellation returns code 2 ... {GREEN}PASS{NC}"
 +                )
 +                self.tests_passed += 1
 +            else:
 +                print(
 +                    f"[{self.tests_run + 1}] user-cancel-exit-code: User cancellation should return code 2 ... {RED}FAIL{NC}"
 +                )
 +                print(f"  Got status: {status}, output: {output}")
 +                self.tests_failed += 1
 +            self.tests_run += 1
++
 +            # Test 16: No-output commands should still exit properly
 +            print(f"\n{YELLOW}Testing commands with no output still exit properly:{NC}")
 +            # Create an empty config scenario
 +            empty_dir = tempfile.mkdtemp()
 +            self.test_command(
 +                "list-empty-explicit-exit",
 +                ["list"],
 +                0,
 +                "List with empty config exits 0",
 +                env_override={"HOME": empty_dir},
+             )
 +            shutil.rmtree(empty_dir)
          finally:
              self.cleanup()
      """Run the test suite"""
      # Check if we should run in non-interactive mode
      if len(sys.argv) > 1 and sys.argv[1] == "--help":
 -        print("Usage: test_shtick_fixed.py")
 +        print("Usage: test_shtick_enhanced.py")
          print("Run comprehensive tests for shtick command line tool")
          return 0

test_shtick.shdeleted

 -#!/bin/bash
 -# test_shtick_fixed.sh - Test suite for shtick commands with proper PATH handling
+-
 -set -e  # Exit on error
+-
 -# Colors for output
 -RED='\033[0;31m'
 -GREEN='\033[0;32m'
 -YELLOW='\033[1;33m'
 -NC='\033[0m' # No Color
+-
 -# Test counters
 -TESTS_RUN=0
 -TESTS_PASSED=0
 -TESTS_FAILED=0
+-
 -# Test config directory
 -TEST_DIR="/tmp/shtick_test_$$"
 -export HOME="$TEST_DIR"
 -CONFIG_DIR="$TEST_DIR/.config/shtick"
+-
 -# Find shtick command - try multiple approaches
 -find_shtick() {
 -    # Method 1: Check if shtick is in PATH
 -    if command -v shtick >/dev/null 2>&1; then
 -        SHTICK_CMD="shtick"
 -        echo "Found shtick in PATH: $(command -v shtick)"
 -        return 0
 -    fi
+-
 -    # Method 2: Check if we're in development directory with cli.py
 -    if [ -f "./shtick/cli.py" ]; then
 -        SHTICK_CMD="python -m shtick.cli"
 -        echo "Found shtick module in current directory, using: $SHTICK_CMD"
 -        return 0
 -    fi
+-
 -    # Method 3: Check parent directory
 -    if [ -f "../shtick/cli.py" ]; then
 -        SHTICK_CMD="python -m shtick.cli"
 -        echo "Found shtick module in parent directory"
 -        cd ..
 -        return 0
 -    fi
+-
 -    # Method 4: Try direct python execution
 -    if [ -f "cli.py" ]; then
 -        SHTICK_CMD="python cli.py"
 -        echo "Found cli.py in current directory, using: $SHTICK_CMD"
 -        return 0
 -    fi
+-
 -    echo "ERROR: Cannot find shtick command!"
 -    echo "Please ensure either:"
 -    echo "  1. shtick is installed and in your PATH"
 -    echo "  2. You're running this from the shtick source directory"
 -    echo "  3. The shtick package is properly installed with 'pip install -e .'"
 -    exit 1
 -}
+-
 -# Clean up function
 -cleanup() {
 -    rm -rf "$TEST_DIR"
 -}
 -trap cleanup EXIT
+-
 -# Setup test environment
 -setup() {
 -    rm -rf "$TEST_DIR"
 -    mkdir -p "$CONFIG_DIR"
 -    cd "$TEST_DIR"
 -}
+-
 -# Test function
 -test_command() {
 -    local test_name="$1"
 -    local command="$2"
 -    local expected_status="$3"
 -    local description="$4"
+-
 -    TESTS_RUN=$((TESTS_RUN + 1))
+-
 -    echo -n "[$TESTS_RUN] $test_name: $description ... "
+-
 -    # Replace 'shtick' with actual command
 -    command="${command//shtick/$SHTICK_CMD}"
+-
 -    # Run command and capture status
 -    set +e
 -    output=$(eval "$command" 2>&1)
 -    actual_status=$?
 -    set -e
+-
 -    if [ $actual_status -eq $expected_status ]; then
 -        echo -e "${GREEN}PASS${NC}"
 -        TESTS_PASSED=$((TESTS_PASSED + 1))
 -    else
 -        echo -e "${RED}FAIL${NC}"
 -        echo "  Expected status: $expected_status, Got: $actual_status"
 -        echo "  Command: $command"
 -        echo "  Output: $output"
 -        TESTS_FAILED=$((TESTS_FAILED + 1))
 -    fi
 -}
+-
 -# Verify shtick is working
 -verify_shtick() {
 -    echo "Verifying shtick command..."
 -    set +e
 -    output=$($SHTICK_CMD --help 2>&1)
 -    status=$?
 -    set -e
+-
 -    if [ $status -ne 0 ]; then
 -        echo -e "${RED}ERROR: shtick command not working!${NC}"
 -        echo "Command: $SHTICK_CMD --help"
 -        echo "Status: $status"
 -        echo "Output: $output"
 -        exit 1
 -    fi
 -    echo -e "${GREEN}✓ shtick command verified${NC}"
 -    echo
 -}
+-
 -# Header
 -echo "==================================="
 -echo "Shtick Command Test Suite"
 -echo "==================================="
 -echo
+-
 -# Find shtick command
 -find_shtick
+-
 -# Setup
 -setup
+-
 -# Verify shtick works
 -verify_shtick
+-
 -# Save original directory to return to later
 -ORIGINAL_DIR=$(pwd)
+-
 -# Test 1: Basic commands without config
 -echo -e "${YELLOW}Testing basic commands without config:${NC}"
 -test_command "status-no-config" "shtick status" 0 "Status should work without config"
 -test_command "list-no-config" "shtick list" 0 "List should work without config"
 -test_command "shells" "shtick shells" 0 "Shells command should always work"
+-
 -# Test 2: Adding items (creates config)
 -echo -e "\n${YELLOW}Testing add commands:${NC}"
 -test_command "add-alias" "shtick alias ll='ls -la'" 0 "Add persistent alias"
 -test_command "add-env" "shtick env DEBUG=1" 0 "Add persistent env var"
 -test_command "add-function" "shtick function greet='echo Hello'" 0 "Add persistent function"
+-
 -# Test 3: Invalid add commands
 -echo -e "\n${YELLOW}Testing invalid add commands:${NC}"
 -test_command "add-invalid-key" "shtick alias '123bad=value'" 1 "Invalid key should fail"
 -test_command "add-no-equals" "shtick alias 'no_equals_sign'" 1 "Missing = should fail"
 -test_command "add-empty-key" "shtick alias '=value'" 1 "Empty key should fail"
 -test_command "add-empty-value" "shtick alias 'key='" 1 "Empty value should fail"
+-
 -# Test 4: Group operations
 -echo -e "\n${YELLOW}Testing group operations:${NC}"
 -test_command "add-to-group" "shtick add alias work ll='ls -la'" 0 "Add to specific group"
 -test_command "activate-group" "shtick activate work" 0 "Activate existing group"
 -test_command "activate-nonexistent" "shtick activate nonexistent" 1 "Activate non-existent group should fail"
 -test_command "deactivate-group" "shtick deactivate work" 0 "Deactivate active group"
 -test_command "deactivate-inactive" "shtick deactivate work" 0 "Deactivate already inactive group"
+-
 -# Test 5: Remove operations
 -echo -e "\n${YELLOW}Testing remove operations:${NC}"
 -test_command "remove-existing" "echo 1 | shtick remove-persistent alias ll" 0 "Remove existing alias"
 -test_command "remove-nonexistent" "shtick remove-persistent alias nonexistent" 0 "Remove non-existent item"
 -test_command "remove-fuzzy" "echo 1 | shtick remove alias work ll" 0 "Remove with fuzzy match"
+-
 -# Test 6: Generate command
 -echo -e "\n${YELLOW}Testing generate command:${NC}"
 -test_command "generate-default" "shtick generate --terse" 0 "Generate with default config"
 -test_command "generate-custom" "shtick generate $CONFIG_DIR/config.toml --terse" 0 "Generate with custom config path"
 -test_command "generate-nonexistent" "shtick generate /tmp/nonexistent.toml" 1 "Generate with non-existent config should fail"
+-
 -# Test 7: Source command
 -echo -e "\n${YELLOW}Testing source command:${NC}"
 -test_command "source-bash" "SHELL=/bin/bash shtick source" 0 "Source command for bash"
 -test_command "source-no-shell" "SHELL= shtick source" 1 "Source without shell should fail"
+-
 -# Test 8: Settings commands
 -echo -e "\n${YELLOW}Testing settings commands:${NC}"
 -test_command "settings-show" "shtick settings show" 0 "Show settings"
 -test_command "settings-init" "shtick settings init" 0 "Initialize settings"
 -test_command "settings-set-bool" "shtick settings set behavior.auto_source_prompt false" 0 "Set boolean setting"
 -test_command "settings-set-invalid" "shtick settings set invalid.key value" 1 "Set invalid setting should fail"
+-
 -# Test 9: Edge cases
 -echo -e "\n${YELLOW}Testing edge cases:${NC}"
 -test_command "persistent-activate" "shtick activate persistent" 1 "Cannot activate persistent group"
 -test_command "persistent-deactivate" "shtick deactivate persistent" 1 "Cannot deactivate persistent group"
 -test_command "very-long-key" "shtick alias $(printf 'a%.0s' {1..65})=value" 1 "Key over 64 chars should fail"
+-
 -# Test 10: Special characters and escaping
 -echo -e "\n${YELLOW}Testing special characters:${NC}"
 -test_command "alias-with-quotes" "shtick alias msg='echo \"Hello World\"'" 0 "Alias with quotes"
 -test_command "alias-with-dollar" 'shtick alias home="cd \$HOME"' 0 "Alias with dollar sign"
 -test_command "multiline-function" 'shtick function hello="echo line1
 -echo line2"' 0 "Multiline function"
+-
 -# Test 11: List and status with content
 -echo -e "\n${YELLOW}Testing list and status with content:${NC}"
 -test_command "list-with-content" "shtick list" 0 "List with items"
 -test_command "list-long-format" "shtick list -l" 0 "List in long format"
 -test_command "status-with-content" "shtick status" 0 "Status with configuration"
+-
 -# Test 12: Conflict handling
 -echo -e "\n${YELLOW}Testing conflict handling:${NC}"
 -test_command "add-conflict-alias" "shtick add alias temp ll='ls -lah'" 0 "Add conflicting alias to different group"
 -test_command "check-conflict-warning" "shtick alias ll='ls -la' 2>&1 | grep -q 'exists in groups'" 0 "Should warn about conflicts"
+-
 -# Return to original directory
 -cd "$ORIGINAL_DIR"
+-
 -# Summary
 -echo
 -echo "==================================="
 -echo "Test Summary"
 -echo "==================================="
 -echo "Tests run:    $TESTS_RUN"
 -echo -e "Tests passed: ${GREEN}$TESTS_PASSED${NC}"
 -echo -e "Tests failed: ${RED}$TESTS_FAILED${NC}"
+-
 -if [ $TESTS_FAILED -eq 0 ]; then
 -    echo -e "\n${GREEN}All tests passed!${NC}"
 -    exit 0
 -else
 -    echo -e "\n${RED}Some tests failed!${NC}"
 -    exit 1
 -fi