Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / test_tools_check_database.py

diff --git a/test/python/test_tools_check_database.py b/test/python/test_tools_check_database.py
index 3787c3be16e9351fd4ccedb5a7d98e698a3b358b..aed5cb7e98c75fe9a9f0b029cb04db9cceed8efe 100644 (file)
--- a/test/python/test_tools_check_database.py
+++ b/test/python/test_tools_check_database.py
@@ -7,11 +7,11 @@ from nominatim.tools import check_database as chkdb
 
 def test_check_database_unknown_db(def_config, monkeypatch):
     monkeypatch.setenv('NOMINATIM_DATABASE_DSN', 'pgsql:dbname=fjgkhughwgh2423gsags')
 
 def test_check_database_unknown_db(def_config, monkeypatch):
     monkeypatch.setenv('NOMINATIM_DATABASE_DSN', 'pgsql:dbname=fjgkhughwgh2423gsags')

-    assert 1 == chkdb.check_database(def_config)
+    assert chkdb.check_database(def_config) == 1

 
 
 def test_check_database_fatal_test(def_config, temp_db):
 
 
 def test_check_database_fatal_test(def_config, temp_db):

-    assert 1 == chkdb.check_database(def_config)
+    assert chkdb.check_database(def_config) == 1

 
 
 def test_check_conection_good(temp_db_conn, def_config):
 
 
 def test_check_conection_good(temp_db_conn, def_config):


@@ -23,8 +23,8 @@ def test_check_conection_bad(def_config):
     assert chkdb.check_connection(badconn, def_config) == chkdb.CheckState.FATAL
 
 
     assert chkdb.check_connection(badconn, def_config) == chkdb.CheckState.FATAL
 
 

-def test_check_placex_table_good(temp_db_cursor, temp_db_conn, def_config):
-    temp_db_cursor.execute('CREATE TABLE placex (place_id int)')
+def test_check_placex_table_good(table_factory, temp_db_conn, def_config):
+    table_factory('placex')

     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 


@@ -32,30 +32,44 @@ def test_check_placex_table_bad(temp_db_conn, def_config):
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 

-def test_check_placex_table_size_good(temp_db_cursor, temp_db_conn, def_config):
-    temp_db_cursor.execute('CREATE TABLE placex (place_id int)')
-    temp_db_cursor.execute('INSERT INTO placex VALUES (1), (2)')
+def test_check_placex_table_size_good(table_factory, temp_db_conn, def_config):
+    table_factory('placex', content=((1, ), (2, )))

     assert chkdb.check_placex_size(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
     assert chkdb.check_placex_size(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 

-def test_check_placex_table_size_bad(temp_db_cursor, temp_db_conn, def_config):
-    temp_db_cursor.execute('CREATE TABLE placex (place_id int)')
+def test_check_placex_table_size_bad(table_factory, temp_db_conn, def_config):
+    table_factory('placex')

     assert chkdb.check_placex_size(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 
     assert chkdb.check_placex_size(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 

-def test_check_module_bad(temp_db_conn, def_config):
-    assert chkdb.check_module(temp_db_conn, def_config) == chkdb.CheckState.FAIL
+def test_check_tokenizer_missing(temp_db_conn, def_config, tmp_path):
+    def_config.project_dir = tmp_path
+    assert chkdb.check_tokenizer(temp_db_conn, def_config) == chkdb.CheckState.FAIL

 
 
 
 

-def test_check_indexing_good(temp_db_cursor, temp_db_conn, def_config):
-    temp_db_cursor.execute('CREATE TABLE placex (place_id int, indexed_status smallint)')
-    temp_db_cursor.execute('INSERT INTO placex VALUES (1, 0), (2, 0)')
+@pytest.mark.parametrize("check_result,state", [(None, chkdb.CheckState.OK),
+                                                ("Something wrong", chkdb.CheckState.FAIL)])
+def test_check_tokenizer(temp_db_conn, def_config, monkeypatch,
+                         check_result, state):
+    class _TestTokenizer:
+        @staticmethod
+        def check_database():
+            return check_result
+
+    monkeypatch.setattr(chkdb.tokenizer_factory, 'get_tokenizer_for_db',
+                        lambda *a, **k: _TestTokenizer())
+    assert chkdb.check_tokenizer(temp_db_conn, def_config) == state
+
+
+def test_check_indexing_good(table_factory, temp_db_conn, def_config):
+    table_factory('placex', 'place_id int, indexed_status smallint',
+                  content=((1, 0), (2, 0)))

     assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
     assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 

-def test_check_indexing_bad(temp_db_cursor, temp_db_conn, def_config):
-    temp_db_cursor.execute('CREATE TABLE placex (place_id int, indexed_status smallint)')
-    temp_db_cursor.execute('INSERT INTO placex VALUES (1, 0), (2, 2)')
+def test_check_indexing_bad(table_factory, temp_db_conn, def_config):
+    table_factory('placex', 'place_id int, indexed_status smallint',
+                  content=((1, 0), (2, 2)))

     assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.FAIL
 
 
     assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.FAIL
 
 


@@ -63,13 +77,17 @@ def test_check_database_indexes_bad(temp_db_conn, def_config):
     assert chkdb.check_database_indexes(temp_db_conn, def_config) == chkdb.CheckState.FAIL
 
 
     assert chkdb.check_database_indexes(temp_db_conn, def_config) == chkdb.CheckState.FAIL
 
 

+def test_check_database_indexes_valid(temp_db_conn, def_config):
+    assert chkdb.check_database_index_valid(temp_db_conn, def_config) == chkdb.CheckState.OK
+
+

 def test_check_tiger_table_disabled(temp_db_conn, def_config, monkeypatch):
 def test_check_tiger_table_disabled(temp_db_conn, def_config, monkeypatch):

-    monkeypatch.setenv('NOMINATIM_USE_US_TIGER_DATA' , 'no')
+    monkeypatch.setenv('NOMINATIM_USE_US_TIGER_DATA', 'no')

     assert chkdb.check_tiger_table(temp_db_conn, def_config) == chkdb.CheckState.NOT_APPLICABLE
 
 
 def test_check_tiger_table_enabled(temp_db_cursor, temp_db_conn, def_config, monkeypatch):
     assert chkdb.check_tiger_table(temp_db_conn, def_config) == chkdb.CheckState.NOT_APPLICABLE
 
 
 def test_check_tiger_table_enabled(temp_db_cursor, temp_db_conn, def_config, monkeypatch):

-    monkeypatch.setenv('NOMINATIM_USE_US_TIGER_DATA' , 'yes')
+    monkeypatch.setenv('NOMINATIM_USE_US_TIGER_DATA', 'yes')

     assert chkdb.check_tiger_table(temp_db_conn, def_config) == chkdb.CheckState.FAIL
 
     temp_db_cursor.execute('CREATE TABLE location_property_tiger (place_id int)')
     assert chkdb.check_tiger_table(temp_db_conn, def_config) == chkdb.CheckState.FAIL
 
     temp_db_cursor.execute('CREATE TABLE location_property_tiger (place_id int)')


@@ -77,4 +95,3 @@ def test_check_tiger_table_enabled(temp_db_cursor, temp_db_conn, def_config, mon
 
     temp_db_cursor.execute('INSERT INTO location_property_tiger VALUES (1), (2)')
     assert chkdb.check_tiger_table(temp_db_conn, def_config) == chkdb.CheckState.OK
 
     temp_db_cursor.execute('INSERT INTO location_property_tiger VALUES (1), (2)')
     assert chkdb.check_tiger_table(temp_db_conn, def_config) == chkdb.CheckState.OK

-