test: more use of table_factory

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

diff --git a/test/python/test_tools_refresh_address_levels.py b/test/python/test_tools_refresh_address_levels.py
index 87e34c6166990cb6fbefde16affd3dd363480c33..a3df6c9c89389942fd945da9a604b25d336a87cf 100644 (file)
--- a/test/python/test_tools_refresh_address_levels.py
+++ b/test/python/test_tools_refresh_address_levels.py
@@ -2,15 +2,16 @@
 Tests for function for importing address ranks.
 """
 import json
 Tests for function for importing address ranks.
 """
 import json

-import pytest

 from pathlib import Path
 
 from pathlib import Path
 

+import pytest
+

 from nominatim.tools.refresh import load_address_levels, load_address_levels_from_file
 
 def test_load_ranks_def_config(temp_db_conn, temp_db_cursor, def_config):
     load_address_levels_from_file(temp_db_conn, Path(def_config.ADDRESS_LEVEL_CONFIG))
 
 from nominatim.tools.refresh import load_address_levels, load_address_levels_from_file
 
 def test_load_ranks_def_config(temp_db_conn, temp_db_cursor, def_config):
     load_address_levels_from_file(temp_db_conn, Path(def_config.ADDRESS_LEVEL_CONFIG))
 

-    assert temp_db_cursor.scalar('SELECT count(*) FROM address_levels') > 0
+    assert temp_db_cursor.table_rows('address_levels') > 0

 
 def test_load_ranks_from_file(temp_db_conn, temp_db_cursor, tmp_path):
     test_file = tmp_path / 'test_levels.json'
 
 def test_load_ranks_from_file(temp_db_conn, temp_db_cursor, tmp_path):
     test_file = tmp_path / 'test_levels.json'


@@ -18,7 +19,7 @@ def test_load_ranks_from_file(temp_db_conn, temp_db_cursor, tmp_path):
 
     load_address_levels_from_file(temp_db_conn, test_file)
 
 
     load_address_levels_from_file(temp_db_conn, test_file)
 

-    assert temp_db_cursor.scalar('SELECT count(*) FROM address_levels') > 0
+    assert temp_db_cursor.table_rows('address_levels') > 0

 
 
 def test_load_ranks_from_broken_file(temp_db_conn, tmp_path):
 
 
 def test_load_ranks_from_broken_file(temp_db_conn, tmp_path):