Skip to content

Commit d6f7925

Browse files
Buried-In-CodeBuried-In-Code
committed
Fix tests
1 parent 216ab4b commit d6f7925

8 files changed

Lines changed: 45 additions & 25 deletions

File tree

‎docs/img/perdoo-archive.svg‎

Lines changed: 2 additions & 2 deletions
Loading

‎docs/img/perdoo-commands.svg‎

Lines changed: 2 additions & 2 deletions
Loading

‎docs/img/perdoo-process.svg‎

Lines changed: 2 additions & 2 deletions
Loading

‎docs/img/perdoo-settings.svg‎

Lines changed: 2 additions & 2 deletions
Loading

‎tests/comic/comic_test.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from perdoo.comic.archives import CBTArchive, CBZArchive
77
from perdoo.comic.comic import Comic
88
from perdoo.comic.metadata import ComicInfo, MetronInfo
9-
from perdoo.settings import Naming
109

1110

1211
@pytest.fixture
@@ -78,6 +77,6 @@ def test_write_metadata_override(cbz_comic: Comic, metron_info: MetronInfo) -> N
7877

7978

8079
def test_rename(cbz_comic: Comic, metron_info: MetronInfo) -> None:
81-
naming = generate_naming(settings=Naming(), metron_info=metron_info, comic_info=None)
80+
naming = generate_naming(metron_info=metron_info, comic_info=None)
8281
cbz_comic.move_to(naming=naming, output_folder=cbz_comic.filepath.parent)
8382
assert cbz_comic.filepath.name == "Test-Series-v1_#.cbz"

‎tests/comic/metadata/base_test.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from pathlib import Path
2+
from unittest.mock import patch
23

34
from perdoo.comic.metadata import ComicInfo
45
from perdoo.comic.metadata._base import sanitize
5-
from perdoo.settings import Naming
6+
from perdoo.settings import Naming, Output, Settings
67

78

89
def test_sanitize_basic() -> None:
@@ -18,8 +19,11 @@ def test_sanitize_none_and_empty() -> None:
1819

1920
def test_evaluate_pattern() -> None:
2021
obj = ComicInfo(series="Series", volume=1, number=2, format="Single Issue", publisher="Pub")
21-
settings = Naming(seperator="-", default="{series-name}-{unknown}-{number:03}")
22-
name = obj.get_filename(settings=settings)
22+
settings = Settings(
23+
output=Output(naming=Naming(seperator="-", default="{series-name}-{unknown}-{number:03}"))
24+
)
25+
with patch("perdoo.comic.metadata.comic_info.SETTINGS", settings):
26+
name = obj.get_filename()
2327

2428
assert name == "Series-unknown-002"
2529

‎tests/comic/metadata/comic_info_test.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from datetime import date
2+
from unittest.mock import patch
23

34
from perdoo.comic.metadata import ComicInfo
45
from perdoo.comic.metadata.comic_info import Page, PageType
5-
from perdoo.settings import Naming
6+
from perdoo.settings import Naming, Output, Settings
67

78

89
def test_cover_date_property(comic_info: ComicInfo) -> None:
@@ -66,11 +67,16 @@ def test_get_filename_padding_and_sanitization() -> None:
6667
format="Single Issue",
6768
title="Hello: World / ???",
6869
)
69-
settings = Naming(
70-
seperator="-",
71-
default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:02}-{title}",
70+
settings = Settings(
71+
output=Output(
72+
naming=Naming(
73+
seperator="-",
74+
default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:02}-{title}",
75+
)
76+
)
7277
)
73-
name = obj.get_filename(settings=settings)
78+
with patch("perdoo.comic.metadata.comic_info.SETTINGS", settings):
79+
name = obj.get_filename()
7480

7581
assert "#02" in name
7682
assert "Hello-World" in name

‎tests/comic/metadata/metron_info_test.py‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from datetime import date, datetime
2+
from unittest.mock import patch
23

34
import pytest
45

@@ -13,7 +14,7 @@
1314
Resource,
1415
Role,
1516
)
16-
from perdoo.settings import Naming
17+
from perdoo.settings import Naming, Output, Settings
1718

1819

1920
def test_information_source_load_valid() -> None:
@@ -43,11 +44,16 @@ def test_get_filename_padding_and_sanitization(metron_info: MetronInfo) -> None:
4344
Id(primary=False, source=InformationSource.METRON, value="abc"),
4445
Id(primary=True, source=InformationSource.COMIC_VINE, value="cv-123"),
4546
]
46-
settings = Naming(
47-
seperator="-",
48-
default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:03}_{cover-year}_{id}",
47+
settings = Settings(
48+
output=Output(
49+
naming=Naming(
50+
seperator="-",
51+
default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:03}_{cover-year}_{id}",
52+
)
53+
)
4954
)
50-
name = metron_info.get_filename(settings=settings)
55+
with patch("perdoo.comic.metadata.metron_info.SETTINGS", settings):
56+
name = metron_info.get_filename()
5157

5258
assert "#002" in name
5359
assert "2021" in name
@@ -57,8 +63,13 @@ def test_get_filename_padding_and_sanitization(metron_info: MetronInfo) -> None:
5763
def test_pattern_map(metron_info: MetronInfo) -> None:
5864
metron_info.publisher = Publisher(name="Pub", imprint=Resource(value="Imprint Name"))
5965
metron_info.gtin = GTIN(isbn="9781234567890", upc="012345678905")
60-
settings = Naming(seperator="-", default="{publisher-name}/{imprint}/{isbn}/{upc}")
61-
name = metron_info.get_filename(settings=settings)
66+
settings = Settings(
67+
output=Output(
68+
naming=Naming(seperator="-", default="{publisher-name}/{imprint}/{isbn}/{upc}")
69+
)
70+
)
71+
with patch("perdoo.comic.metadata.metron_info.SETTINGS", settings):
72+
name = metron_info.get_filename()
6273

6374
assert "Pub" in name
6475
assert "Imprint-Name" in name

0 commit comments

Comments
 (0)