adapt bdd tests to new layout

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index 460f3569d3f1a75a91b0e61ba986693f211cbc69..8589689852852b9c2450bef8ab4a645b7b6ffdb5 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -1,8 +1,8 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2024 by the Nominatim developer community.

 # For a full list of authors see the git log.
 from pathlib import Path
 
 # For a full list of authors see the git log.
 from pathlib import Path
 

diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index 1fc6f887ee0c11d66a6b2b9fa06ee29ada36608b..46559720d3da5d262c5b63a642fccce8a678664f 100644 (file)
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -1,8 +1,8 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2024 by the Nominatim developer community.

 # For a full list of authors see the git log.
 from pathlib import Path
 import importlib
 # For a full list of authors see the git log.
 from pathlib import Path
 import importlib


@@ -12,13 +12,13 @@ import tempfile
 import psycopg2
 import psycopg2.extras
 
 import psycopg2
 import psycopg2.extras
 

-sys.path.insert(1, str((Path(__file__) / '..' / '..' / '..' / '..').resolve()))
+sys.path.insert(1, str((Path(__file__) / '..' / '..' / '..' / '..'/ 'src').resolve()))

 
 

-from nominatim import cli
-from nominatim.config import Configuration
-from nominatim.db.connection import Connection
-from nominatim.tools import refresh
-from nominatim.tokenizer import factory as tokenizer_factory
+from nominatim_db import cli
+from nominatim_core.config import Configuration
+from nominatim_core.db.connection import Connection
+from nominatim_db.tools import refresh
+from nominatim_db.tokenizer import factory as tokenizer_factory

 from steps.utils import run_script
 
 class NominatimEnvironment:
 from steps.utils import run_script
 
 class NominatimEnvironment:


@@ -338,12 +338,12 @@ class NominatimEnvironment:
 
 
     def create_api_request_func_starlette(self):
 
 
     def create_api_request_func_starlette(self):

-        import nominatim.server.starlette.server
+        import nominatim_api.server.starlette.server

         from asgi_lifespan import LifespanManager
         import httpx
 
         async def _request(endpoint, params, project_dir, environ, http_headers):
         from asgi_lifespan import LifespanManager
         import httpx
 
         async def _request(endpoint, params, project_dir, environ, http_headers):

-            app = nominatim.server.starlette.server.get_application(project_dir, environ)
+            app = nominatim_api.server.starlette.server.get_application(project_dir, environ)

 
             async with LifespanManager(app):
                 async with httpx.AsyncClient(app=app, base_url="http://nominatim.test") as client:
 
             async with LifespanManager(app):
                 async with httpx.AsyncClient(app=app, base_url="http://nominatim.test") as client:


@@ -356,11 +356,11 @@ class NominatimEnvironment:
 
 
     def create_api_request_func_falcon(self):
 
 
     def create_api_request_func_falcon(self):

-        import nominatim.server.falcon.server
+        import nominatim_api.server.falcon.server

         import falcon.testing
 
         async def _request(endpoint, params, project_dir, environ, http_headers):
         import falcon.testing
 
         async def _request(endpoint, params, project_dir, environ, http_headers):

-            app = nominatim.server.falcon.server.get_application(project_dir, environ)
+            app = nominatim_api.server.falcon.server.get_application(project_dir, environ)

 
             async with falcon.testing.ASGIConductor(app) as conductor:
                 response = await conductor.get(f"/{endpoint}", params=params,
 
             async with falcon.testing.ASGIConductor(app) as conductor:
                 response = await conductor.get(f"/{endpoint}", params=params,

diff --git a/test/bdd/steps/steps_db_ops.py b/test/bdd/steps/steps_db_ops.py
index c30ee894280d4eb912a325d6669b0148e2c35d7c..441198fdd4dfe46391d8fdcffad199d39f74efb5 100644 (file)
--- a/test/bdd/steps/steps_db_ops.py
+++ b/test/bdd/steps/steps_db_ops.py
@@ -1,8 +1,8 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2024 by the Nominatim developer community.

 # For a full list of authors see the git log.
 import logging
 from itertools import chain
 # For a full list of authors see the git log.
 import logging
 from itertools import chain


@@ -12,8 +12,8 @@ import psycopg2.extras
 from place_inserter import PlaceColumn
 from table_compare import NominatimID, DBRow
 
 from place_inserter import PlaceColumn
 from table_compare import NominatimID, DBRow
 

-from nominatim.indexer import indexer
-from nominatim.tokenizer import factory as tokenizer_factory
+from nominatim_db.indexer import indexer
+from nominatim_db.tokenizer import factory as tokenizer_factory

 
 def check_database_integrity(context):
     """ Check some generic constraints on the tables.
 
 def check_database_integrity(context):
     """ Check some generic constraints on the tables.

diff --git a/test/bdd/steps/steps_osm_data.py b/test/bdd/steps/steps_osm_data.py
index 2d17c1a0e1f2eacd68ad24a41037f23611859665..0c1b421d950b0a45960fb9bb29c2f0a6717c541b 100644 (file)
--- a/test/bdd/steps/steps_osm_data.py
+++ b/test/bdd/steps/steps_osm_data.py
@@ -1,16 +1,16 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2024 by the Nominatim developer community.

 # For a full list of authors see the git log.
 import tempfile
 import random
 import os
 from pathlib import Path
 
 # For a full list of authors see the git log.
 import tempfile
 import random
 import os
 from pathlib import Path
 

-from nominatim.tools.exec_utils import run_osm2pgsql
-from nominatim.tools.replication import run_osm2pgsql_updates
+from nominatim_db.tools.exec_utils import run_osm2pgsql
+from nominatim_db.tools.replication import run_osm2pgsql_updates

 
 from geometry_alias import ALIASES
 
 
 from geometry_alias import ALIASES