Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/test_tools_sp_wiki_loader.py b/test/python/test_tools_sp_wiki_loader.py
index b4f6d529c606cad62fdb9e56c7d73dd930dd6ea6..f29528a51ec1d3ce8e4624a5b35c5c94d91b57dc 100644 (file)
--- a/test/python/test_tools_sp_wiki_loader.py
+++ b/test/python/test_tools_sp_wiki_loader.py
@@ -2,19 +2,35 @@
     Tests for methods of the SPWikiLoader class.
 """
 import pytest
     Tests for methods of the SPWikiLoader class.
 """
 import pytest

-from pathlib import Path

 from nominatim.tools.special_phrases.sp_wiki_loader import SPWikiLoader
 
 from nominatim.tools.special_phrases.sp_wiki_loader import SPWikiLoader
 

-TEST_BASE_DIR = Path(__file__) / '..' / '..'
+@pytest.fixture
+def xml_wiki_content(src_dir):
+    """
+        return the content of the static xml test file.
+    """
+    xml_test_content = src_dir / 'test' / 'testdata' / 'special_phrases_test_content.txt'
+    return xml_test_content.read_text()

 
 

-def test_parse_xml(sp_wiki_loader):
+
+@pytest.fixture
+def sp_wiki_loader(monkeypatch, def_config, xml_wiki_content):
+    """
+        Return an instance of SPWikiLoader.
+    """
+    loader = SPWikiLoader(def_config, ['en'])
+    monkeypatch.setattr('nominatim.tools.special_phrases.sp_wiki_loader.SPWikiLoader._get_wiki_content',
+                        lambda self, lang: xml_wiki_content)
+    return loader
+
+
+def test_parse_xml(sp_wiki_loader, xml_wiki_content):

     """
         Test method parse_xml()
         Should return the right SpecialPhrase objects.
     """
     """
         Test method parse_xml()
         Should return the right SpecialPhrase objects.
     """

-    xml = get_test_xml_wiki_content()
-    phrases = sp_wiki_loader.parse_xml(xml)
-    assert check_phrases_content(phrases)
+    phrases = sp_wiki_loader.parse_xml(xml_wiki_content)
+    check_phrases_content(phrases)

 
 
 def test_next(sp_wiki_loader):
 
 
 def test_next(sp_wiki_loader):


@@ -24,40 +40,29 @@ def test_next(sp_wiki_loader):
         the 'en' special phrases.
     """
     phrases = next(sp_wiki_loader)
         the 'en' special phrases.
     """
     phrases = next(sp_wiki_loader)

-    assert check_phrases_content(phrases)
+    check_phrases_content(phrases)

 
 def check_phrases_content(phrases):
     """
         Asserts that the given phrases list contains
         the right phrases of the 'en' special phrases.
     """
 
 def check_phrases_content(phrases):
     """
         Asserts that the given phrases list contains
         the right phrases of the 'en' special phrases.
     """

-    return  len(phrases) > 1 \
-            and any(p.p_label == 'Embassies' and p.p_class == 'amenity' and p.p_type == 'embassy'
-                    and p.p_operator == '-' for p in phrases) \
-            and any(p.p_label == 'Zip Line' and p.p_class == 'aerialway' and p.p_type == 'zip_line'
-                    and p.p_operator == '-' for p in phrases)
-
-@pytest.fixture
-def sp_wiki_loader(monkeypatch, def_config):
-    """
-        Return an instance of SPWikiLoader.
-    """
-    loader = SPWikiLoader(def_config, ['en'])
-    monkeypatch.setattr('nominatim.tools.special_phrases.sp_wiki_loader.SPWikiLoader._get_wiki_content',
-                        mock_get_wiki_content)
-    return loader
-
-def mock_get_wiki_content(self, lang):
-    """
-        Mock the _get_wiki_content() method to return
-        static xml test file content.
-    """
-    return get_test_xml_wiki_content()
-
-def get_test_xml_wiki_content():
-    """
-        return the content of the static xml test file.
-    """
-    xml_test_content_path = (TEST_BASE_DIR / 'testdata' / 'special_phrases_test_content.txt').resolve()
-    with open(xml_test_content_path) as xml_content_reader:
-        return xml_content_reader.read()
+    assert set((p.p_label, p.p_class, p.p_type, p.p_operator) for p in phrases) ==\
+              {('Zip Line', 'aerialway', 'zip_line', '-'),
+               ('Zip Lines', 'aerialway', 'zip_line', '-'),
+               ('Zip Line in', 'aerialway', 'zip_line', 'in'),
+               ('Zip Lines in', 'aerialway', 'zip_line', 'in'),
+               ('Zip Line near', 'aerialway', 'zip_line', 'near'),
+               ('Animal shelter', 'amenity', 'animal_shelter', '-'),
+               ('Animal shelters', 'amenity', 'animal_shelter', '-'),
+               ('Animal shelter in', 'amenity', 'animal_shelter', 'in'),
+               ('Animal shelters in', 'amenity', 'animal_shelter', 'in'),
+               ('Animal shelter near', 'amenity', 'animal_shelter', 'near'),
+               ('Animal shelters near', 'amenity', 'animal_shelter', 'near'),
+               ('Drinking Water near', 'amenity', 'drinking_water', 'near'),
+               ('Water', 'amenity', 'drinking_water', '-'),
+               ('Water in', 'amenity', 'drinking_water', 'in'),
+               ('Water near', 'amenity', 'drinking_water', 'near'),
+               ('Embassy', 'amenity', 'embassy', '-'),
+               ('Embassys', 'amenity', 'embassy', '-'),
+               ('Embassies', 'amenity', 'embassy', '-')}