Merge pull request #3424 from lonvia/importance-csc-import

[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 3175cb979bcb778adde0eee57a5afdda43a5516f..f7621ab180f54d2733184076ff805eb59a9c5799 100644 (file)
--- a/test/python/tools/test_refresh.py
+++ b/test/python/tools/test_refresh.py
@@ -21,17 +21,21 @@ 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):
     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; CREATE EXTENSION postgis_raster')
-    assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') == 0
+    temp_db_cursor.execute('CREATE EXTENSION postgis')

 
 

-    assert temp_db_conn.table_exists('secondary_importance')
+    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:
 
 
 @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
 
     # use the small wikipedia file for the API testdb
     assert refresh.import_wikipedia_articles(dsn, src_dir / 'test' / 'testdb') == 0


@@ -43,7 +47,7 @@ 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),
 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)
                                               centroid GEOMETRY,
                                               OUT importance FLOAT,
                                               OUT wikipedia TEXT)