diff --git a/tests/comiccacher_test.py b/tests/comiccacher_test.py index 5ae7cd1..9f5a2c5 100644 --- a/tests/comiccacher_test.py +++ b/tests/comiccacher_test.py @@ -2,13 +2,13 @@ from __future__ import annotations import pytest -import comictaggerlib.comiccacher +import comictalker.comiccacher import comictaggerlib.resulttypes from testing.comicdata import alt_covers, search_results, select_details def test_create_cache(settings): - comictaggerlib.comiccacher.ComicCacher() + comictalker.comiccacher.ComicCacher() assert (settings.get_settings_folder() / "settings").exists() diff --git a/tests/comicvinetalker_test.py b/tests/comicvinetalker_test.py index 89cabba..2ac0c8e 100644 --- a/tests/comicvinetalker_test.py +++ b/tests/comicvinetalker_test.py @@ -3,13 +3,13 @@ from __future__ import annotations import pytest import comicapi.genericmetadata -import comictaggerlib.comicvinetalker +import comictalker.talkers.comicvine import testing.comicvine from testing.comicdata import select_details def test_search_for_series(comicvine_api, comic_cache): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() results = ct.search_for_series("cory doctorows futuristic tales of the here and now") for r in results: r["image"] = {"super_url": r["image"]["super_url"]} @@ -21,7 +21,7 @@ def test_search_for_series(comicvine_api, comic_cache): def test_fetch_volume_data(comicvine_api, comic_cache): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() result = ct.fetch_volume_data(23437) result["start_year"] = int(result["start_year"]) del result["publisher"]["id"] @@ -30,7 +30,7 @@ def test_fetch_volume_data(comicvine_api, comic_cache): def test_fetch_issues_by_volume(comicvine_api, comic_cache): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() results = ct.fetch_issues_by_volume(23437) cache_issues = comic_cache.get_volume_issues_info(23437, ct.source_name) for r in results: @@ -40,13 +40,13 @@ def test_fetch_issues_by_volume(comicvine_api, comic_cache): def test_fetch_issue_data_by_issue_id(comicvine_api, settings, mock_now, mock_version): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() result = ct.fetch_issue_data_by_issue_id(140529, settings) assert result == testing.comicvine.cv_md def test_fetch_issues_by_volume_issue_num_and_year(comicvine_api): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() results = ct.fetch_issues_by_volume_issue_num_and_year([23437], "1", None) cv_expected = testing.comicvine.cv_issue_result["results"].copy() testing.comicvine.filter_field_list( @@ -66,13 +66,13 @@ cv_issue = [ @pytest.mark.parametrize("volume_id, issue_number, expected", cv_issue) def test_fetch_issue_data(comicvine_api, settings, mock_now, mock_version, volume_id, issue_number, expected): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() results = ct.fetch_issue_data(volume_id, issue_number, settings) assert results == expected def test_fetch_issue_select_details(comicvine_api, mock_now, mock_version): - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() result = ct.fetch_issue_select_details(140529) expected = { "cover_date": testing.comicvine.cv_issue_result["results"]["cover_date"], @@ -88,7 +88,7 @@ def test_issue_select_details(comic_cache, details): expected = details.copy() del expected["issue_id"] - ct = comictaggerlib.comicvinetalker.ComicVineTalker() + ct = comictalker.talkers.comicvine.ComicVineTalker() ct.cache_issue_select_details( issue_id=details["issue_id"], image_url=details["image_url"], diff --git a/tests/conftest.py b/tests/conftest.py index 2fcdc8d..6032103 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,9 +14,10 @@ from PIL import Image import comicapi.comicarchive import comicapi.genericmetadata -import comictaggerlib.comiccacher -import comictaggerlib.comicvinetalker import comictaggerlib.settings +import comictalker.comiccacher +import comictalker.comictalker +import comictalker.talkers.comicvine from comicapi import utils from testing import comicvine, filenames from testing.comicdata import all_seed_imprints, seed_imprints @@ -124,7 +125,7 @@ def mock_now(monkeypatch): def now(cls): return cls.time - monkeypatch.setattr(comictaggerlib.comicvinetalker, "datetime", mydatetime) + monkeypatch.setattr(comictalker.talkers.comicvine, "datetime", mydatetime) @pytest.fixture @@ -166,5 +167,5 @@ def settings(tmp_path): @pytest.fixture -def comic_cache(settings) -> Generator[comictaggerlib.comiccacher.ComicCacher, Any, None]: - yield comictaggerlib.comiccacher.ComicCacher() +def comic_cache(settings) -> Generator[comictalker.comiccacher.ComicCacher, Any, None]: + yield comictalker.comiccacher.ComicCacher() diff --git a/tests/issueidentifier_test.py b/tests/issueidentifier_test.py index 2111839..254f290 100644 --- a/tests/issueidentifier_test.py +++ b/tests/issueidentifier_test.py @@ -4,7 +4,7 @@ import pytest import comicapi.comicarchive import comicapi.issuestring -import comictaggerlib.comicvinetalker +import comictalker.talkers.comicvine import comictaggerlib.issueidentifier import testing.comicdata import testing.comicvine @@ -32,7 +32,7 @@ def test_get_search_keys(cbz, settings, additional_md, expected): def test_get_issue_cover_match_score(cbz, settings, comicvine_api): ii = comictaggerlib.issueidentifier.IssueIdentifier(cbz, settings) score = ii.get_issue_cover_match_score( - comictaggerlib.comicvinetalker.ComicVineTalker(), + comictalker.talkers.comicvine.ComicVineTalker(), int( comicapi.issuestring.IssueString( cbz.read_metadata(comicapi.comicarchive.MetaDataStyle.CIX).issue