Revize f8581e41

Fixed failing tests after performing a merge.

tests/integration_tests/dao/conftest.py

@@ -2 +2 @@
 import sqlite3
 from sqlite3 import Connection, Cursor
 
+from src.config.configuration import test_configuration
+from src.config.connection_provider import ConnectionProvider
 from src.dao.certificate_repository import CertificateRepository
 from src.dao.private_key_repository import PrivateKeyRepository
 from src.db.init_queries import SCHEMA_SQL, DEFAULT_VALUES_SQL
@@ -10 +12 @@
 # scope="module" means that this fixture is run once per module
 @pytest.fixture(scope="module")
 def connection():
-    print("Creating a new SQLITE connection to the test DB")
-    connection: Connection = sqlite3.connect(':memory:')
-
-    # yield the created connection
-    yield connection
+    return ConnectionProvider().connect(test_configuration())
 
 
 @pytest.fixture(scope="module")
 def cursor(connection):
-    cursor = connection.cursor()
-
-    # execute db initialisation script
-    cursor.executescript(SCHEMA_SQL)
+    return connection.cursor()
 
-    # insert default values
-    cursor.executescript(DEFAULT_VALUES_SQL)
-
-    return cursor
 
 @pytest.fixture
 def connection_unique():
-    print("Creating a new SQLITE connection to the test DB")
-    connection: Connection = sqlite3.connect(':memory:')
-
-    # yield the created connection
-    yield connection
+    return ConnectionProvider().connect(test_configuration())
 
 
 @pytest.fixture
 def cursor_unique(connection):
-    cursor = connection.cursor()
+    return connection.cursor()
 
-    # execute db initialisation script
-    cursor.executescript(SCHEMA_SQL)
-
-    # insert default values
-    cursor.executescript(DEFAULT_VALUES_SQL)
-
-    return cursor
 
 @pytest.fixture
-def certificate_repository(connection, cursor):
-    return CertificateRepository(connection, cursor)
+def certificate_repository(connection):
+    return CertificateRepository(connection)
+
 
 @pytest.fixture
-def private_key_repository(connection_unique, cursor_unique):
-    return PrivateKeyRepository(connection_unique, cursor_unique)
+def private_key_repository_unique(connection_unique, cursor_unique):
+    return PrivateKeyRepository(connection_unique)