release 4.5.0.post7

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

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 97f4c4871f42d7d59de45a56990a38c70e24aa35..a25ff8ec5046766416be3bcb87091dff8ff90fd2 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -1,53 +1,59 @@
+# 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.

 import itertools
 import sys
 from pathlib import Path
 
 import itertools
 import sys
 from pathlib import Path
 

-import psycopg2
+import psycopg
+from psycopg import sql as pysql

 import pytest
 
 import pytest
 

-SRC_DIR = Path(__file__) / '..' / '..' / '..'
-

 # always test against the source
 # always test against the source

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

 
 

-from nominatim.config import Configuration
-from nominatim.db import connection
-from nominatim.db.sql_preprocessor import SQLPreprocessor
-from nominatim.db import properties
-import nominatim.tokenizer.factory
-import nominatim.cli
+from nominatim_db.config import Configuration
+from nominatim_db.db import connection
+from nominatim_db.db.sql_preprocessor import SQLPreprocessor
+import nominatim_db.tokenizer.factory

 
 import dummy_tokenizer
 import mocks
 from cursor import CursorForTesting
 
 
 
 import dummy_tokenizer
 import mocks
 from cursor import CursorForTesting
 
 

+@pytest.fixture
+def src_dir():
+    return SRC_DIR
+
+

 @pytest.fixture
 def temp_db(monkeypatch):
     """ Create an empty database for the test. The database name is also
         exported into NOMINATIM_DATABASE_DSN.
     """
     name = 'test_nominatim_python_unittest'
 @pytest.fixture
 def temp_db(monkeypatch):
     """ Create an empty database for the test. The database name is also
         exported into NOMINATIM_DATABASE_DSN.
     """
     name = 'test_nominatim_python_unittest'

-    conn = psycopg2.connect(database='postgres')
-
-    conn.set_isolation_level(0)
-    with conn.cursor() as cur:
-        cur.execute('DROP DATABASE IF EXISTS {}'.format(name))
-        cur.execute('CREATE DATABASE {}'.format(name))

 
 

-    conn.close()
+    with psycopg.connect(dbname='postgres', autocommit=True) as conn:
+        with conn.cursor() as cur:
+            cur.execute(pysql.SQL('DROP DATABASE IF EXISTS') + pysql.Identifier(name))
+            cur.execute(pysql.SQL('CREATE DATABASE') + pysql.Identifier(name))

 
     monkeypatch.setenv('NOMINATIM_DATABASE_DSN', 'dbname=' + name)
 
 
     monkeypatch.setenv('NOMINATIM_DATABASE_DSN', 'dbname=' + name)
 

-    yield name
-
-    conn = psycopg2.connect(database='postgres')
+    with psycopg.connect(dbname=name) as conn:
+        with conn.cursor() as cur:
+            cur.execute('CREATE EXTENSION hstore')

 
 

-    conn.set_isolation_level(0)
-    with conn.cursor() as cur:
-        cur.execute('DROP DATABASE IF EXISTS {}'.format(name))
+    yield name

 
 

-    conn.close()
+    with psycopg.connect(dbname='postgres', autocommit=True) as conn:
+        with conn.cursor() as cur:
+            cur.execute('DROP DATABASE IF EXISTS {}'.format(name))

 
 
 @pytest.fixture
 
 
 @pytest.fixture


@@ -57,11 +63,9 @@ def dsn(temp_db):
 
 @pytest.fixture
 def temp_db_with_extensions(temp_db):
 
 @pytest.fixture
 def temp_db_with_extensions(temp_db):

-    conn = psycopg2.connect(database=temp_db)
-    with conn.cursor() as cur:
-        cur.execute('CREATE EXTENSION hstore; CREATE EXTENSION postgis;')
-    conn.commit()
-    conn.close()
+    with psycopg.connect(dbname=temp_db) as conn:
+        with conn.cursor() as cur:
+            cur.execute('CREATE EXTENSION postgis')

 
     return temp_db
 
 
     return temp_db
 


@@ -69,7 +73,8 @@ def temp_db_with_extensions(temp_db):
 def temp_db_conn(temp_db):
     """ Connection to the test database.
     """
 def temp_db_conn(temp_db):
     """ Connection to the test database.
     """

-    with connection.connect('dbname=' + temp_db) as conn:
+    with connection.connect('', autocommit=True, dbname=temp_db) as conn:
+        connection.register_hstore(conn)

         yield conn
 
 
         yield conn
 
 


@@ -78,61 +83,51 @@ def temp_db_cursor(temp_db):
     """ Connection and cursor towards the test database. The connection will
         be in auto-commit mode.
     """
     """ Connection and cursor towards the test database. The connection will
         be in auto-commit mode.
     """

-    conn = psycopg2.connect('dbname=' + temp_db)
-    conn.set_isolation_level(0)
-    with conn.cursor(cursor_factory=CursorForTesting) as cur:
-        yield cur
-    conn.close()
+    with psycopg.connect(dbname=temp_db, autocommit=True, cursor_factory=CursorForTesting) as conn:
+        connection.register_hstore(conn)
+        with conn.cursor() as cur:
+            yield cur

 
 
 @pytest.fixture
 
 
 @pytest.fixture

-def table_factory(temp_db_cursor):
+def table_factory(temp_db_conn):

     """ A fixture that creates new SQL tables, potentially filled with
         content.
     """
     def mk_table(name, definition='id INT', content=None):
     """ A fixture that creates new SQL tables, potentially filled with
         content.
     """
     def mk_table(name, definition='id INT', content=None):

