X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e14e7c6235a40dbec451146bcb3aaec013d659c9..834ae0a93f2f25b3231f4c47612ac1d2c170738a:/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 2bd91720..2821222c 100644 --- a/test/python/test_tools_refresh_address_levels.py +++ b/test/python/test_tools_refresh_address_levels.py @@ -11,7 +11,7 @@ from nominatim.tools.refresh import load_address_levels, load_address_levels_fro 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' @@ -19,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) - 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): @@ -35,7 +35,7 @@ def test_load_ranks_country(temp_db_conn, temp_db_cursor): [{"tags": {"place": {"village": 14}}}, {"countries": ['de'], "tags": {"place": {"village": 15}}}, - {"countries": ['uk', 'us' ], + {"countries": ['uk', 'us'], "tags": {"place": {"village": 16}}} ]) @@ -62,9 +62,8 @@ def test_load_ranks_default_value(temp_db_conn, temp_db_cursor): def test_load_ranks_multiple_keys(temp_db_conn, temp_db_cursor): load_address_levels(temp_db_conn, 'levels', - [{"tags": - {"place": {"city": 14}, - "boundary": {"administrative2" : 4}} + [{"tags": {"place": {"city": 14}, + "boundary": {"administrative2" : 4}} }]) assert temp_db_cursor.row_set('SELECT * FROM levels') == \ @@ -75,9 +74,8 @@ def test_load_ranks_multiple_keys(temp_db_conn, temp_db_cursor): def test_load_ranks_address(temp_db_conn, temp_db_cursor): load_address_levels(temp_db_conn, 'levels', - [{"tags": - {"place": {"city": 14, - "town" : [14, 13]}} + [{"tags": {"place": {"city": 14, + "town" : [14, 13]}} }]) assert temp_db_cursor.row_set('SELECT * FROM levels') == \