test: move Testingcursor into separate class

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

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 923e6876a9beaced058600e303c8fa5e874ecafb..b7da65a7e072fb3ecb4f3b0e9dc9a0dafaedd28f 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -1,12 +1,11 @@
-import importlib

 import itertools
 import sys
 import itertools
 import sys

+import tempfile

 from pathlib import Path
 
 import psycopg2
 import psycopg2.extras
 import pytest
 from pathlib import Path
 
 import psycopg2
 import psycopg2.extras
 import pytest

-import tempfile

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


@@ -17,41 +16,11 @@ from nominatim.config import Configuration
 from nominatim.db import connection
 from nominatim.db.sql_preprocessor import SQLPreprocessor
 from nominatim.db import properties
 from nominatim.db import connection
 from nominatim.db.sql_preprocessor import SQLPreprocessor
 from nominatim.db import properties

+import nominatim.tokenizer.factory

 
 import dummy_tokenizer
 import mocks
 
 import dummy_tokenizer
 import mocks

-
-class _TestingCursor(psycopg2.extras.DictCursor):
-    """ Extension to the DictCursor class that provides execution
-        short-cuts that simplify writing assertions.
-    """
-
-    def scalar(self, sql, params=None):
-        """ Execute a query with a single return value and return this value.
-            Raises an assertion when not exactly one row is returned.
-        """
-        self.execute(sql, params)
-        assert self.rowcount == 1
-        return self.fetchone()[0]
-
-    def row_set(self, sql, params=None):
-        """ Execute a query and return the result as a set of tuples.
-        """
-        self.execute(sql, params)
-
-        return set((tuple(row) for row in self))
-
-    def table_exists(self, table):
-        """ Check that a table with the given name exists in the database.
-        """
-        num = self.scalar("""SELECT count(*) FROM pg_tables
-                             WHERE tablename = %s""", (table, ))
-        return num == 1
-
-    def table_rows(self, table):
-        """ Return the number of rows in the given table.
-        """
-        return self.scalar('SELECT count(*) FROM ' + table)
+from cursor import TestingCursor

 
 
 @pytest.fixture
 
 
 @pytest.fixture


@@ -69,7 +38,7 @@ def temp_db(monkeypatch):
 
     conn.close()
 
 
     conn.close()
 

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

 
     yield name
 
 
     yield name
 


@@ -112,7 +81,7 @@ def temp_db_cursor(temp_db):
     """
     conn = psycopg2.connect('dbname=' + temp_db)
     conn.set_isolation_level(0)
     """
     conn = psycopg2.connect('dbname=' + temp_db)
     conn.set_isolation_level(0)

-    with conn.cursor(cursor_factory=_TestingCursor) as cur:
+    with conn.cursor(cursor_factory=TestingCursor) as cur:

         yield cur
     conn.close()
 
         yield cur
     conn.close()
 


@@ -273,7 +242,7 @@ def tokenizer_mock(monkeypatch, property_table, temp_db_conn, tmp_path):
     def _import_dummy(module, *args, **kwargs):
         return dummy_tokenizer
 
     def _import_dummy(module, *args, **kwargs):
         return dummy_tokenizer
 

-    monkeypatch.setattr(importlib, "import_module", _import_dummy)
+    monkeypatch.setattr(nominatim.tokenizer.factory, "_import_tokenizer", _import_dummy)

     properties.set_property(temp_db_conn, 'tokenizer', 'dummy')
 
     def _create_tokenizer():
     properties.set_property(temp_db_conn, 'tokenizer', 'dummy')
 
     def _create_tokenizer():