X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/06aab389ede19c9d2a63630ddf0bae3bdc173f63..834ae0a93f2f25b3231f4c47612ac1d2c170738a:/test/python/test_tools_sp_csv_loader.py diff --git a/test/python/test_tools_sp_csv_loader.py b/test/python/test_tools_sp_csv_loader.py index 628dfd16..80d5989e 100644 --- a/test/python/test_tools_sp_csv_loader.py +++ b/test/python/test_tools_sp_csv_loader.py @@ -1,12 +1,10 @@ """ Tests for methods of the SPCsvLoader class. """ -from nominatim.errors import UsageError import pytest -from pathlib import Path -from nominatim.tools.special_phrases.sp_csv_loader import SPCsvLoader -TEST_BASE_DIR = Path(__file__) / '..' / '..' +from nominatim.errors import UsageError +from nominatim.tools.special_phrases.sp_csv_loader import SPCsvLoader def test_parse_csv(sp_csv_loader): """ @@ -16,7 +14,6 @@ def test_parse_csv(sp_csv_loader): phrases = sp_csv_loader.parse_csv() assert check_phrases_content(phrases) - def test_next(sp_csv_loader): """ Test objects returned from the next() method. @@ -44,16 +41,20 @@ def check_phrases_content(phrases): the right phrases of the sp_csv_test.csv special phrases. """ return len(phrases) > 1 \ - and any(p.p_label == 'Billboard' and p.p_class == 'advertising' and p.p_type == 'billboard' + and any(p.p_label == 'Billboard' + and p.p_class == 'advertising' + and p.p_type == 'billboard' and p.p_operator == '-' for p in phrases) \ - and any(p.p_label == 'Zip Lines' and p.p_class == 'aerialway' and p.p_type == 'zip_line' + and any(p.p_label == 'Zip Lines' + and p.p_class == 'aerialway' + and p.p_type == 'zip_line' and p.p_operator == '-' for p in phrases) @pytest.fixture -def sp_csv_loader(): +def sp_csv_loader(src_dir): """ Return an instance of SPCsvLoader. """ - csv_path = (TEST_BASE_DIR / 'testdata' / 'sp_csv_test.csv').resolve() + csv_path = (src_dir / 'test' / 'testdata' / 'sp_csv_test.csv').resolve() loader = SPCsvLoader(csv_path) return loader