X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a28e158bddaed6c690c13df01bfd18a6dd647485..330b8d2fdfdd935da123abf9ecf96b3bc7a12be5:/test/python/api/search/test_query_analyzer_factory.py diff --git a/test/python/api/search/test_query_analyzer_factory.py b/test/python/api/search/test_query_analyzer_factory.py index 9545a88f..42220b55 100644 --- a/test/python/api/search/test_query_analyzer_factory.py +++ b/test/python/api/search/test_query_analyzer_factory.py @@ -11,41 +11,35 @@ from pathlib import Path import pytest -from nominatim_api import NominatimAPIAsync from nominatim_api.search.query_analyzer_factory import make_query_analyzer from nominatim_api.search.icu_tokenizer import ICUQueryAnalyzer @pytest.mark.asyncio -async def test_import_icu_tokenizer(table_factory): +async def test_import_icu_tokenizer(table_factory, api): table_factory('nominatim_properties', definition='property TEXT, value TEXT', content=(('tokenizer', 'icu'), ('tokenizer_import_normalisation', ':: lower();'), ('tokenizer_import_transliteration', "'1' > '/1/'; 'ä' > 'ä '"))) - api = NominatimAPIAsync(Path('/invalid'), {}) async with api.begin() as conn: ana = await make_query_analyzer(conn) assert isinstance(ana, ICUQueryAnalyzer) - await api.close() @pytest.mark.asyncio -async def test_import_missing_property(table_factory): - api = NominatimAPIAsync(Path('/invalid'), {}) +async def test_import_missing_property(table_factory, api): table_factory('nominatim_properties', definition='property TEXT, value TEXT') async with api.begin() as conn: with pytest.raises(ValueError, match='Property.*not found'): await make_query_analyzer(conn) - await api.close() @pytest.mark.asyncio -async def test_import_missing_module(table_factory): - api = NominatimAPIAsync(Path('/invalid'), {}) +async def test_import_missing_module(table_factory, api): table_factory('nominatim_properties', definition='property TEXT, value TEXT', content=(('tokenizer', 'missing'),)) @@ -53,5 +47,3 @@ async def test_import_missing_module(table_factory): async with api.begin() as conn: with pytest.raises(RuntimeError, match='Tokenizer not found'): await make_query_analyzer(conn) - await api.close() -