X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f93d0fa95745c9f1e5b1126e8dd4b09a9daa32d2..9025b0ec78bd770e74a1bed85c8d2e43ce5f571a:/test/python/test_tools_import_special_phrases.py?ds=inline diff --git a/test/python/test_tools_import_special_phrases.py b/test/python/test_tools_import_special_phrases.py index b3c60029..f0a34b08 100644 --- a/test/python/test_tools_import_special_phrases.py +++ b/test/python/test_tools_import_special_phrases.py @@ -2,15 +2,12 @@ Tests for import special phrases methods of the class SPImporter. """ -from nominatim.errors import UsageError -from pathlib import Path -import tempfile from shutil import copyfile import pytest from nominatim.tools.special_phrases.sp_importer import SPImporter from nominatim.tools.special_phrases.sp_wiki_loader import SPWikiLoader -from nominatim.tools.special_phrases.sp_csv_loader import SPCsvLoader from nominatim.tools.special_phrases.special_phrase import SpecialPhrase +from nominatim.errors import UsageError from cursor import CursorForTesting @@ -51,8 +48,8 @@ def xml_wiki_content(src_dir): """ return the content of the static xml test file. """ - xml_test_content_path = (src_dir / 'test' / 'testdata' / 'special_phrases_test_content.txt').resolve() - return xml_test_content_path.read_text() + xml_test_content = src_dir / 'test' / 'testdata' / 'special_phrases_test_content.txt' + return xml_test_content.read_text() @pytest.fixture @@ -93,19 +90,18 @@ def test_load_white_and_black_lists(sp_importer): assert isinstance(black_list, dict) and isinstance(white_list, dict) -def test_convert_php_settings(sp_importer, testfile_dir): +def test_convert_php_settings(sp_importer, testfile_dir, tmp_path): """ Test that _convert_php_settings_if_needed() convert the given php file to a json file. """ php_file = (testfile_dir / 'phrase_settings.php').resolve() - with tempfile.TemporaryDirectory() as temp_dir: - temp_settings = (Path(temp_dir) / 'phrase_settings.php').resolve() - copyfile(php_file, temp_settings) - sp_importer._convert_php_settings_if_needed(temp_settings) + temp_settings = (tmp_path / 'phrase_settings.php').resolve() + copyfile(php_file, temp_settings) + sp_importer._convert_php_settings_if_needed(temp_settings) - assert (Path(temp_dir) / 'phrase_settings.json').is_file() + assert (tmp_path / 'phrase_settings.json').is_file() def test_convert_settings_wrong_file(sp_importer): """