-        temp_db_cursor.execute('CREATE TABLE {} ({})'.format(name, definition))
-        if content is not None:
-            temp_db_cursor.execute_values("INSERT INTO {} VALUES %s".format(name), content)
+        with psycopg.ClientCursor(temp_db_conn) as cur:
+            cur.execute('CREATE TABLE {} ({})'.format(name, definition))
+            if content:
+                sql = pysql.SQL("INSERT INTO {} VALUES ({})")\
+                           .format(pysql.Identifier(name),
+                                   pysql.SQL(',').join([pysql.Placeholder() for _ in range(len(content[0]))]))
+                cur.executemany(sql , content)

 
     return mk_table
 
 
 @pytest.fixture
 def def_config():
 
     return mk_table
 
 
 @pytest.fixture
 def def_config():

-    cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
-    cfg.set_libdirs(module='.', osm2pgsql='.',
-                    php=SRC_DIR / 'lib-php',
-                    sql=SRC_DIR / 'lib-sql',
-                    data=SRC_DIR / 'data')
+    cfg = Configuration(None)
+    cfg.set_libdirs(osm2pgsql=None)

     return cfg
 
 
 @pytest.fixture
     return cfg
 
 
 @pytest.fixture

-def src_dir():
-    return SRC_DIR.resolve()
-
-
-@pytest.fixture
-def cli_call():
-    def _call_nominatim(*args):
-        return nominatim.cli.nominatim(
-                   module_dir='MODULE NOT AVAILABLE',
-                   osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
-                   phplib_dir=str(SRC_DIR / 'lib-php'),
-                   data_dir=str(SRC_DIR / 'data'),
-                   phpcgi_path='/usr/bin/php-cgi',
-                   sqllib_dir=str(SRC_DIR / 'lib-sql'),
-                   config_dir=str(SRC_DIR / 'settings'),
-                   cli_args=args)
-
-    return _call_nominatim
+def project_env(tmp_path):
+    projdir = tmp_path / 'project'
+    projdir.mkdir()
+    cfg = Configuration(projdir)
+    cfg.set_libdirs(osm2pgsql=None)
+    return cfg

 
 
 @pytest.fixture
 
 
 @pytest.fixture

-def property_table(table_factory):
+def property_table(table_factory, temp_db_conn):

     table_factory('nominatim_properties', 'property TEXT, value TEXT')
 
     table_factory('nominatim_properties', 'property TEXT, value TEXT')
 

+    return mocks.MockPropertyTable(temp_db_conn)
+

 
 @pytest.fixture
 def status_table(table_factory):
 
 @pytest.fixture
 def status_table(table_factory):


@@ -210,44 +205,32 @@ def osmline_table(temp_db_with_extensions, table_factory):
 
 
 @pytest.fixture
 
 
 @pytest.fixture

-def word_table(temp_db_conn):
-    return mocks.MockWordTable(temp_db_conn)
-
+def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
+    table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
+    cfg = Configuration(None)
+    cfg.set_libdirs(osm2pgsql=None, sql=tmp_path)
+    return cfg

 
 

-@pytest.fixture
-def osm2pgsql_options(temp_db):
-    return dict(osm2pgsql='echo',
-                osm2pgsql_cache=10,
-                osm2pgsql_style='style.file',
-                threads=1,
-                dsn='dbname=' + temp_db,
-                flatnode_file='',
-                tablespaces=dict(slim_data='', slim_index='',
-                                 main_data='', main_index=''))

 
 @pytest.fixture
 
 @pytest.fixture

-def sql_preprocessor(temp_db_conn, tmp_path, monkeypatch, table_factory):
-    table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
-    cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
-    cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php',
-                    sql=tmp_path, data=SRC_DIR / 'data')
-
-    return SQLPreprocessor(temp_db_conn, cfg)
+def sql_preprocessor(sql_preprocessor_cfg, temp_db_conn):
+    return SQLPreprocessor(temp_db_conn, sql_preprocessor_cfg)

 
 
 @pytest.fixture
 
 
 @pytest.fixture

-def tokenizer_mock(monkeypatch, property_table, temp_db_conn, tmp_path):
+def tokenizer_mock(monkeypatch, property_table):

     """ Sets up the configuration so that the test dummy tokenizer will be
         loaded when the tokenizer factory is used. Also returns a factory
         with which a new dummy tokenizer may be created.
     """
     monkeypatch.setenv('NOMINATIM_TOKENIZER', 'dummy')
 
     """ Sets up the configuration so that the test dummy tokenizer will be
         loaded when the tokenizer factory is used. Also returns a factory
         with which a new dummy tokenizer may be created.
     """
     monkeypatch.setenv('NOMINATIM_TOKENIZER', 'dummy')
 

-    def _import_dummy(module, *args, **kwargs):
+    def _import_dummy(*args, **kwargs):

         return dummy_tokenizer
 
         return dummy_tokenizer
 

-    monkeypatch.setattr(nominatim.tokenizer.factory, "_import_tokenizer", _import_dummy)
-    properties.set_property(temp_db_conn, 'tokenizer', 'dummy')
+    monkeypatch.setattr(nominatim_db.tokenizer.factory,
+                        "_import_tokenizer", _import_dummy)
+    property_table.set('tokenizer', 'dummy')

 
     def _create_tokenizer():
         return dummy_tokenizer.DummyTokenizer(None, None)
 
     def _create_tokenizer():
         return dummy_tokenizer.DummyTokenizer(None, None)