Test improvements and coverage updates

Author: ipv1337

run_targeted_coverage.sh

@@ -6,25 +6,37 @@ set -e
 
 echo "Running coverage for key modules..."
 
-# Tools modules
-echo "==== Testing test_runner.py ===="
-python -m pytest tests/tools/test_test_runner_tool.py --cov=src.cli_code.tools.test_runner --cov-report=term
+# Test runner tool - Run test files separately to avoid import conflicts
+echo "==== Testing test_runner.py (test_dir tests) ===="
+python -m pytest test_dir/test_test_runner_tool.py -v --cov=src.cli_code.tools.test_runner --cov-report=term
 
-echo "==== Testing system_tools.py ===="
-python -m pytest test_dir/test_system_tools.py --cov=src.cli_code.tools.system_tools --cov-report=term
+echo "==== Testing test_runner.py (tests/tools tests) ===="
+python -m pytest tests/tools/test_test_runner_tool.py -v --cov=src.cli_code.tools.test_runner --cov-append --cov-report=term
 
-echo "==== Testing task_complete_tool.py ===="
-python -m pytest tests/tools/test_task_complete_tool.py --cov=src.cli_code.tools.task_complete_tool --cov-report=term
+# Gemini model
+echo "==== Testing gemini.py ===="
+python -m pytest test_dir/test_gemini_model*.py -v --cov=src.cli_code.models.gemini --cov-report=term
+
+# Ollama model
+echo "==== Testing ollama.py ===="
+python -m pytest test_dir/test_ollama_model*.py -v --cov=src.cli_code.models.ollama --cov-report=term
 
-# Models modules
-echo "==== Testing models/base.py ===="
-python -m pytest test_dir/test_models_base.py --cov=src.cli_code.models.base --cov-report=term
+# File tools
+echo "==== Testing file_tools.py ===="
+python -m pytest test_dir/test_file_tools.py -v --cov=src.cli_code.tools.file_tools --cov-report=term
 
-# Gemini model tests (excluding the failing test)
-echo "==== Testing Gemini model error handling (with skipped test_generate_with_quota_error_and_fallback_returns_success) ===="
-python -m pytest test_dir/test_gemini_model_error_handling.py -k "not test_generate_with_quota_error_and_fallback_returns_success" --cov=src.cli_code.models.gemini --cov-report=term
+# Tree tool
+echo "==== Testing tree_tool.py ===="
+python -m pytest test_dir/test_tree_tool.py -v --cov=src.cli_code.tools.tree_tool --cov-report=term
+python -m pytest test_dir/test_tree_tool_edge_cases.py -v --cov=src.cli_code.tools.tree_tool --cov-append --cov-report=term
+
+# Task complete tool
+echo "==== Testing task_complete_tool.py ===="
+python -m pytest test_dir/test_task_complete_tool.py -v --cov=src.cli_code.tools.task_complete_tool --cov-report=term
+python -m pytest tests/tools/test_task_complete_tool.py -v --cov=src.cli_code.tools.task_complete_tool --cov-append --cov-report=term
 
-# Add more modules as needed
-# python -m pytest path/to/test --cov=src.cli_code.module --cov-report=term
+# Run tests for all remaining tools to get comprehensive coverage
+echo "==== Testing other tools ===="
+python -m pytest test_dir/test_tools_basic.py test_dir/test_tools_init_coverage.py test_dir/test_directory_tools.py test_dir/test_quality_tools.py test_dir/test_summarizer_tool.py -v --cov=src.cli_code.tools --cov-report=term
 
 echo "Targeted coverage complete!" 

test_dir/test_file_tools.py

@@ -1,13 +1,21 @@
 """
 Tests for file operation tools.
 """
+import pytest
 import os
+import tempfile
 import re
 import glob
-import pytest
-from unittest.mock import patch, mock_open, MagicMock, call
+from unittest.mock import patch, MagicMock, mock_open, call
+import shutil
+import sys
+from pathlib import Path
+
+# Add the src directory to the path for imports
+sys.path.insert(0, str(Path(__file__).parent.parent))
 
-from cli_code.tools.file_tools import ViewTool, EditTool, GrepTool, GlobTool, MAX_CHARS_FOR_FULL_CONTENT
+# Import the classes and functions directly for better coverage tracking
+from src.cli_code.tools.file_tools import ViewTool, EditTool, GrepTool, GlobTool, MAX_CHARS_FOR_FULL_CONTENT
 
 
 class TestViewTool:

test_dir/test_gemini_model.py

@@ -8,15 +8,21 @@
 import unittest
 from unittest.mock import patch, MagicMock, mock_open, call
 import pytest
+from pathlib import Path
+
+# Add the src directory to the path for imports
+sys.path.insert(0, str(Path(__file__).parent.parent))
 
 # Check if running in CI
 IN_CI = os.environ.get('CI', 'false').lower() == 'true'
 
 # Handle imports
 try:
-    from cli_code.models.gemini import GeminiModel
     from rich.console import Console
     import google.generativeai as genai
+    from src.cli_code.models.gemini import GeminiModel
+    from src.cli_code.tools.base import BaseTool
+    from src.cli_code.tools import AVAILABLE_TOOLS
     IMPORTS_AVAILABLE = True
 except ImportError:
     IMPORTS_AVAILABLE = False
@@ -52,7 +58,7 @@ def setup_method(self):
         self.mock_console = MagicMock(spec=Console)
 
         # Keep get_tool patch here if needed by other tests, or move into tests
-        self.get_tool_patch = patch('cli_code.models.gemini.get_tool')
+        self.get_tool_patch = patch('src.cli_code.models.gemini.get_tool')
         self.mock_get_tool = self.get_tool_patch.start()
         # Configure default mock tool behavior if needed by other tests
         self.mock_tool = MagicMock()
@@ -186,7 +192,7 @@ def test_get_initial_context_with_ls_fallback(self, tmp_path):
 
         # Act: Patch get_tool locally
         # Note: GeminiModel imports get_tool directly
-        with patch('cli_code.models.gemini.get_tool') as mock_get_tool:
+        with patch('src.cli_code.models.gemini.get_tool') as mock_get_tool:
             mock_get_tool.return_value = mock_ls_tool
             model = GeminiModel("fake-api-key", self.mock_console, "gemini-pro")
             context = model._get_initial_context()
@@ -203,7 +209,7 @@ def test_get_initial_context_with_ls_fallback(self, tmp_path):
     def test_create_tool_definitions(self):
         """Test creation of tool definitions for Gemini."""
         # Create a mock for AVAILABLE_TOOLS
-        with patch('cli_code.models.gemini.AVAILABLE_TOOLS') as mock_available_tools:
+        with patch('src.cli_code.models.gemini.AVAILABLE_TOOLS') as mock_available_tools:
             # Sample tool definition
             mock_available_tools.return_value = {
                 "test_tool": {