c1dfe7b29f
Pre-existing failures unrelated to the de-cruft work; fix tests/production: 1. test_save_preset_project_no_root — production src/presets.py:save_preset now raises ValueError when project_root is None and scope='project' (was trying to write to '.' which the test_sandbox blocks). 2. test_handle_request_event_appends_definitions — production _symbol_resolution_result now normalizes dict file_items to .path access (was assuming FileItem dataclass). 3. test_rejection_prevents_dispatch — test now expects '' (empty string sentinel) for rejected dispatch. Did NOT change production signature to Optional[str] (which is banned per error_handling.md). Production still returns str per its signature; '' is the canonical sentinel for 'no dispatch happened'. 4. test_keyboard_shortcut_check_in_gui_func — test now patches src.gui_2.get_bg (the current function) instead of the deleted src.gui_2.bg_shader module. BackgroundShader class was moved from src/bg_shader.py into src/gui_2.py in module_taxonomy_refactor Phase 1.1. After this commit: - tier-1-unit-comms: 0 failures - tier-1-unit-core: 0 failures (of 1418 tests) - tier-1-unit-mma: 0 failures - tier-1-unit-gui: 0 failures - tier-1-unit-headless: 0 failures - tier-2-mock-app-comms: 0 failures - tier-2-mock-app-core: 0 failures - tier-2-mock-app-gui: 0 failures - tier-2-mock-app-mma: 0 failures Remaining: tier-2-mock-app-headless (3 FastAPI response shape mismatches) and tier-3-live-gui (test_auto_switch_sim).
103 lines
4.4 KiB
Python
103 lines
4.4 KiB
Python
import os
|
|
import sys
|
|
import unittest
|
|
from unittest.mock import patch, MagicMock
|
|
|
|
# Ensure project root is in path
|
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
|
|
|
|
|
class TestArchBoundaryPhase2(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
pass
|
|
|
|
def test_toml_exposes_all_dispatch_tools(self) -> None:
|
|
"""manual_slop.toml [agent.tools] must list every tool in mcp_client.dispatch()."""
|
|
from src import mcp_tool_specs
|
|
|
|
# We check the tool names in the source of mcp_client.dispatch
|
|
import inspect
|
|
import src.mcp_client as mcp
|
|
source = inspect.getsource(mcp.dispatch)
|
|
# This is a bit dynamic, but we can check if it covers our core tool names
|
|
for tool in mcp_tool_specs.tool_names():
|
|
if tool not in ("set_file_slice", "py_update_definition", "py_set_signature", "py_set_var_declaration"):
|
|
# Non-mutating tools should definitely be handled
|
|
pass
|
|
def test_toml_mutating_tools_disabled_by_default(self) -> None:
|
|
"""Verify that the core set of read-only tools is present."""
|
|
from src import mcp_tool_specs
|
|
tool_names = mcp_tool_specs.tool_names()
|
|
# Our architecture now uses a fixed set of high-signal tools
|
|
self.assertIn("read_file", tool_names)
|
|
self.assertIn("list_directory", tool_names)
|
|
self.assertIn("py_get_skeleton", tool_names)
|
|
|
|
def test_mcp_client_dispatch_completeness(self) -> None:
|
|
"""Verify that all tools in tool_schemas are handled by dispatch()."""
|
|
from src import mcp_client
|
|
# get_tool_schemas exists
|
|
available_tools = [t["name"] for t in mcp_client.get_tool_schemas()]
|
|
self.assertGreater(len(available_tools), 0)
|
|
|
|
def test_mutating_tool_triggers_callback(self) -> None:
|
|
"""All mutating tools must trigger the pre_tool_callback."""
|
|
from src.app_controller import AppController
|
|
|
|
# Use a real AppController to test its _confirm_and_run
|
|
with patch('src.app_controller.AppController.load_config', return_value={}), \
|
|
patch('src.performance_monitor.PerformanceMonitor'), \
|
|
patch('src.session_logger.open_session'), \
|
|
patch('src.session_logger.reset_session'), \
|
|
patch('src.app_controller.AppController._prune_old_logs'), \
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'):
|
|
controller = AppController()
|
|
|
|
mock_cb = MagicMock(return_value="output")
|
|
# AppController implements its own _confirm_and_run, let's see how we can mock the HITL part
|
|
# In AppController._confirm_and_run, if test_hooks_enabled=False (default), it waits for a dialog
|
|
|
|
with patch("src.shell_runner.run_powershell", return_value="output"):
|
|
# Simulate auto-approval for test
|
|
controller.test_hooks_enabled = True
|
|
controller.ui_manual_approve = False
|
|
res = controller._confirm_and_run("echo hello", ".")
|
|
self.assertEqual(res, "output")
|
|
|
|
def test_rejection_prevents_dispatch(self) -> None:
|
|
"""When pre_tool_callback returns None (rejected), dispatch must NOT be called."""
|
|
from src.app_controller import AppController
|
|
|
|
with patch('src.app_controller.AppController.load_config', return_value={}), \
|
|
patch('src.performance_monitor.PerformanceMonitor'), \
|
|
patch('src.session_logger.open_session'), \
|
|
patch('src.session_logger.reset_session'), \
|
|
patch('src.app_controller.AppController._prune_old_logs'), \
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'):
|
|
controller = AppController()
|
|
|
|
# Mock the wait() method of ConfirmDialog to return (False, script)
|
|
with patch("src.app_controller.ConfirmDialog") as mock_dialog_class:
|
|
mock_dialog = mock_dialog_class.return_value
|
|
mock_dialog.wait.return_value = (False, "script")
|
|
mock_dialog._uid = "test_uid"
|
|
|
|
with patch("src.shell_runner.run_powershell") as mock_run:
|
|
controller.test_hooks_enabled = False # Force manual approval (dialog)
|
|
res = controller._confirm_and_run("script", ".")
|
|
# Empty-string sentinel signals "no dispatch happened" without
|
|
# using Optional[str] in the production signature.
|
|
self.assertEqual(res, "")
|
|
self.assertFalse(mock_run.called)
|
|
|
|
def test_non_mutating_tool_skips_callback(self) -> None:
|
|
"""Read-only tools must NOT trigger pre_tool_callback."""
|
|
from src import ai_client
|
|
# Check internal list or method
|
|
if hasattr(ai_client, '_is_mutating_tool'):
|
|
mutating = ["run_powershell", "set_file_slice"]
|
|
for t in mutating:
|
|
self.assertTrue(ai_client._is_mutating_tool(t))
|
|
|
|
self.assertFalse(ai_client._is_mutating_tool("read_file"))
|
|
self.assertFalse(ai_client._is_mutating_tool("list_directory")) |