refactor: remove dead code and reduce test duplication

- Remove vestigial _lock_loader_for() and unused Callable/TYPE_CHECKING imports from cli.py
- Extract _make_summary() and _write_report_files() helpers in test_diff.py
- Add timestamp constants to eliminate repeated string literals

Author: dxvidparham

src/ftready/cli.py

@@ -5,7 +5,6 @@
 import logging
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 import rich_click as click
 
@@ -16,9 +15,6 @@
 from ftready.report import generate_report
 from ftready.scraper import fetch_ftchecker_db
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
 _logger = logging.getLogger(__name__)
 
 _LOCK_FILE_NAMES = ("uv.lock", "poetry.lock", "pdm.lock")
@@ -33,13 +29,6 @@ def _find_lock_file(project_dir: Path) -> Path | None:
     return None
 
 
-def _lock_loader_for(
-    lock_path: Path,  # noqa: ARG001
-) -> Callable[[Path, set[str]], dict[str, str]]:
-    """Return the lock-file parser (all formats share the same ``[[package]]`` structure)."""
-    return load_lockfile_dependencies
-
-
 def _resolve_deps(
     *,
     requirements: Path | None,
@@ -82,8 +71,7 @@ def _resolve_deps(
             msg = f"{lock_path} not found."
             raise click.UsageError(msg)
         _logger.info("[ftready] Reading all deps from %s …", lock_path)
-        loader = _lock_loader_for(lock_path)
-        deps = loader(lock_path, direct_names)
+        deps = load_lockfile_dependencies(lock_path, direct_names)
         transitive = len(deps) - len(direct_names)
         _logger.info(
             "[ftready] Found %d packages in lock file (%d direct, %d transitive).",

tests/test_diff.py

@@ -10,6 +10,9 @@
 from ftready.cli import main
 from ftready.diff import DiffSummary, PackageDiff, diff_reports, format_diff, format_diff_json
 
+_OLD_TS = "2025-01-01T00:00:00+00:00"
+_NEW_TS = "2025-02-01T00:00:00+00:00"
+
 
 def _make_report(
     packages: list[dict],
@@ -18,7 +21,7 @@ def _make_report(
     ok_314: int = 0,
     fail_313: int = 0,
     fail_314: int = 0,
-    generated_at: str = "2025-01-01T00:00:00+00:00",
+    generated_at: str = _OLD_TS,
 ) -> dict:
     return {
         "generated_at": generated_at,
@@ -49,82 +52,88 @@ def _pkg(name: str, s313: str = "Success", s314: str = "Success") -> dict:
     }
 
 
+def _make_summary(
+    packages: list[PackageDiff],
+    *,
+    old_ok_313: int = 0,
+    new_ok_313: int = 0,
+    old_ok_314: int = 0,
+    new_ok_314: int = 0,
+) -> DiffSummary:
+    """Build a DiffSummary with default timestamps."""
+    return DiffSummary(
+        old_generated_at="2025-01-01",
+        new_generated_at="2025-02-01",
+        packages=packages,
+        old_ok_313=old_ok_313,
+        new_ok_313=new_ok_313,
+        old_ok_314=old_ok_314,
+        new_ok_314=new_ok_314,
+    )
+
+
+def _write_report_files(
+    tmp_path: Path,
+    old: dict,
+    new: dict,
+) -> tuple[Path, Path]:
+    """Write old/new JSON reports to tmp_path and return their paths."""
+    old_file = tmp_path / "old.json"
+    new_file = tmp_path / "new.json"
+    old_file.write_text(json.dumps(old))
+    new_file.write_text(json.dumps(new))
+    return old_file, new_file
+
+
 class TestDiffReports:
     def test_no_changes(self):
         old = _make_report([_pkg("numpy")], ok_313=1, ok_314=1)
-        new = _make_report([_pkg("numpy")], ok_313=1, ok_314=1, generated_at="2025-02-01T00:00:00+00:00")
+        new = _make_report([_pkg("numpy")], ok_313=1, ok_314=1, generated_at=_NEW_TS)
         summary = diff_reports(old, new)
         assert len(summary.changed) == 0
 
     def test_status_change_detected(self):
-        old = _make_report([_pkg("numpy", "Not tested", "Not tested")], ok_313=0, ok_314=0)
-        new = _make_report(
-            [_pkg("numpy", "Success", "Success")],
-            ok_313=1,
-            ok_314=1,
-            generated_at="2025-02-01T00:00:00+00:00",
-        )
+        old = _make_report([_pkg("numpy", "Not tested", "Not tested")])
+        new = _make_report([_pkg("numpy", "Success", "Success")], ok_313=1, ok_314=1, generated_at=_NEW_TS)
         summary = diff_reports(old, new)
         assert len(summary.changed) == 1
         assert summary.changed[0].name == "numpy"
         assert summary.changed[0].new_313t == "Success"
 
     def test_added_package(self):
         old = _make_report([_pkg("numpy")])
-        new = _make_report(
-            [_pkg("numpy"), _pkg("pandas")],
-            ok_313=2,
-            ok_314=2,
-            generated_at="2025-02-01T00:00:00+00:00",
-        )
+        new = _make_report([_pkg("numpy"), _pkg("pandas")], ok_313=2, ok_314=2, generated_at=_NEW_TS)
         summary = diff_reports(old, new)
         added = [p for p in summary.changed if p.added]
         assert len(added) == 1
         assert added[0].name == "pandas"
 
     def test_removed_package(self):
         old = _make_report([_pkg("numpy"), _pkg("pandas")], ok_313=2)
-        new = _make_report([_pkg("numpy")], ok_313=1, generated_at="2025-02-01T00:00:00+00:00")
+        new = _make_report([_pkg("numpy")], ok_313=1, generated_at=_NEW_TS)
         summary = diff_reports(old, new)
         removed = [p for p in summary.changed if p.removed]
         assert len(removed) == 1
         assert removed[0].name == "pandas"
 
     def test_improved_property(self):
         old = _make_report([_pkg("numpy", "Not tested", "Not tested")])
-        new = _make_report(
-            [_pkg("numpy", "Success", "Not tested")],
-            ok_313=1,
-            generated_at="2025-02-01T00:00:00+00:00",
-        )
+        new = _make_report([_pkg("numpy", "Success", "Not tested")], ok_313=1, generated_at=_NEW_TS)
         summary = diff_reports(old, new)
         assert len(summary.improved) == 1
         assert summary.improved[0].name == "numpy"
 
     def test_regressed_property(self):
         old = _make_report([_pkg("numpy", "Success", "Success")], ok_313=1, ok_314=1)
-        new = _make_report(
-            [_pkg("numpy", "Failed", "Success")],
-            ok_314=1,
-            fail_313=1,
-            generated_at="2025-02-01T00:00:00+00:00",
-        )
+        new = _make_report([_pkg("numpy", "Failed", "Success")], ok_314=1, fail_313=1, generated_at=_NEW_TS)
         summary = diff_reports(old, new)
         assert len(summary.regressed) == 1
         assert summary.regressed[0].name == "numpy"
 
     def test_reads_from_files(self, tmp_path: Path):
         old = _make_report([_pkg("numpy", "Not tested", "Not tested")])
-        new = _make_report(
-            [_pkg("numpy", "Success", "Success")],
-            ok_313=1,
-            ok_314=1,
-            generated_at="2025-02-01T00:00:00+00:00",
-        )
-        old_file = tmp_path / "old.json"
-        new_file = tmp_path / "new.json"
-        old_file.write_text(json.dumps(old))
-        new_file.write_text(json.dumps(new))
+        new = _make_report([_pkg("numpy", "Success", "Success")], ok_313=1, ok_314=1, generated_at=_NEW_TS)
+        old_file, new_file = _write_report_files(tmp_path, old, new)
         summary = diff_reports(str(old_file), str(new_file))
         assert len(summary.changed) == 1
 
@@ -149,83 +158,53 @@ def test_changed_when_removed(self):
 
 class TestFormatDiff:
     def test_no_changes_message(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("numpy", "Success", "Success", "Success", "Success")],
-            old_ok_313=1,
-            new_ok_313=1,
-            old_ok_314=1,
-            new_ok_314=1,
+        summary = _make_summary(
+            [PackageDiff("numpy", "Success", "Success", "Success", "Success")],
+            old_ok_313=1, new_ok_313=1, old_ok_314=1, new_ok_314=1,
         )
         output = format_diff(summary)
         assert "No changes" in output
 
     def test_improved_section_shown(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("numpy", "Not tested", "Success", "Not tested", "Not tested")],
-            old_ok_313=0,
+        summary = _make_summary(
+            [PackageDiff("numpy", "Not tested", "Success", "Not tested", "Not tested")],
             new_ok_313=1,
-            old_ok_314=0,
-            new_ok_314=0,
         )
         output = format_diff(summary)
         assert "Improved" in output
         assert "numpy" in output
 
     def test_regressed_section_shown(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("numpy", "Success", "Failed", "Success", "Success")],
-            old_ok_313=1,
-            new_ok_313=0,
-            old_ok_314=1,
-            new_ok_314=1,
+        summary = _make_summary(
+            [PackageDiff("numpy", "Success", "Failed", "Success", "Success")],
+            old_ok_313=1, old_ok_314=1, new_ok_314=1,
         )
         output = format_diff(summary)
         assert "Regressed" in output
         assert "numpy" in output
 
     def test_added_section_shown(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("pandas", "", "Success", "", "Success", added=True)],
-            old_ok_313=0,
-            new_ok_313=1,
-            old_ok_314=0,
-            new_ok_314=1,
+        summary = _make_summary(
+            [PackageDiff("pandas", "", "Success", "", "Success", added=True)],
+            new_ok_313=1, new_ok_314=1,
         )
         output = format_diff(summary)
         assert "Added" in output
         assert "pandas" in output
 
     def test_removed_section_shown(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("pandas", "Success", "", "Success", "", removed=True)],
-            old_ok_313=1,
-            new_ok_313=0,
-            old_ok_314=1,
-            new_ok_314=0,
+        summary = _make_summary(
+            [PackageDiff("pandas", "Success", "", "Success", "", removed=True)],
+            old_ok_313=1, old_ok_314=1,
         )
         output = format_diff(summary)
         assert "Removed" in output
         assert "pandas" in output
 
     def test_delta_counts_shown(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("numpy", "Not tested", "Success", "Not tested", "Success")],
-            old_ok_313=0,
-            new_ok_313=1,
-            old_ok_314=0,
-            new_ok_314=1,
+        summary = _make_summary(
+            [PackageDiff("numpy", "Not tested", "Success", "Not tested", "Success")],
+            new_ok_313=1, new_ok_314=1,
         )
         output = format_diff(summary)
         assert "+1" in output
@@ -234,14 +213,9 @@ def test_delta_counts_shown(self):
 
 class TestFormatDiffJson:
     def test_valid_json(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[PackageDiff("numpy", "Not tested", "Success", "Not tested", "Not tested")],
-            old_ok_313=0,
+        summary = _make_summary(
+            [PackageDiff("numpy", "Not tested", "Success", "Not tested", "Not tested")],
             new_ok_313=1,
-            old_ok_314=0,
-            new_ok_314=0,
         )
         output = format_diff_json(summary)
         data = json.loads(output)
@@ -250,17 +224,12 @@ def test_valid_json(self):
         assert data["summary"]["delta_313"] == 1
 
     def test_json_only_includes_changed(self):
-        summary = DiffSummary(
-            old_generated_at="2025-01-01",
-            new_generated_at="2025-02-01",
-            packages=[
-                PackageDiff("numpy", "Success", "Success", "Success", "Success"),  # unchanged
-                PackageDiff("pandas", "Not tested", "Success", "Not tested", "Not tested"),  # changed
+        summary = _make_summary(
+            [
+                PackageDiff("numpy", "Success", "Success", "Success", "Success"),
+                PackageDiff("pandas", "Not tested", "Success", "Not tested", "Not tested"),
             ],
-            old_ok_313=1,
-            new_ok_313=2,
-            old_ok_314=1,
-            new_ok_314=1,
+            old_ok_313=1, new_ok_313=2, old_ok_314=1, new_ok_314=1,
         )
         output = format_diff_json(summary)
         data = json.loads(output)
@@ -271,16 +240,8 @@ def test_json_only_includes_changed(self):
 class TestDiffCLI:
     def test_diff_command(self, tmp_path: Path):
         old = _make_report([_pkg("numpy", "Not tested", "Not tested")])
-        new = _make_report(
-            [_pkg("numpy", "Success", "Success")],
-            ok_313=1,
-            ok_314=1,
-            generated_at="2025-02-01T00:00:00+00:00",
-        )
-        old_file = tmp_path / "old.json"
-        new_file = tmp_path / "new.json"
-        old_file.write_text(json.dumps(old))
-        new_file.write_text(json.dumps(new))
+        new = _make_report([_pkg("numpy", "Success", "Success")], ok_313=1, ok_314=1, generated_at=_NEW_TS)
+        old_file, new_file = _write_report_files(tmp_path, old, new)
         runner = CliRunner()
         result = runner.invoke(main, ["diff", str(old_file), str(new_file)])
         assert result.exit_code == 0
@@ -290,10 +251,7 @@ def test_diff_command(self, tmp_path: Path):
     def test_diff_json_output(self, tmp_path: Path):
         old = _make_report([_pkg("numpy", "Not tested", "Not tested")])
         new = _make_report([_pkg("numpy", "Success", "Success")], ok_313=1, ok_314=1)
-        old_file = tmp_path / "old.json"
-        new_file = tmp_path / "new.json"
-        old_file.write_text(json.dumps(old))
-        new_file.write_text(json.dumps(new))
+        old_file, new_file = _write_report_files(tmp_path, old, new)
         runner = CliRunner()
         result = runner.invoke(main, ["diff", str(old_file), str(new_file), "--format", "json"])
         assert result.exit_code == 0
@@ -303,11 +261,8 @@ def test_diff_json_output(self, tmp_path: Path):
     def test_diff_output_to_file(self, tmp_path: Path):
         old = _make_report([_pkg("numpy")])
         new = _make_report([_pkg("numpy")])
-        old_file = tmp_path / "old.json"
-        new_file = tmp_path / "new.json"
+        old_file, new_file = _write_report_files(tmp_path, old, new)
         out_file = tmp_path / "diff.txt"
-        old_file.write_text(json.dumps(old))
-        new_file.write_text(json.dumps(new))
         runner = CliRunner()
         result = runner.invoke(main, ["diff", str(old_file), str(new_file), "--output", str(out_file)])
         assert result.exit_code == 0