Fix tests

Author: Buried-In-Code

perdoo/comic/metadata/comic_info.py

@@ -278,7 +278,7 @@ def story_arc_list(self, value: list[str]) -> None:
         self.story_arc = list_to_str(value=value)
 
     def get_filename(self, settings: Naming) -> str:
-        from perdoo.metadata.metron_info import Format  # noqa: PLC0415
+        from perdoo.comic.metadata.metron_info import Format  # noqa: PLC0415
 
         return self.evaluate_pattern(
             pattern_map=PATTERN_MAP,

tests/comic_test.py

@@ -1,27 +1,37 @@
+import tarfile
 from pathlib import Path
 from unittest.mock import MagicMock
 
 import pytest
+from zipremove import ZipFile
 
 from perdoo.comic import Comic
-from perdoo.comic.errors import ComicMetadataError
 from perdoo.comic.metadata import ComicInfo, MetronInfo
 from perdoo.comic.metadata.metron_info import Series
 from perdoo.settings import Naming
 
 
 @pytest.fixture
-def cbz_comic(tmp_path: Path) -> Comic:
-    file_path = tmp_path / "test.cbz"
-    file_path.touch()
-    return Comic(file=file_path)
+def image_file(tmp_path: Path) -> Path:
+    filepath = tmp_path / "page1.jpg"
+    filepath.write_bytes(b"Fake image")
+    return filepath
 
 
 @pytest.fixture
-def cbt_comic(tmp_path: Path) -> Comic:
-    file_path = tmp_path / "test.cbt"
-    file_path.touch()
-    return Comic(file=file_path)
+def cbz_comic(tmp_path: Path, image_file: Path) -> Comic:
+    filepath = tmp_path / "test.cbz"
+    with ZipFile(filepath, "w") as archive:
+        archive.write(image_file)
+    return Comic(filepath=filepath)
+
+
+@pytest.fixture
+def cbt_comic(tmp_path: Path, image_file: Path) -> Comic:
+    filepath = tmp_path / "test.cbt"
+    with tarfile.open(filepath, "w:gz") as archive:
+        archive.add(image_file)
+    return Comic(filepath=filepath)
 
 
 @pytest.fixture
@@ -35,24 +45,19 @@ def comic_info() -> ComicInfo:
 
 
 def test_convert_to_cbz(cbt_comic: Comic) -> None:
-    cbt_comic.convert(extension="cbz")
-    assert cbt_comic.path.suffix == ".cbz"
-
-
-def test_convert_to_cbt(cbz_comic: Comic) -> None:
-    cbz_comic.convert(extension="cbt")
-    assert cbz_comic.path.suffix == ".cbt"
+    cbt_comic.convert_to(extension="cbz")
+    assert cbt_comic.filepath.suffix == ".cbz"
 
 
 def test_clean_archive(cbz_comic: Comic) -> None:
-    cbz_comic._archiver.get_filename_list = MagicMock(  # noqa: SLF001
+    cbz_comic.archive.list_filenames = MagicMock(
         return_value=["image1.jpg", "info.txt", "ComicInfo.xml", "cover.png"]
     )
-    cbz_comic._archiver.remove_files = MagicMock()  # noqa: SLF001
+    cbz_comic.archive.remove_file = MagicMock()
 
     cbz_comic.clean_archive()
-    cbz_comic._archiver.remove_files.assert_called_once()  # noqa: SLF001
-    cbz_comic._archiver.remove_files.assert_called_once_with(filename_list=["info.txt"])  # noqa: SLF001
+    cbz_comic.archive.remove_file.assert_called_once()
+    cbz_comic.archive.remove_file.assert_called_once_with(filename="info.txt")
 
 
 def test_write_comicinfo(cbz_comic: Comic, comic_info: ComicInfo) -> None:
@@ -67,13 +72,6 @@ def test_write_metroninfo(cbz_comic: Comic, metron_info: MetronInfo) -> None:
     assert cbz_comic.metron_info == metron_info
 
 
-def test_write_null_metadata(cbz_comic: Comic) -> None:
-    with pytest.raises(ComicMetadataError):
-        cbz_comic.write_metadata(metadata=None)
-    assert cbz_comic.comic_info is None
-    assert cbz_comic.metron_info is None
-
-
 def test_write_metadata_override(cbz_comic: Comic, metron_info: MetronInfo) -> None:
     metadata_copy = metron_info.model_copy(deep=True)
     metadata_copy.series.volume = 2
@@ -87,5 +85,5 @@ def test_write_metadata_override(cbz_comic: Comic, metron_info: MetronInfo) -> N
 
 def test_rename(cbz_comic: Comic, metron_info: MetronInfo) -> None:
     cbz_comic.write_metadata(metadata=metron_info)
-    cbz_comic.rename(naming=Naming(), output_folder=cbz_comic.path.parent)
-    assert cbz_comic.path.name == "Test-Series-v1_#.cbz"
+    cbz_comic.rename(naming=Naming(), output_folder=cbz_comic.filepath.parent)
+    assert cbz_comic.filepath.name == "Test-Series-v1_#.cbz"