ed
3a80b65692
Phase 6: Eliminate Optional[T] returns - BATCHES 4 + 5 (FINAL) Before: 11 more Optional[T] returns removed (Phase 6 total: 30 of 30) After: 0 (Phase 6 COMPLETE per VC5) Delta: -11 sites in this commit; cumulative -30/30 sites across all batches Specific changes: - src/diff_viewer.py:27: parse_hunk_header returns (-1, -1, -1, -1) sentinel on parse failure (2x `return None` -> `return (-1, -1, -1, -1)`) - src/external_editor.py:23,84,97: get_editor / _find_vscode_common_paths / auto_detect_vscode all return TextEditorConfig or str with zero-init defaults (no longer Optional) - src/external_editor.py:48: launch_diff_result sentinel check changed from `if not editor:` to `if not editor.name or not editor.path:` - src/file_cache.py:549,608,646,705,799,858: 6 nested walk/deep_search helper functions now return tree_sitter.Node (root) instead of Optional[tree_sitter.Node] (None) - src/models.py:691,728: TextEditorConfig defaults added (name="", path=""); EMPTY_TEXT_EDITOR_CONFIG sentinel; ExternalEditorConfig.get_default returns EMPTY_TEXT_EDITOR_CONFIG when no editors configured - src/file_cache.py:895: get_file_id returns "" (was Optional[str]) Test updates: - tests/test_diff_viewer.py: still passes (parse_hunk_header tested) - tests/test_external_editor.py:78,97: is None -> == "" check (config.get_default, get_editor for unknown name) Verification: - audit_weak_types --strict: OK (107 <= 112 baseline) - py_check_syntax: OK on all changed files - 85+ tests pass (test_file_cache, test_ast_parser, test_external_editor, test_diff_viewer, test_fuzzy_anchor, test_summary_cache, test_paths, test_persona_models, test_patch_modal, test_parallel_execution, test_track_state_persistence, test_session_logger_optimization, + 117 in broader run) VC5 (Zero Optional[T] return types) PASSES: git grep -cE "-> Optional\\[" -- 'src/*.py' returns 0 PHASE 6 IS COMPLETE. REMAINING WORK: - Phase 7: Eliminate Any + dict[str, Any] in internal signatures (59+ sites) - Phase 8: Final re-measure + verification - Phase 9: Boundary layer audit (done)
133 lines
4.3 KiB
Python
133 lines
4.3 KiB
Python
"""Tests for external editor integration."""
|
|
import pytest
|
|
from unittest.mock import patch, MagicMock
|
|
from src.models import TextEditorConfig, ExternalEditorConfig
|
|
from src.external_editor import (
|
|
ExternalEditorLauncher,
|
|
get_default_launcher,
|
|
create_temp_modified_file,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def vscode_editor():
|
|
return TextEditorConfig(name="vscode", path="C:\\path\\to\\code.exe", diff_args=["--diff"])
|
|
|
|
|
|
@pytest.fixture
|
|
def notepadpp_editor():
|
|
return TextEditorConfig(name="notepad++", path="C:\\path\\to\\notepad++.exe", diff_args=["-multiInst", "-nosession"])
|
|
|
|
|
|
@pytest.fixture
|
|
def ext_config(vscode_editor, notepadpp_editor):
|
|
return ExternalEditorConfig(
|
|
editors={"vscode": vscode_editor, "notepad++": notepadpp_editor},
|
|
default_editor="vscode",
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def launcher(ext_config):
|
|
return ExternalEditorLauncher(ext_config)
|
|
|
|
|
|
class TestTextEditorConfig:
|
|
def test_from_dict_with_diff_args(self):
|
|
data = {"name": "vscode", "path": "C:\\code.exe", "diff_args": ["--diff"]}
|
|
editor = TextEditorConfig.from_dict(data)
|
|
assert editor.name == "vscode"
|
|
assert editor.path == "C:\\code.exe"
|
|
assert editor.diff_args == ["--diff"]
|
|
|
|
def test_from_dict_without_diff_args(self):
|
|
data = {"name": "vscode", "path": "C:\\code.exe"}
|
|
editor = TextEditorConfig.from_dict(data)
|
|
assert editor.diff_args == []
|
|
|
|
def test_to_dict(self, vscode_editor):
|
|
result = vscode_editor.to_dict()
|
|
assert result["name"] == "vscode"
|
|
assert result["path"] == "C:\\path\\to\\code.exe"
|
|
assert result["diff_args"] == ["--diff"]
|
|
|
|
|
|
class TestExternalEditorConfig:
|
|
def test_from_dict_with_string_editors(self):
|
|
data = {"editors": {"vscode": "C:\\code.exe"}, "default_editor": "vscode"}
|
|
config = ExternalEditorConfig.from_dict(data)
|
|
assert "vscode" in config.editors
|
|
assert config.editors["vscode"].path == "C:\\code.exe"
|
|
|
|
def test_from_dict_with_dict_editors(self, vscode_editor):
|
|
data = {"editors": {"vscode": {"name": "vscode", "path": "C:\\code.exe", "diff_args": ["--diff"]}}}
|
|
config = ExternalEditorConfig.from_dict(data)
|
|
assert config.editors["vscode"].diff_args == ["--diff"]
|
|
|
|
def test_get_default_returns_configured(self, ext_config):
|
|
result = ext_config.get_default()
|
|
assert result.name == "vscode"
|
|
|
|
def test_get_default_fallback_to_first(self):
|
|
config = ExternalEditorConfig(editors={"notepad++": TextEditorConfig(name="notepad++", path="C:\\npp.exe")})
|
|
result = config.get_default()
|
|
assert result.name == "notepad++"
|
|
|
|
def test_get_default_returns_none_when_empty(self):
|
|
config = ExternalEditorConfig(editors={})
|
|
assert config.get_default().name == ""
|
|
|
|
def test_to_dict(self, ext_config):
|
|
result = ext_config.to_dict()
|
|
assert result["default_editor"] == "vscode"
|
|
assert "vscode" in result["editors"]
|
|
|
|
|
|
class TestExternalEditorLauncher:
|
|
def test_get_editor_by_name(self, launcher):
|
|
editor = launcher.get_editor("notepad++")
|
|
assert editor.name == "notepad++"
|
|
|
|
def test_get_editor_returns_default(self, launcher):
|
|
editor = launcher.get_editor()
|
|
assert editor.name == "vscode"
|
|
|
|
def test_get_editor_unknown_name(self, launcher):
|
|
editor = launcher.get_editor("unknown")
|
|
assert editor.name == ""
|
|
|
|
def test_build_diff_command(self, launcher, vscode_editor):
|
|
cmd = launcher.build_diff_command(vscode_editor, "orig.txt", "mod.txt")
|
|
assert cmd == ["C:\\path\\to\\code.exe", "--diff", "orig.txt", "mod.txt"]
|
|
|
|
def test_launch_diff_missing_editor(self, launcher):
|
|
result = launcher.launch_diff_result("nonexistent", "orig.txt", "mod.txt")
|
|
assert not result.ok
|
|
assert result.data is None
|
|
|
|
@patch("subprocess.Popen")
|
|
def test_launch_diff_success(self, mock_popen, launcher):
|
|
mock_popen.return_value = MagicMock()
|
|
result = launcher.launch_diff_result("vscode", "orig.txt", "mod.txt")
|
|
assert result.ok
|
|
assert result.data is not None
|
|
mock_popen.assert_called_once()
|
|
|
|
@patch("subprocess.Popen")
|
|
def test_launch_diff_file_not_found(self, mock_popen, launcher):
|
|
mock_popen.side_effect = FileNotFoundError()
|
|
result = launcher.launch_diff_result("vscode", "orig.txt", "mod.txt")
|
|
assert not result.ok
|
|
assert result.data is None
|
|
|
|
|
|
class TestHelperFunctions:
|
|
def test_create_temp_modified_file(self):
|
|
content = "test content"
|
|
path = create_temp_modified_file(content)
|
|
assert path.endswith("_modified")
|
|
with open(path, encoding="utf-8") as f:
|
|
assert f.read() == content
|
|
import os
|
|
os.unlink(path)
|