Move db_session and test_client fixtures into conftest.py

Author: ssciolla

tests/conftest.py

@@ -1,15 +1,52 @@
 import uuid
 from datetime import datetime, UTC
+from typing import Generator
 
 import pytest
+import sqlalchemy
+from fastapi.testclient import TestClient
 
+from dor.adapters.catalog import _custom_json_serializer, Base
+from dor.config import config
 from dor.domain.models import Bin
+from dor.entrypoints.api.dependencies import get_db_session
+from dor.entrypoints.api.main import app
 from dor.providers.models import (
     Agent, AlternateIdentifier, FileMetadata, FileReference, PackageResource,
     PreservationEvent, StructMap, StructMapItem, StructMapType
 )
 
 
+@pytest.fixture
+def db_session() -> Generator[sqlalchemy.orm.Session, None, None]:
+    engine_url = config.get_test_database_engine_url()
+    engine = sqlalchemy.create_engine(
+        engine_url, echo=True, json_serializer=_custom_json_serializer
+    )
+
+    Base.metadata.drop_all(engine)
+    Base.metadata.create_all(engine)
+
+    connection = engine.connect()
+    session = sqlalchemy.orm.Session(bind=connection)
+
+    yield session
+
+    session.close()
+    connection.close()
+
+
+@pytest.fixture
+def test_client(db_session) -> Generator[TestClient, None, None]:
+    def get_db_session_override():
+        return db_session
+
+    app.dependency_overrides[get_db_session] = get_db_session_override
+    test_client = TestClient(app)
+    yield test_client
+    app.dependency_overrides.clear()
+
+
 @pytest.fixture
 def sample_bin() -> Bin:
     return Bin(

tests/e2e/test_catalog_api.py

@@ -1,48 +1,11 @@
-from typing import Generator
-
 import pytest
-import sqlalchemy
 from pydantic_core import to_jsonable_python
-from fastapi.testclient import TestClient
 
-from dor.adapters.catalog import Base, SqlalchemyCatalog, _custom_json_serializer
-from dor.config import config
+from dor.adapters.catalog import SqlalchemyCatalog
 from dor.domain.models import Bin
-from dor.entrypoints.api.dependencies import get_db_session
-from dor.entrypoints.api.main import app
-
-
-@pytest.fixture
-def db_session() -> Generator[sqlalchemy.orm.Session, None, None]:
-    engine_url = config.get_test_database_engine_url()
-    engine = sqlalchemy.create_engine(
-        engine_url, echo=True, json_serializer=_custom_json_serializer
-    )
-
-    Base.metadata.drop_all(engine)
-    Base.metadata.create_all(engine)
-
-    connection = engine.connect()
-    session = sqlalchemy.orm.Session(bind=connection)
-
-    yield session
-
-    session.close()
-    connection.close()
-
-
-@pytest.fixture
-def test_client(db_session) -> Generator[TestClient, None, None]:
-    def get_db_session_override():
-        return db_session
-
-    app.dependency_overrides[get_db_session] = get_db_session_override
-    test_client = TestClient(app)
-    yield test_client
-    app.dependency_overrides.clear()
 
 
-@pytest.mark.usefixtures("sample_bin")
+@pytest.mark.usefixtures("sample_bin", "db_session", "test_client")
 def test_catalog_api_returns_200_and_summary(
     sample_bin: Bin, db_session, test_client
 ) -> None:
@@ -62,7 +25,7 @@ def test_catalog_api_returns_200_and_summary(
     assert response.json() == expected_summary
 
 
-@pytest.mark.usefixtures("sample_bin")
+@pytest.mark.usefixtures("sample_bin", "db_session", "test_client")
 def test_catalog_api_returns_200_and_file_sets(
     sample_bin: Bin, db_session, test_client
 ) -> None:

tests/test_catalog.py

@@ -1,32 +1,10 @@
-from typing import Generator
-
 import pytest
 import sqlalchemy
 
-from dor.adapters.catalog import Base, SqlalchemyCatalog, _custom_json_serializer
-from dor.config import config
-
-
-@pytest.fixture
-def db_session() -> Generator[sqlalchemy.orm.Session, None, None]:
-    engine_url = config.get_test_database_engine_url()
-    engine = sqlalchemy.create_engine(
-        engine_url, echo=True, json_serializer=_custom_json_serializer
-    )
-
-    Base.metadata.drop_all(engine)
-    Base.metadata.create_all(engine)
-
-    connection = engine.connect()
-    session = sqlalchemy.orm.Session(bind=connection)
-
-    yield session
-
-    session.close()
-    connection.close()
+from dor.adapters.catalog import SqlalchemyCatalog
 
 
-@pytest.mark.usefixtures("sample_bin")
+@pytest.mark.usefixtures("db_session", "sample_bin")
 def test_catalog_adds_bin(db_session, sample_bin) -> None:
     catalog = SqlalchemyCatalog(db_session)
     with db_session.begin():
@@ -44,7 +22,7 @@ def test_catalog_adds_bin(db_session, sample_bin) -> None:
     assert str(rows[0].identifier) == "00000000-0000-0000-0000-000000000001"
 
 
-@pytest.mark.usefixtures("sample_bin")
+@pytest.mark.usefixtures("db_session", "sample_bin")
 def test_catalog_gets_bin(db_session, sample_bin) -> None:
     catalog = SqlalchemyCatalog(db_session)
     with db_session.begin():
@@ -55,7 +33,7 @@ def test_catalog_gets_bin(db_session, sample_bin) -> None:
     assert bin == sample_bin
 
 
-@pytest.mark.usefixtures("sample_bin")
+@pytest.mark.usefixtures("db_session", "sample_bin")
 def test_catalog_gets_by_alternate_identifier(db_session, sample_bin) -> None:
     catalog = SqlalchemyCatalog(db_session)
     with db_session.begin():
@@ -66,7 +44,7 @@ def test_catalog_gets_by_alternate_identifier(db_session, sample_bin) -> None:
     assert bin == sample_bin
 
 
-@pytest.mark.usefixtures("sample_bin")
+@pytest.mark.usefixtures("db_session", "sample_bin")
 def test_catalog_returns_none_when_no_alternate_identifier_matches(db_session, sample_bin) -> None:
     catalog = SqlalchemyCatalog(db_session)
     with db_session.begin():