X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/17cb59efbd5ebec4ee44cf56999e443a7993b050..2c19bd5ea38fb7474d0ca530fdab7ae76cee965b:/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 058e170b..0adc2850 100644 --- a/test/python/test_tools_import_special_phrases.py +++ b/test/python/test_tools_import_special_phrases.py @@ -1,76 +1,40 @@ """ Tests for import special phrases functions """ +from pathlib import Path import pytest -from nominatim.tools.special_phrases import _create_place_classtype_indexes, _create_place_classtype_table, _get_wiki_content, _grant_access_to_webuser, _process_amenity +from nominatim.tools.special_phrases import SpecialPhrasesImporter -def test_get_wiki_content(): - assert _get_wiki_content('fr') +TEST_BASE_DIR = Path(__file__) / '..' / '..' -def execute_and_verify_add_word(temp_db_conn, phrase_label, phrase_class, phrase_type): - _process_amenity(temp_db_conn, phrase_label, phrase_class, phrase_type, '') +def test_process_amenity_with_operator(special_phrases_importer, getorcreate_amenityoperator_funcs): + special_phrases_importer._process_amenity('', '', '', '', 'near') + special_phrases_importer._process_amenity('', '', '', '', 'in') - with temp_db_conn.cursor() as temp_db_cursor: - temp_db_cursor.execute(f""" - SELECT * FROM word - WHERE word_token=' {phrase_label}' - AND word='{phrase_label}' - AND class='{phrase_class}' - AND type='{phrase_type}'""") - return temp_db_cursor.fetchone() - -def execute_and_verify_add_word_with_operator(temp_db_conn, phrase_label, phrase_class, phrase_type, phrase_operator): - _process_amenity(temp_db_conn, phrase_label, phrase_class, phrase_type, phrase_operator) - - with temp_db_conn.cursor() as temp_db_cursor: - temp_db_cursor.execute(f""" - SELECT * FROM word - WHERE word_token=' {phrase_label}' - AND word='{phrase_label}' - AND class='{phrase_class}' - AND type='{phrase_type}' - AND operator='{phrase_operator}'""") - return temp_db_cursor.fetchone() - -def test_process_amenity_with_near_operator(temp_db_conn, word_table, amenity_operator_funcs): - phrase_label = 'label' - phrase_class = 'class' - phrase_type = 'type' +def test_process_amenity_without_operator(special_phrases_importer, getorcreate_amenity_funcs): + special_phrases_importer._process_amenity('', '', '', '', '') - assert execute_and_verify_add_word(temp_db_conn, phrase_label, phrase_class, phrase_type) - assert execute_and_verify_add_word_with_operator(temp_db_conn, phrase_label, phrase_class, phrase_type, 'near') - assert execute_and_verify_add_word_with_operator(temp_db_conn, phrase_label, phrase_class, phrase_type, 'in') - -def index_exists(db_connect, index): - """ Check that an index with the given name exists in the database. - """ - with db_connect.cursor() as cur: - cur.execute("""SELECT tablename FROM pg_indexes - WHERE indexname = %s and schemaname = 'public'""", (index, )) - if cur.rowcount == 0: - return False - return True - -def test_create_place_classtype_indexes(temp_db_conn): +def test_create_place_classtype_indexes(temp_db_conn, special_phrases_importer): phrase_class = 'class' phrase_type = 'type' - table_name = f'place_classtype_{phrase_class}_{phrase_type}' + table_name = 'place_classtype_{}_{}'.format(phrase_class, phrase_type) + index_prefix = 'idx_place_classtype_{}_{}_'.format(phrase_class, phrase_type) with temp_db_conn.cursor() as temp_db_cursor: temp_db_cursor.execute("CREATE EXTENSION postgis;") - temp_db_cursor.execute(f'CREATE TABLE {table_name}(place_id BIGINT, centroid GEOMETRY)') + temp_db_cursor.execute('CREATE TABLE {}(place_id BIGINT, centroid GEOMETRY)'.format(table_name)) - _create_place_classtype_indexes(temp_db_conn, '', phrase_class, phrase_type) + special_phrases_importer._create_place_classtype_indexes('', phrase_class, phrase_type) - centroid_index_exists = index_exists(temp_db_conn, f'idx_place_classtype_{phrase_class}_{phrase_type}_centroid') - place_id_index_exists = index_exists(temp_db_conn, f'idx_place_classtype_{phrase_class}_{phrase_type}_place_id') + centroid_index_exists = temp_db_conn.index_exists(index_prefix + 'centroid') + place_id_index_exists = temp_db_conn.index_exists(index_prefix + 'place_id') assert centroid_index_exists and place_id_index_exists -def test_create_place_classtype_table(temp_db_conn, placex_table): +def test_create_place_classtype_table(temp_db_conn, placex_table, special_phrases_importer): phrase_class = 'class' phrase_type = 'type' - _create_place_classtype_table(temp_db_conn, '', phrase_class, phrase_type) + special_phrases_importer._create_place_classtype_table('', phrase_class, phrase_type) with temp_db_conn.cursor() as temp_db_cursor: temp_db_cursor.execute(f""" @@ -81,15 +45,15 @@ def test_create_place_classtype_table(temp_db_conn, placex_table): result = temp_db_cursor.fetchone() assert result -def test_grant_access_to_web_user(temp_db_conn, def_config): +def test_grant_access_to_web_user(temp_db_conn, def_config, special_phrases_importer): phrase_class = 'class' phrase_type = 'type' - table_name = f'place_classtype_{phrase_class}_{phrase_type}' + table_name = 'place_classtype_{}_{}'.format(phrase_class, phrase_type) with temp_db_conn.cursor() as temp_db_cursor: - temp_db_cursor.execute(f'CREATE TABLE {table_name}()') + temp_db_cursor.execute('CREATE TABLE {}()'.format(table_name)) - _grant_access_to_webuser(temp_db_conn, def_config, phrase_class, phrase_type) + special_phrases_importer._grant_access_to_webuser(phrase_class, phrase_type) with temp_db_conn.cursor() as temp_db_cursor: temp_db_cursor.execute(f""" @@ -100,65 +64,58 @@ def test_grant_access_to_web_user(temp_db_conn, def_config): result = temp_db_cursor.fetchone() assert result -@pytest.fixture -def amenity_operator_funcs(temp_db_cursor): - temp_db_cursor.execute(f""" - CREATE OR REPLACE FUNCTION make_standard_name(name TEXT) RETURNS TEXT - AS $$ - DECLARE - o TEXT; - BEGIN - RETURN name; --Basically return the same name for the tests - END; - $$ - LANGUAGE plpgsql IMMUTABLE; +def test_create_place_classtype_table_and_indexes( + placex_table, getorcreate_amenity_funcs, + getorcreate_amenityoperator_funcs, special_phrases_importer): + pairs = {('class1', 'type1'), ('class2', 'type2')} - CREATE SEQUENCE seq_word start 1; + special_phrases_importer._create_place_classtype_table_and_indexes(pairs) - CREATE OR REPLACE FUNCTION getorcreate_amenity(lookup_word TEXT, - lookup_class text, lookup_type text) - RETURNS INTEGER - AS $$ - DECLARE - lookup_token TEXT; - return_word_id INTEGER; +def test_process_xml_content(special_phrases_importer, getorcreate_amenity_funcs, + getorcreate_amenityoperator_funcs): + special_phrases_importer._process_xml_content(get_test_xml_wiki_content(), 'en') + +def mock_get_wiki_content(lang): + return get_test_xml_wiki_content() + +def test_import_from_wiki(monkeypatch, special_phrases_importer, placex_table, + getorcreate_amenity_funcs, getorcreate_amenityoperator_funcs): + #mocker.patch.object(special_phrases_importer, '_get_wiki_content', new=mock_get_wiki_content) + monkeypatch.setattr('nominatim.tools.special_phrases.SpecialPhrasesImporter._get_wiki_content', mock_get_wiki_content) + special_phrases_importer.import_from_wiki(['en']) + +def get_test_xml_wiki_content(): + 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() + +@pytest.fixture +def special_phrases_importer(temp_db_conn, def_config, tmp_phplib_dir): + return SpecialPhrasesImporter(def_config, tmp_phplib_dir, temp_db_conn) + +@pytest.fixture +def make_strandard_name_func(temp_db_cursor): + temp_db_cursor.execute(f""" + CREATE OR REPLACE FUNCTION make_standard_name(name TEXT) RETURNS TEXT AS $$ BEGIN - lookup_token := ' '||trim(lookup_word); - SELECT min(word_id) FROM word - WHERE word_token = lookup_token and word = lookup_word - and class = lookup_class and type = lookup_type - INTO return_word_id; - IF return_word_id IS NULL THEN - return_word_id := nextval('seq_word'); - INSERT INTO word VALUES (return_word_id, lookup_token, lookup_word, - lookup_class, lookup_type, null, 0); - END IF; - RETURN return_word_id; + RETURN trim(name); --Basically return only the trimed name for the tests END; - $$ - LANGUAGE plpgsql; + $$ LANGUAGE plpgsql IMMUTABLE;""") - CREATE OR REPLACE FUNCTION getorcreate_amenityoperator(lookup_word TEXT, - lookup_class text, - lookup_type text, - op text) - RETURNS INTEGER - AS $$ - DECLARE - lookup_token TEXT; - return_word_id INTEGER; - BEGIN - lookup_token := ' '||trim(lookup_word); - SELECT min(word_id) FROM word - WHERE word_token = lookup_token and word = lookup_word - and class = lookup_class and type = lookup_type and operator = op - INTO return_word_id; - IF return_word_id IS NULL THEN - return_word_id := nextval('seq_word'); - INSERT INTO word VALUES (return_word_id, lookup_token, lookup_word, - lookup_class, lookup_type, null, 0, op); - END IF; - RETURN return_word_id; - END; - $$ - LANGUAGE plpgsql;""") +@pytest.fixture +def getorcreate_amenity_funcs(temp_db_cursor, make_strandard_name_func): + temp_db_cursor.execute(f""" + CREATE OR REPLACE FUNCTION getorcreate_amenity(lookup_word TEXT, normalized_word TEXT, + lookup_class text, lookup_type text) + RETURNS void as $$ + BEGIN END; + $$ LANGUAGE plpgsql""") + +@pytest.fixture +def getorcreate_amenityoperator_funcs(temp_db_cursor, make_strandard_name_func): + temp_db_cursor.execute(f""" + CREATE OR REPLACE FUNCTION getorcreate_amenityoperator(lookup_word TEXT, normalized_word TEXT, + lookup_class text, lookup_type text, op text) + RETURNS void as $$ + BEGIN END; + $$ LANGUAGE plpgsql""") \ No newline at end of file