Fix tests.

Author: andrew-chang-dewitt

test/helpers.py

@@ -10,7 +10,7 @@
 from unittest.mock import MagicMock
 
 from db_wrapper.connection import ConnectionParameters
-from db_wrapper.client import Client
+from db_wrapper.client import AsyncClient
 
 
 def composed_to_string(seq: Iterable[Any]) -> str:
@@ -25,6 +25,7 @@ def composed_to_string(seq: Iterable[Any]) -> str:
 
 class AsyncMock(MagicMock):
     """Extend unittest.mock.MagicMock to allow mocking of async functions."""
+
     # pylint: disable=invalid-overridden-method
     # pylint: disable=useless-super-delegation
 
@@ -42,7 +43,7 @@ def wrapped(instance: Any) -> None:
     return wrapped
 
 
-def get_client() -> Client:
+def get_client() -> AsyncClient:
     """Create a client with placeholder connection data."""
-    conn_params = ConnectionParameters('a', 'a', 'a', 'a', 'a')
-    return Client(conn_params)
+    conn_params = ConnectionParameters('a', 1, 'a', 'a', 'a')
+    return AsyncClient(conn_params)

test/test_model.py

@@ -20,21 +20,24 @@
 
 import helpers
 
-from db_wrapper.client import Client
+from db_wrapper.client import AsyncClient
 from db_wrapper.model import (
-    Model,
     ModelData,
-    Read,
+    AsyncModel,
+    AsyncRead
+)
+from db_wrapper.model.base import (
     UnexpectedMultipleResults,
-    NoResultFound)
+    NoResultFound,
+)
 
 
 # Generic doesn't need a more descriptive name
 # pylint: disable=invalid-name
 T = TypeVar('T', bound=ModelData)
 
 
-def setup(query_result: List[T]) -> Tuple[Model[T], Client]:
+def setup(query_result: List[T]) -> Tuple[AsyncModel[T], AsyncClient]:
     """Setup helper that returns instances of both a Model & a Client.
 
     Mocks the execute_and_return method on the Client instance to skip
@@ -53,7 +56,7 @@ def setup(query_result: List[T]) -> Tuple[Model[T], Client]:
         return_value=query_result)
 
     # init model with mocked client
-    model = Model[Any](client, 'test')
+    model = AsyncModel[Any](client, 'test')
 
     return model, client
 
@@ -92,7 +95,7 @@ async def test_it_raises_exception_if_more_than_one_result(self) -> None:
 
     @ helpers.async_test
     async def test_it_raises_exception_if_no_result_to_return(self) -> None:
-        model: Model[ModelData]
+        model: AsyncModel[ModelData]
         model, _ = setup([])
 
         with self.assertRaises(NoResultFound):
@@ -231,16 +234,16 @@ async def test_it_returns_the_deleted_record(self) -> None:
 
 class TestExtendingModel(TestCase):
     """Testing Model's extensibility."""
-    model: Model[ModelData]
+    model: AsyncModel[ModelData]
 
     def setUp(self) -> None:
-        class ReadExtended(Read[ModelData]):
+        class ReadExtended(AsyncRead[ModelData]):
             """Extending Read with additional query."""
 
             def new_query(self) -> None:
                 pass
 
-        model = Model[ModelData](helpers.get_client(), 'test')
+        model = AsyncModel[ModelData](helpers.get_client(), 'test')
         model.read = ReadExtended(model.client, model.table)
 
         self.model = model