reduce from 3 to 2 packages

[nominatim.git] / test / python / tools / test_refresh_address_levels.py

diff --git a/test/python/tools/test_refresh_address_levels.py b/test/python/tools/test_refresh_address_levels.py
index 2c4ee24defb46def96ca69b29043fb19ecfa90d8..6e094cdc1c0e03ad5e138bffc18412039acfd07a 100644 (file)
--- a/test/python/tools/test_refresh_address_levels.py
+++ b/test/python/tools/test_refresh_address_levels.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2024 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Tests for function for importing address ranks.
 """
 """
 Tests for function for importing address ranks.
 """


@@ -6,31 +12,28 @@ from pathlib import Path
 
 import pytest
 
 
 import pytest
 

-from nominatim.tools.refresh import load_address_levels, load_address_levels_from_config
+from nominatim_db.tools.refresh import load_address_levels, load_address_levels_from_config

 
 def test_load_ranks_def_config(temp_db_conn, temp_db_cursor, def_config):
     load_address_levels_from_config(temp_db_conn, def_config)
 
     assert temp_db_cursor.table_rows('address_levels') > 0
 
 
 def test_load_ranks_def_config(temp_db_conn, temp_db_cursor, def_config):
     load_address_levels_from_config(temp_db_conn, def_config)
 
     assert temp_db_cursor.table_rows('address_levels') > 0
 

-def test_load_ranks_from_project_dir(def_config, temp_db_conn, temp_db_cursor,
-                                     tmp_path):
-    test_file = tmp_path / 'address-levels.json'
+def test_load_ranks_from_project_dir(project_env, temp_db_conn, temp_db_cursor):
+    test_file = project_env.project_dir / 'address-levels.json'

     test_file.write_text('[{"tags":{"place":{"sea":2}}}]')
     test_file.write_text('[{"tags":{"place":{"sea":2}}}]')

-    def_config.project_dir = tmp_path

 
 

-    load_address_levels_from_config(temp_db_conn, def_config)
+    load_address_levels_from_config(temp_db_conn, project_env)

 
     assert temp_db_cursor.table_rows('address_levels') == 1
 
 
 
     assert temp_db_cursor.table_rows('address_levels') == 1
 
 

-def test_load_ranks_from_broken_file(def_config, temp_db_conn, tmp_path):
-    test_file = tmp_path / 'address-levels.json'
+def test_load_ranks_from_broken_file(project_env, temp_db_conn):
+    test_file = project_env.project_dir / 'address-levels.json'

     test_file.write_text('[{"tags":"place":{"sea":2}}}]')
     test_file.write_text('[{"tags":"place":{"sea":2}}}]')

-    def_config.project_dir = tmp_path

 
     with pytest.raises(json.decoder.JSONDecodeError):
 
     with pytest.raises(json.decoder.JSONDecodeError):

-        load_address_levels_from_config(temp_db_conn, def_config)
+        load_address_levels_from_config(temp_db_conn, project_env)

 
 
 def test_load_ranks_country(temp_db_conn, temp_db_cursor):
 
 
 def test_load_ranks_country(temp_db_conn, temp_db_cursor):