From 2b41c7e1fe4bb9591eb7dd3a2d1a7c14e801940e Mon Sep 17 00:00:00 2001 From: Paul Fioravanti Date: Fri, 4 Oct 2024 18:36:35 +1000 Subject: [PATCH] Refactor some fixtures --- setup.cfg | 2 +- test/config/conftest.py | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/setup.cfg b/setup.cfg index 54145da..5516580 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ long_description = file: README.md long_description_content_type = text/markdown name = plover_platform_specific_translation url = https://github.com/paulfioravanti/plover-platform-specific-translation -version = 0.2.9 +version = 0.2.10 [options] install_requires = diff --git a/test/config/conftest.py b/test/config/conftest.py index 7bd44c2..98fbdfa 100644 --- a/test/config/conftest.py +++ b/test/config/conftest.py @@ -5,36 +5,27 @@ @pytest.fixture def bad_config_path(): - return (Path(__file__).parent / "files/bad_json_data.json").resolve() + return _path("files/bad_json_data.json") @pytest.fixture def non_existent_config_path(): - return (Path(__file__).parent / "files/non_existent.json").resolve() + return _path("files/non_existent.json") @pytest.fixture def non_dict_platform_translations_config_path(): - return ( - Path(__file__).parent / "files/non_dict_platform_translations.json" - ).resolve() + return _path("files/non_dict_platform_translations.json") @pytest.fixture def dict_non_list_platform_translations_config_path(): - return ( - Path(__file__).parent / "files/dict_non_list_platform_translations.json" - ).resolve() + return _path("files/dict_non_list_platform_translations.json") @pytest.fixture def dict_list_non_string_platform_translations_config_path(): - return ( - Path(__file__).parent - / "files/dict_list_non_string_platform_translations.json" - ).resolve() + return _path("files/dict_list_non_string_platform_translations.json") @pytest.fixture def valid_platform_translations_config_path(): - path = ( - Path(__file__).parent / "files/valid_platform_translations.json" - ).resolve() + path = _path("files/valid_platform_translations.json") with path.open(encoding="utf-8") as file: config_data = json.load(file) file.close() @@ -44,3 +35,6 @@ def valid_platform_translations_config_path(): with path.open("w", encoding="utf-8") as file: json.dump(config_data, file, indent=2) file.close() + +def _path(path): + return (Path(__file__).parent / path).resolve()