Skip to content

chore: remove orphan clang-include-cleaner & clang-apply-replacements refs from tests #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shenxianpeng merged 1 commit into from
Jun 19, 2026
Merged

chore: remove orphan clang-include-cleaner & clang-apply-replacements refs from tests #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 0 additions & 161 deletions tests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,13 @@

MOCK_PYPI_FORMAT = ("22.1.5", ["22.1.5", "22.1.4", "20.1.8", "20.1.7", "18.1.8"])
MOCK_PYPI_TIDY = ("21.1.6", ["21.1.6", "21.1.1", "20.1.0", "19.1.0.1", "18.1.8"])
MOCK_PYPI_INCLUDE_CLEANER = ("22.1.7", ["22.1.7", "22.1.5"])
MOCK_PYPI_APPLY_REPLACEMENTS = ("17.0.6", ["17.0.6", "16.0.0"])


def _pypi_side_effect(tool: str):
"""Side-effect that maps tool names to canned PyPI responses."""
mapping = {
"clang-format": MOCK_PYPI_FORMAT,
"clang-tidy": MOCK_PYPI_TIDY,
"clang-include-cleaner": MOCK_PYPI_INCLUDE_CLEANER,
"clang-apply-replacements": MOCK_PYPI_APPLY_REPLACEMENTS,
}
return mapping.get(tool, (None, []))

Expand Down Expand Up @@ -105,8 +101,6 @@ def test_get_pypi_versions_all_prerelease():
# No version → latest
("clang-format", None, "22.1.5"),
("clang-tidy", None, "21.1.6"),
("clang-include-cleaner", None, "22.1.7"),
("clang-apply-replacements", None, "17.0.6"),
# Exact match
("clang-format", "20.1.8", "20.1.8"),
("clang-tidy", "19.1.0.1", "19.1.0.1"),
Expand All @@ -115,8 +109,6 @@ def test_get_pypi_versions_all_prerelease():
("clang-format", "20.1", "20.1.8"),
("clang-tidy", "21", "21.1.6"),
("clang-tidy", "21.1", "21.1.6"),
("clang-include-cleaner", "22", "22.1.7"),
("clang-apply-replacements", "16", "16.0.0"),
],
)
def test_resolve_version_from_pypi_success(tool, user_input, expected):
Expand All @@ -136,8 +128,6 @@ def test_resolve_version_from_pypi_success(tool, user_input, expected):
("clang-format", "20.99"),
("clang-tidy", "99"),
("clang-tidy", "22.99"),
("clang-include-cleaner", "99"),
("clang-apply-replacements", "99"),
],
)
def test_resolve_version_from_pypi_not_found(tool, user_input):
Expand Down Expand Up @@ -487,154 +477,3 @@ def test_resolve_install_with_diagnostics_verbose_latest(capsys):
"Using latest clang-format Python wheel version 22.1.5"
in capsys.readouterr().err
)


# ═══════════════════════════════════════════════════════════════════════
# New wheel tools
# ═══════════════════════════════════════════════════════════════════════


@pytest.mark.benchmark
def test_resolve_install_include_cleaner():
mock_path = "/usr/bin/clang-include-cleaner"
with (
patch("shutil.which", return_value=None),
patch(
"cpp_linter_hooks.util._install_tool", return_value=Path(mock_path)
) as mock_install,
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
result = resolve_install("clang-include-cleaner", "22.1.7")
assert Path(result) == Path(mock_path)
mock_install.assert_called_once_with("clang-include-cleaner", "22.1.7")


@pytest.mark.benchmark
def test_resolve_install_include_cleaner_default():
with (
patch("shutil.which", return_value=None),
patch(
"cpp_linter_hooks.util._install_tool",
return_value=Path("/usr/bin/clang-include-cleaner"),
) as mock_install,
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
result = resolve_install("clang-include-cleaner", None)
assert result == Path("/usr/bin/clang-include-cleaner")
mock_install.assert_called_once_with("clang-include-cleaner", "22.1.7")


@pytest.mark.benchmark
def test_resolve_install_include_cleaner_invalid():
with (
patch("shutil.which", return_value=None),
patch("cpp_linter_hooks.util._install_tool") as mock_install,
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
result = resolve_install("clang-include-cleaner", "99.0.0")
assert result is None
mock_install.assert_not_called()


@pytest.mark.benchmark
def test_resolve_install_apply_replacements():
mock_path = "/usr/bin/clang-apply-replacements"
with (
patch("shutil.which", return_value=None),
patch(
"cpp_linter_hooks.util._install_tool", return_value=Path(mock_path)
) as mock_install,
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
result = resolve_install("clang-apply-replacements", "17.0.6")
assert Path(result) == Path(mock_path)
mock_install.assert_called_once_with("clang-apply-replacements", "17.0.6")


@pytest.mark.benchmark
def test_resolve_install_apply_replacements_default():
with (
patch("shutil.which", return_value=None),
patch(
"cpp_linter_hooks.util._install_tool",
return_value=Path("/usr/bin/clang-apply-replacements"),
) as mock_install,
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
result = resolve_install("clang-apply-replacements", None)
assert result == Path("/usr/bin/clang-apply-replacements")
mock_install.assert_called_once_with("clang-apply-replacements", "17.0.6")


@pytest.mark.benchmark
def test_resolve_install_apply_replacements_invalid():
with (
patch("shutil.which", return_value=None),
patch("cpp_linter_hooks.util._install_tool") as mock_install,
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
result = resolve_install("clang-apply-replacements", "99.0.0")
assert result is None
mock_install.assert_not_called()


@pytest.mark.benchmark
def test_resolve_install_with_diagnostics_include_cleaner_invalid():
with patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
):
path, error = resolve_install_with_diagnostics("clang-include-cleaner", "99")

assert path is None
assert error is not None
assert "Unsupported clang-include-cleaner version '99'" in error
assert "Latest stable version: 22.1.7" in error


@pytest.mark.benchmark
def test_resolve_install_with_diagnostics_apply_replacements_invalid():
with patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
):
path, error = resolve_install_with_diagnostics("clang-apply-replacements", "99")

assert path is None
assert error is not None
assert "Unsupported clang-apply-replacements version '99'" in error
assert "Latest stable version: 17.0.6" in error


@pytest.mark.benchmark
def test_resolve_install_with_diagnostics_include_cleaner_verbose(capsys):
with (
patch("shutil.which", return_value=None),
patch(
"cpp_linter_hooks.util._install_tool",
return_value=Path("/usr/bin/clang-include-cleaner"),
),
patch(
"cpp_linter_hooks.util._get_pypi_versions", side_effect=_pypi_side_effect
),
):
path, error = resolve_install_with_diagnostics(
"clang-include-cleaner", "22", True
)

assert path == Path("/usr/bin/clang-include-cleaner")
assert error is None
assert (
"Resolved clang-include-cleaner --version=22 to Python wheel version 22.1.7"
in capsys.readouterr().err
)
Loading