X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/403e6f7e5c9aaeee6de0aefe76bdcbdb997cf108..6527b7cdcdc22eb8bab8851893a4699b60805a2b:/test/python/tools/test_refresh.py diff --git a/test/python/tools/test_refresh.py b/test/python/tools/test_refresh.py index ac52aa36..1f1968cf 100644 --- a/test/python/tools/test_refresh.py +++ b/test/python/tools/test_refresh.py @@ -1,8 +1,8 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Test for various refresh functions. @@ -11,17 +11,32 @@ from pathlib import Path import pytest -from nominatim.tools import refresh +from nominatim_db.tools import refresh +from nominatim_db.db.connection import postgis_version_tuple 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 postgis_version_tuple(temp_db_conn)[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_cursor.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: - table_factory('wikipedia_article') - table_factory('wikipedia_redirect') + table_factory('wikimedia_importance') # use the small wikipedia file for the API testdb assert refresh.import_wikipedia_articles(dsn, src_dir / 'test' / 'testdb') == 0 @@ -33,7 +48,8 @@ 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::float, 'foo'::text $$ LANGUAGE SQL""")