ISSUE #346

* Improve tests.

Author: Sergio García Prado

packages/core/minos-microservice-common/minos/common/testing.py

@@ -64,8 +64,7 @@ def __getattr__(self, item):
 
 
 class PostgresAsyncTestCase(MinosTestCase):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def setUp(self):
 
         self._uuid = uuid4()
         self._config = Config(self.CONFIG_FILE_PATH)
@@ -82,6 +81,8 @@ def __init__(self, *args, **kwargs):
         self.broker_queue_db = self._meta_broker_queue_db | self._test_db
         self.snapshot_db = self._meta_snapshot_db | self._test_db
 
+        super().setUp()
+
     def get_config(self):
         return Config(
             self.CONFIG_FILE_PATH,

packages/core/minos-microservice-saga/tests/utils.py

@@ -24,6 +24,7 @@
     PoolFactory,
     SetupMixin,
 )
+from minos.common.testing import MinosTestCase as MinosTestCaseBase
 from minos.networks import (
     BrokerClientPool,
     InMemoryBrokerPublisher,
@@ -41,53 +42,32 @@
 DB_PATH = BASE_PATH / "test_db.lmdb"
 
 
-class MinosTestCase(unittest.IsolatedAsyncioTestCase):
-    def setUp(self) -> None:
-        super().setUp()
+class MinosTestCase(MinosTestCaseBase):
+    CONFIG_FILE_PATH = CONFIG_FILE_PATH
 
-        self.config = Config(CONFIG_FILE_PATH)
-
-        self.pool_factory = PoolFactory.from_config(
-            CONFIG_FILE_PATH, default_classes={"broker": BrokerClientPool, "lock": FakeLockPool}
-        )
-        self.broker_publisher = InMemoryBrokerPublisher()
-        self.broker_subscriber_builder = InMemoryBrokerSubscriberBuilder()
-        self.transaction_repository = InMemoryTransactionRepository(lock_pool=self.pool_factory.get_pool("lock"))
-        self.event_repository = InMemoryEventRepository(
-            broker_publisher=self.broker_publisher,
-            transaction_repository=self.transaction_repository,
-            lock_pool=self.pool_factory.get_pool("lock"),
+    def get_injections(self):
+        pool_factory = PoolFactory.from_config(
+            self.config, default_classes={"broker": BrokerClientPool, "lock": FakeLockPool}
         )
-        self.snapshot_repository = InMemorySnapshotRepository(
-            event_repository=self.event_repository, transaction_repository=self.transaction_repository
+        broker_publisher = InMemoryBrokerPublisher()
+        broker_subscriber_builder = InMemoryBrokerSubscriberBuilder()
+        transaction_repository = InMemoryTransactionRepository(lock_pool=pool_factory.get_pool("lock"))
+        event_repository = InMemoryEventRepository(
+            broker_publisher=broker_publisher,
+            transaction_repository=transaction_repository,
+            lock_pool=pool_factory.get_pool("lock"),
         )
-
-        self.injector = DependencyInjector(
-            self.config,
-            [
-                self.pool_factory,
-                self.broker_publisher,
-                self.broker_subscriber_builder,
-                self.transaction_repository,
-                self.event_repository,
-                self.snapshot_repository,
-            ],
+        snapshot_repository = InMemorySnapshotRepository(
+            event_repository=event_repository, transaction_repository=transaction_repository
         )
-        self.injector.wire_injections()
-
-    async def asyncSetUp(self):
-        await super().asyncSetUp()
-
-        await self.injector.setup_injections()
-
-    async def asyncTearDown(self):
-        await self.injector.destroy_injections()
-
-        await super().asyncTearDown()
-
-    def tearDown(self) -> None:
-        self.injector.unwire_injections()
-        super().tearDown()
+        return [
+            pool_factory,
+            broker_publisher,
+            broker_subscriber_builder,
+            transaction_repository,
+            event_repository,
+            snapshot_repository,
+        ]
 
 
 class FakeBrokerPublisher(SetupMixin):

packages/plugins/minos-broker-kafka/tests/test_kafka/test_publisher.py

@@ -13,7 +13,9 @@
 
 from minos.common import (
     Config,
-    DatabaseClientPool,
+)
+from minos.common.testing import (
+    PostgresAsyncTestCase,
 )
 from minos.networks import (
     BrokerMessage,
@@ -152,23 +154,13 @@ def test_build(self):
         self.assertEqual(common_config["port"], publisher.port)
 
 
-class TestPostgreSqlQueuedKafkaBrokerPublisher(unittest.IsolatedAsyncioTestCase):
-    def setUp(self) -> None:
-        super().setUp()
-        self.database_pool = DatabaseClientPool.from_config(CONFIG_FILE_PATH)
-
-    async def asyncSetUp(self) -> None:
-        await super().asyncSetUp()
-        await self.database_pool.setup()
-
-    async def asyncTearDown(self) -> None:
-        await self.database_pool.destroy()
-        await super().asyncTearDown()
+class TestPostgreSqlQueuedKafkaBrokerPublisher(PostgresAsyncTestCase):
+    CONFIG_FILE_PATH = CONFIG_FILE_PATH
 
     def test_from_config(self):
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
-            publisher = PostgreSqlQueuedKafkaBrokerPublisher.from_config(CONFIG_FILE_PATH, pool=self.database_pool)
+            publisher = PostgreSqlQueuedKafkaBrokerPublisher.from_config(CONFIG_FILE_PATH)
         self.assertIsInstance(publisher, PostgreSqlQueuedKafkaBrokerPublisher)
         self.assertIsInstance(publisher.impl, KafkaBrokerPublisher)
         self.assertIsInstance(publisher.queue, PostgreSqlBrokerPublisherQueue)

packages/plugins/minos-broker-kafka/tests/test_kafka/test_subscriber.py

@@ -21,7 +21,9 @@
 
 from minos.common import (
     Config,
-    DatabaseClientPool,
+)
+from minos.common.testing import (
+    PostgresAsyncTestCase,
 )
 from minos.networks import (
     BrokerMessageV1,
@@ -251,28 +253,14 @@ def test_build(self):
         self.assertEqual(common_config["port"], subscriber.port)
 
 
-class TestPostgreSqlQueuedKafkaBrokerSubscriberBuilder(unittest.IsolatedAsyncioTestCase):
-    def setUp(self) -> None:
-        super().setUp()
-        self.config = Config(CONFIG_FILE_PATH)
-        self.database_pool = DatabaseClientPool.from_config(CONFIG_FILE_PATH)
-
-    async def asyncSetUp(self) -> None:
-        await super().asyncSetUp()
-        await self.database_pool.setup()
-
-    async def asyncTearDown(self) -> None:
-        await self.database_pool.destroy()
-        await super().asyncTearDown()
+class TestPostgreSqlQueuedKafkaBrokerSubscriberBuilder(PostgresAsyncTestCase):
+    CONFIG_FILE_PATH = CONFIG_FILE_PATH
 
     def test_build(self):
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
             builder = (
-                PostgreSqlQueuedKafkaBrokerSubscriberBuilder()
-                .with_config(self.config)
-                .with_topics({"one", "two"})
-                .with_kwargs({"pool": self.database_pool})
+                PostgreSqlQueuedKafkaBrokerSubscriberBuilder().with_config(self.config).with_topics({"one", "two"})
             )
 
         subscriber = builder.build()