Merge UOW lifcycle tests

Author: febus982

tests/conftest.py

@@ -1,5 +1,6 @@
 import inspect
 import os
+from contextlib import _AsyncGeneratorContextManager, asynccontextmanager
 from typing import Tuple, Type
 from uuid import uuid4
 
@@ -47,6 +48,26 @@ async def f(call):
     return f
 
 
+@pytest.fixture()
+def sync_async_cm_wrapper():
+    """
+    Tiny wrapper to allow calling sync and async methods using await.
+
+    :return:
+    """
+
+    @asynccontextmanager
+    async def f(cm):
+        if isinstance(cm, _AsyncGeneratorContextManager):
+            async with cm as c:
+                yield c
+        else:
+            with cm as c:
+                yield c
+
+    return f
+
+
 @pytest.fixture
 def sa_manager() -> SQLAlchemyBindManager:
     test_sync_db_path = f"./{uuid4()}.db"

tests/session_handler/test_session_lifecycle.py

@@ -1,4 +1,3 @@
-from contextlib import _AsyncGeneratorContextManager, asynccontextmanager
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -8,16 +7,6 @@
 from sqlalchemy_bind_manager._bind_manager import SQLAlchemyAsyncBind
 
 
-@asynccontextmanager
-async def cm_wrapper(cm):
-    if isinstance(cm, _AsyncGeneratorContextManager):
-        async with cm as c:
-            yield c
-    else:
-        with cm as c:
-            yield c
-
-
 async def test_session_is_removed_on_cleanup(session_handler_class, sa_bind):
     uow = session_handler_class(sa_bind)
     original_session_remove = uow._session_class.remove
@@ -64,6 +53,7 @@ async def test_commit_is_called_only_if_not_read_only(
     session_handler_class,
     model_class,
     sa_bind,
+    sync_async_cm_wrapper,
 ):
     uow = session_handler_class(sa_bind)
 
@@ -75,7 +65,9 @@ async def test_commit_is_called_only_if_not_read_only(
     with patch.object(
         session_handler_class, "commit", return_value=None
     ) as mocked_uow_commit:
-        async with cm_wrapper(uow.get_session(read_only=read_only_flag)) as _session:
+        async with sync_async_cm_wrapper(
+            uow.get_session(read_only=read_only_flag)
+        ) as _session:
             _session.add(model1)
 
     assert mocked_uow_commit.call_count == int(not read_only_flag)

tests/unit_of_work/conftest.py

@@ -0,0 +1,28 @@
+from typing import Type, Union
+
+import pytest
+
+from sqlalchemy_bind_manager._bind_manager import SQLAlchemyAsyncBind, SQLAlchemyBind
+from sqlalchemy_bind_manager._repository import (
+    SQLAlchemyAsyncRepository,
+    SQLAlchemyRepository,
+)
+from sqlalchemy_bind_manager.repository import AsyncUnitOfWork, UnitOfWork
+
+
+@pytest.fixture
+def uow_class(sa_bind):
+    return AsyncUnitOfWork if isinstance(sa_bind, SQLAlchemyAsyncBind) else UnitOfWork
+
+
+@pytest.fixture
+def repository_class(
+    sa_bind: Union[SQLAlchemyBind, SQLAlchemyAsyncBind]
+) -> Type[Union[SQLAlchemyAsyncRepository, SQLAlchemyRepository]]:
+    base_class = (
+        SQLAlchemyRepository
+        if isinstance(sa_bind, SQLAlchemyBind)
+        else SQLAlchemyAsyncRepository
+    )
+
+    return base_class

tests/unit_of_work/sync/test_lifecycle.py

@@ -1,11 +1,15 @@
-from sqlalchemy_bind_manager._unit_of_work import AsyncUnitOfWork
-
-
 async def test_repositories_are_initialised_with_uow_session(
-    sa_manager, repository_classes
+    sa_bind, repository_class, model_classes, uow_class
 ):
-    uow = AsyncUnitOfWork(
-        bind=sa_manager.get_bind(),
+    class RepoClass(repository_class):
+        _model = model_classes[0]
+
+    class ChildRepoClass(repository_class):
+        _model = model_classes[1]
+
+    repository_classes = [RepoClass, ChildRepoClass]
+    uow = uow_class(
+        bind=sa_bind,
         repositories=repository_classes,
     )
     for repo_class in repository_classes: