Fix test suite

Author: Buried-In-Code

pyproject.toml

@@ -65,7 +65,7 @@ split-on-trailing-comma = false
 classmethod-decorators = ["classmethod"]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*" = ["S101"]
+"tests/*" = ["PLR2004", "S101"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"

tests/test_extractors.py

@@ -1,38 +1,44 @@
 from pathlib import Path
 
-import calendar_extract as mod
 import numpy as np
 
+import extract_dates as mod
+
 
 class FakeTextPage:
-    def extractWORDS(self, delimiters=None):
-        return [(0, 0, 10, 10, "January"), (11, 0, 20, 10, "2024")]
+    def extractWORDS(self, delimiters: str | None = None) -> list[tuple]:  # noqa: N802, ARG002
+        return [
+            (0, 0, 10, 10, "January"),
+            (11, 0, 20, 10, "2024"),
+            (30, 0, 40, 10, "February"),
+            (41, 0, 50, 10, "2024"),
+            (60, 0, 70, 10, "March"),
+            (71, 0, 80, 10, "2024"),
+        ]
 
 
 class FakePage:
-    def get_pixmap(self):
+    def get_pixmap(self) -> "PM":  # noqa: F821
         class PM:
-            def tobytes(self, fmt) -> bytes:
+            def tobytes(self, fmt: str) -> bytes:  # noqa: ARG002
                 return b"\x89PNG\r\n\x1a\n"
 
         return PM()
 
-    def get_textpage_ocr(self, tessdata=None):
+    def get_textpage_ocr(self, tessdata=None) -> FakeTextPage:  # noqa: ARG002, ANN001
         return FakeTextPage()
 
 
 class FakeDoc:
-    def __getitem__(self, idx):
+    def __getitem__(self, idx: int) -> FakePage:
         return FakePage()
 
 
-def test_extract_png_calendars(monkeypatch) -> None:
+def test_extract_png_calendars(monkeypatch) -> None:  # noqa: ANN001
     monkeypatch.setattr(mod.pymupdf, "open", lambda _: FakeDoc())
     monkeypatch.setattr(mod.cv2, "imdecode", lambda *_: np.zeros((200, 300, 3)))
 
     calendars = mod.extract_png_calendars(Path("fake.png"))
 
-    assert len(calendars) == 1
-    cal = calendars[0]
-    assert cal.month == 1
-    assert cal.year == 2024
+    assert len(calendars) == 3
+    assert [(c.month, c.year) for c in calendars] == [(1, 2024), (2, 2024), (3, 2024)]

tests/test_image_helpers.py

@@ -1,13 +1,14 @@
 import cv2
 import numpy as np
-from calendar_extract import keep_only_colours, remove_colours
 
+from extract_dates import keep_only_colours, remove_colours
 
-def test_remove_colours_masks_pixels(monkeypatch) -> None:
+
+def test_remove_colours_masks_pixels(monkeypatch) -> None:  # noqa: ANN001
     img = np.zeros((2, 2, 3), dtype=np.uint8)
     img[:] = [10, 10, 10]
 
-    def fake_in_range(*args, **kwargs):
+    def fake_in_range(*args, **kwargs) -> np.array:  # noqa: ANN002, ANN003
         return np.array([[255, 0], [0, 0]], dtype=np.uint8)
 
     monkeypatch.setattr(cv2, "inRange", fake_in_range)
@@ -17,10 +18,10 @@ def fake_in_range(*args, **kwargs):
     assert (result[0, 0] == [255, 255, 255]).all()
 
 
-def test_keep_only_colours(monkeypatch) -> None:
+def test_keep_only_colours(monkeypatch) -> None:  # noqa: ANN001
     img = np.ones((2, 2, 3), dtype=np.uint8) * 50
 
-    def fake_in_range(*args, **kwargs):
+    def fake_in_range(*args, **kwargs) -> np.array:  # noqa: ANN002, ANN003
         return np.array([[255, 0], [0, 0]], dtype=np.uint8)
 
     monkeypatch.setattr(cv2, "inRange", fake_in_range)

tests/test_main.py

@@ -1,8 +1,10 @@
-import calendar_extract as mod
+from pathlib import Path
 
+import extract_dates as mod
 
-def test_main_writes_output(monkeypatch, tmp_path) -> None:
-    monkeypatch.setattr(mod.Path, "glob", lambda self, _: [])
+
+def test_main_writes_output(monkeypatch, tmp_path: Path) -> None:  # noqa: ANN001
+    monkeypatch.setattr(mod.Path, "glob", lambda self, pattern: [])  # noqa: ARG005
     monkeypatch.setattr(mod, "extract_png_calendars", lambda *a, **k: [])
     monkeypatch.setattr(mod, "extract_pdf_calendars", lambda *a, **k: [])
 

tests/test_mappings.py

@@ -1,4 +1,4 @@
-from calendar_extract import adjust_mappings
+from extract_dates import adjust_mappings
 
 
 def test_adjust_mappings_single_row() -> None:

tests/test_models.py

@@ -1,7 +1,8 @@
 from datetime import date
 
 import numpy as np
-from calendar_extract import Calendar, Cell
+
+from extract_dates import Calendar, Cell
 
 
 def test_calendar_equality_and_hash() -> None:

tests/test_parse.py

@@ -1,4 +1,4 @@
-from calendar_extract import parse_month
+from extract_dates import parse_month
 
 
 def test_parse_month_valid() -> None:

tests/test_process_calendar.py

@@ -1,14 +1,15 @@
 import numpy as np
-from calendar_extract import PNG_COLOURS, process_calendar_squares
 
+from extract_dates import PNG_COLOURS, process_calendar_squares
 
-def test_process_calendar_single_day(monkeypatch) -> None:
+
+def test_process_calendar_single_day(monkeypatch) -> None:  # noqa: ANN001
     img = np.zeros((100, 700, 3), dtype=np.uint8)
 
-    def fake_analyze_square(*args, **kwargs):
+    def fake_analyze_square(*args, **kwargs) -> tuple[int, int, int]:  # noqa: ANN002, ANN003
         return (0, 0, 255)  # red (BGR)
 
-    monkeypatch.setattr("calendar_extract.analyze_square", fake_analyze_square)
+    monkeypatch.setattr("extract_dates.analyze_square", fake_analyze_square)
 
     cells = process_calendar_squares(img=img, year=2024, month=1, colours=PNG_COLOURS)