Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / tools / test_refresh.py

diff --git a/test/python/tools/test_refresh.py b/test/python/tools/test_refresh.py
index 311c84683fb2446e1542678561f5379f60baa6d2..c6be4fe72774068e9476a79299feba0dc7e30c03 100644 (file)
--- a/test/python/tools/test_refresh.py
+++ b/test/python/tools/test_refresh.py
@@ -17,8 +17,19 @@ def test_refresh_import_wikipedia_not_existing(dsn):
     assert refresh.import_wikipedia_articles(dsn, Path('.')) == 1
 
 
-def test_refresh_import_osm_views_geotiff_not_existing(dsn):
-    assert refresh.import_osm_views_geotiff(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))
@@ -38,6 +49,7 @@ def test_recompute_importance(placex_table, table_factory, temp_db_conn, temp_db
     temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION compute_importance(extratags HSTORE,
                                               country_code varchar(2),
                                               osm_type varchar(1), osm_id BIGINT,
+                                              centroid GEOMETRY,
                                               OUT importance FLOAT,
                                               OUT wikipedia TEXT)
                                AS $$ SELECT 0.1::float, 'foo'::text $$ LANGUAGE SQL""")