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 cbe7f7bd7039fd12f8f7433b26a467def9cfbf64..c6be4fe72774068e9476a79299feba0dc7e30c03 100644 (file)
--- a/test/python/tools/test_refresh.py
+++ b/test/python/tools/test_refresh.py
@@ -17,6 +17,21 @@ def test_refresh_import_wikipedia_not_existing(dsn):
     assert refresh.import_wikipedia_articles(dsn, Path('.')) == 1
 
 
     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:
 @pytest.mark.parametrize("replace", (True, False))
 def test_refresh_import_wikipedia(dsn, src_dir, table_factory, temp_db_cursor, replace):
     if replace:


@@ -34,8 +49,53 @@ 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,
     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""")
 
     refresh.recompute_importance(temp_db_conn)
                                               OUT importance FLOAT,
                                               OUT wikipedia TEXT)
                                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))