Merge pull request #2357 from lonvia/legacy-tokenizer-fix-word-entries

[nominatim.git] / test / python / test_tools_import_special_phrases.py

diff --git a/test/python/test_tools_import_special_phrases.py b/test/python/test_tools_import_special_phrases.py
index b3c600292f6789e0e3fa28b772fffcdd61065d51..f0a34b0896db1102c1a54d7dae991f4ee02673fe 100644 (file)
--- 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.
 """
     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 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.tools.special_phrases.special_phrase import SpecialPhrase

+from nominatim.errors import UsageError

 
 from cursor import CursorForTesting
 
 
 from cursor import CursorForTesting
 


@@ -51,8 +48,8 @@ def xml_wiki_content(src_dir):
     """
         return the content of the static xml test file.
     """
     """
         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
 
 
 @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)
 
 
     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()
 
     """
         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):
     """
 
 def test_convert_settings_wrong_file(sp_importer):
     """