X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dcfb228c9a0035d72de6c3a66f7f329e72cd960e..f92e580293a527d167ddb8b12a2690967c19b26b:/test/python/api/test_api_search.py diff --git a/test/python/api/test_api_search.py b/test/python/api/test_api_search.py index aa263d24..25f63bb8 100644 --- a/test/python/api/test_api_search.py +++ b/test/python/api/test_api_search.py @@ -19,9 +19,11 @@ import sqlalchemy as sa import nominatim.api as napi import nominatim.api.logging as loglib +API_OPTIONS = {'search'} + @pytest.fixture(autouse=True) def setup_icu_tokenizer(apiobj): - """ Setup the propoerties needed for using the ICU tokenizer. + """ Setup the properties needed for using the ICU tokenizer. """ apiobj.add_data('properties', [{'property': 'tokenizer', 'value': 'icu'}, @@ -30,66 +32,62 @@ def setup_icu_tokenizer(apiobj): ]) -def test_search_no_content(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB') +def test_search_no_content(apiobj, frontend): + apiobj.add_word_table([]) - assert apiobj.api.search('foo') == [] + api = frontend(apiobj, options=API_OPTIONS) + assert api.search('foo') == [] -def test_search_simple_word(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB', - content=[(55, 'test', 'W', 'test', None), +def test_search_simple_word(apiobj, frontend): + apiobj.add_word_table([(55, 'test', 'W', 'test', None), (2, 'test', 'w', 'test', None)]) apiobj.add_placex(place_id=444, class_='place', type='village', centroid=(1.3, 0.7)) apiobj.add_search_name(444, names=[2, 55]) - results = apiobj.api.search('TEST') + api = frontend(apiobj, options=API_OPTIONS) + results = api.search('TEST') assert [r.place_id for r in results] == [444] @pytest.mark.parametrize('logtype', ['text', 'html']) -def test_search_with_debug(apiobj, table_factory, logtype): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB', - content=[(55, 'test', 'W', 'test', None), +def test_search_with_debug(apiobj, frontend, logtype): + apiobj.add_word_table([(55, 'test', 'W', 'test', None), (2, 'test', 'w', 'test', None)]) apiobj.add_placex(place_id=444, class_='place', type='village', centroid=(1.3, 0.7)) apiobj.add_search_name(444, names=[2, 55]) + api = frontend(apiobj, options=API_OPTIONS) loglib.set_log_output(logtype) - results = apiobj.api.search('TEST') + results = api.search('TEST') assert loglib.get_and_disable() -def test_address_no_content(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB') +def test_address_no_content(apiobj, frontend): + apiobj.add_word_table([]) - assert apiobj.api.search_address(amenity='hotel', - street='Main St 34', - city='Happyville', - county='Wideland', - state='Praerie', - postalcode='55648', - country='xx') == [] + api = frontend(apiobj, options=API_OPTIONS) + assert api.search_address(amenity='hotel', + street='Main St 34', + city='Happyville', + county='Wideland', + state='Praerie', + postalcode='55648', + country='xx') == [] @pytest.mark.parametrize('atype,address,search', [('street', 26, 26), ('city', 16, 18), ('county', 12, 12), ('state', 8, 8)]) -def test_address_simple_places(apiobj, table_factory, atype, address, search): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB', - content=[(55, 'test', 'W', 'test', None), +def test_address_simple_places(apiobj, frontend, atype, address, search): + apiobj.add_word_table([(55, 'test', 'W', 'test', None), (2, 'test', 'w', 'test', None)]) apiobj.add_placex(place_id=444, @@ -97,53 +95,51 @@ def test_address_simple_places(apiobj, table_factory, atype, address, search): centroid=(1.3, 0.7)) apiobj.add_search_name(444, names=[2, 55], address_rank=address, search_rank=search) - results = apiobj.api.search_address(**{atype: 'TEST'}) + api = frontend(apiobj, options=API_OPTIONS) + results = api.search_address(**{atype: 'TEST'}) assert [r.place_id for r in results] == [444] -def test_address_country(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB', - content=[(None, 'ro', 'C', 'ro', None)]) +def test_address_country(apiobj, frontend): + apiobj.add_word_table([(None, 'ro', 'C', 'ro', None)]) apiobj.add_country('ro', 'POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))') apiobj.add_country_name('ro', {'name': 'România'}) - assert len(apiobj.api.search_address(country='ro')) == 1 + api = frontend(apiobj, options=API_OPTIONS) + assert len(api.search_address(country='ro')) == 1 -def test_category_no_categories(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB') +def test_category_no_categories(apiobj, frontend): + apiobj.add_word_table([]) - assert apiobj.api.search_category([], near_query='Berlin') == [] + api = frontend(apiobj, options=API_OPTIONS) + assert api.search_category([], near_query='Berlin') == [] -def test_category_no_content(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB') +def test_category_no_content(apiobj, frontend): + apiobj.add_word_table([]) - assert apiobj.api.search_category([('amenity', 'restaurant')]) == [] + api = frontend(apiobj, options=API_OPTIONS) + assert api.search_category([('amenity', 'restaurant')]) == [] -def test_category_simple_restaurant(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB') +def test_category_simple_restaurant(apiobj, frontend): + apiobj.add_word_table([]) apiobj.add_placex(place_id=444, class_='amenity', type='restaurant', centroid=(1.3, 0.7)) apiobj.add_search_name(444, names=[2, 55], address_rank=16, search_rank=18) - results = apiobj.api.search_category([('amenity', 'restaurant')], - near=(1.3, 0.701), near_radius=0.015) + api = frontend(apiobj, options=API_OPTIONS) + results = api.search_category([('amenity', 'restaurant')], + near=(1.3, 0.701), near_radius=0.015) assert [r.place_id for r in results] == [444] -def test_category_with_search_phrase(apiobj, table_factory): - table_factory('word', - definition='word_id INT, word_token TEXT, type TEXT, word TEXT, info JSONB', - content=[(55, 'test', 'W', 'test', None), +def test_category_with_search_phrase(apiobj, frontend): + apiobj.add_word_table([(55, 'test', 'W', 'test', None), (2, 'test', 'w', 'test', None)]) apiobj.add_placex(place_id=444, class_='place', type='village', @@ -153,7 +149,7 @@ def test_category_with_search_phrase(apiobj, table_factory): apiobj.add_placex(place_id=95, class_='amenity', type='restaurant', centroid=(1.3, 0.7003)) - results = apiobj.api.search_category([('amenity', 'restaurant')], - near_query='TEST') + api = frontend(apiobj, options=API_OPTIONS) + results = api.search_category([('amenity', 'restaurant')], near_query='TEST') assert [r.place_id for r in results] == [95]