X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7be164e2a569816a4dc0305aa78be61858ff2d60..c41f2fed2133668dc3179813261d39d3ff69cbdd:/test/python/tools/test_refresh.py?ds=inline diff --git a/test/python/tools/test_refresh.py b/test/python/tools/test_refresh.py index b6f18e0a..3e0a2801 100644 --- a/test/python/tools/test_refresh.py +++ b/test/python/tools/test_refresh.py @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# This file is part of Nominatim. (https://nominatim.org) +# +# Copyright (C) 2022 by the Nominatim developer community. +# For a full list of authors see the git log. """ Test for various refresh functions. """ @@ -11,6 +17,21 @@ def test_refresh_import_wikipedia_not_existing(dsn): assert refresh.import_wikipedia_articles(dsn, Path('.')) == 1 +def test_refresh_import_secondary_importance_non_existing(dsn): + assert refresh.import_secondary_importance(dsn, Path('.')) == 1 + +def test_refresh_import_secondary_importance_testdb(dsn, src_dir, temp_db_conn, temp_db_cursor): + temp_db_cursor.execute('CREATE EXTENSION postgis') + + if temp_db_conn.postgis_version_tuple()[0] < 3: + assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') > 0 + else: + temp_db_cursor.execute('CREATE EXTENSION postgis_raster') + assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') == 0 + + assert temp_db_conn.table_exists('secondary_importance') + + @pytest.mark.parametrize("replace", (True, False)) def test_refresh_import_wikipedia(dsn, src_dir, table_factory, temp_db_cursor, replace): if replace: @@ -27,9 +48,54 @@ def test_refresh_import_wikipedia(dsn, src_dir, table_factory, temp_db_cursor, r def test_recompute_importance(placex_table, table_factory, temp_db_conn, temp_db_cursor): temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION compute_importance(extratags HSTORE, country_code varchar(2), - osm_type varchar(1), osm_id BIGINT, + rank_search SMALLINT, + centroid GEOMETRY, OUT importance FLOAT, OUT wikipedia TEXT) - AS $$ SELECT 0.1, 'foo' $$ LANGUAGE SQL""") + AS $$ SELECT 0.1::float, 'foo'::text $$ LANGUAGE SQL""") refresh.recompute_importance(temp_db_conn) + + +@pytest.mark.parametrize('osm_type', ('N', 'W', 'R')) +def test_invalidate_osm_object_simple(placex_table, osm_type, temp_db_conn, temp_db_cursor): + placex_table.add(osm_type=osm_type, osm_id=57283) + + refresh.invalidate_osm_object(osm_type, 57283, temp_db_conn, recursive=False) + temp_db_conn.commit() + + assert 2 == temp_db_cursor.scalar("""SELECT indexed_status FROM placex + WHERE osm_type = %s and osm_id = %s""", + (osm_type, 57283)) + + +def test_invalidate_osm_object_nonexisting_simple(placex_table, temp_db_conn, temp_db_cursor): + placex_table.add(osm_type='W', osm_id=57283) + + refresh.invalidate_osm_object('N', 57283, temp_db_conn, recursive=False) + temp_db_conn.commit() + + assert 0 == temp_db_cursor.scalar("""SELECT count(*) FROM placex + WHERE indexed_status > 0""") + + +@pytest.mark.parametrize('osm_type', ('N', 'W', 'R')) +def test_invalidate_osm_object_recursive(placex_table, osm_type, temp_db_conn, temp_db_cursor): + placex_table.add(osm_type=osm_type, osm_id=57283) + + temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION place_force_update(placeid BIGINT) + RETURNS BOOLEAN AS $$ + BEGIN + UPDATE placex SET indexed_status = 522 + WHERE place_id = placeid; + RETURN TRUE; + END; + $$ + LANGUAGE plpgsql;""") + + refresh.invalidate_osm_object(osm_type, 57283, temp_db_conn) + temp_db_conn.commit() + + assert 522 == temp_db_cursor.scalar("""SELECT indexed_status FROM placex + WHERE osm_type = %s and osm_id = %s""", + (osm_type, 57283))