From 2b65b6201c27a9d8347737637fe86d7ad74155ab Mon Sep 17 00:00:00 2001
From: Joel Davies <joel.davies@stfc.ac.uk>
Date: Tue, 24 Sep 2024 08:31:42 +0000
Subject: [PATCH] Remove some old test fixtures #90

---
 test/unit/repositories/conftest.py    | 49 +--------------------------
 test/unit/repositories/test_system.py |  2 +-
 test/unit/services/conftest.py        | 12 +------
 3 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/test/unit/repositories/conftest.py b/test/unit/repositories/conftest.py
index 032f827f..f7484308 100644
--- a/test/unit/repositories/conftest.py
+++ b/test/unit/repositories/conftest.py
@@ -2,7 +2,7 @@
 Module for providing common test configuration, test fixtures, and helper functions.
 """
 
-from typing import List, Type
+from typing import List
 from unittest.mock import MagicMock, Mock
 
 import pytest
@@ -12,10 +12,6 @@
 from pymongo.database import Database
 from pymongo.results import DeleteResult, InsertOneResult, UpdateResult
 
-from inventory_management_system_api.repositories.item import ItemRepo
-from inventory_management_system_api.repositories.unit import UnitRepo
-from inventory_management_system_api.repositories.usage_status import UsageStatusRepo
-
 
 @pytest.fixture(name="database_mock")
 def fixture_database_mock() -> Mock:
@@ -35,39 +31,6 @@ def fixture_database_mock() -> Mock:
     return database_mock
 
 
-@pytest.fixture(name="item_repository")
-def fixture_item_repository(database_mock: Mock) -> ItemRepo:
-    """
-    Fixture to create a `ItemRepo` instance with a mocked Database dependency.
-
-    :param database_mock: Mocked MongoDB database instance.
-    :return: `ItemRepo` instance with the mocked dependency.
-    """
-    return ItemRepo(database_mock)
-
-
-@pytest.fixture(name="unit_repository")
-def fixture_unit_repository(database_mock: Mock) -> UnitRepo:
-    """
-    Fixture to create a `UnitRepo` instance with a mocked Database dependency.
-
-    :param database_mock: Mocked MongoDB database instance.
-    :return: `UnitRepo` instance with the mocked dependency.
-    """
-    return UnitRepo(database_mock)
-
-
-@pytest.fixture(name="usage_status_repository")
-def fixture_usage_status_repository(database_mock: Mock) -> UsageStatusRepo:
-    """
-    Fixture to create a `UsageStatusRepo` instance with a mocked Database dependency.
-
-    :param database_mock: Mocked MongoDB database instance.
-    :return: `UsageStatusRepo` instance with the mocked dependency.
-    """
-    return UsageStatusRepo(database_mock)
-
-
 class RepositoryTestHelpers:
     """
     A utility class containing common helper methods for the repository tests.
@@ -154,13 +117,3 @@ def mock_update_many(collection_mock: Mock) -> None:
         update_many_result_mock = Mock(UpdateResult)
         update_many_result_mock.acknowledged = True
         collection_mock.update_many.return_value = update_many_result_mock
-
-
-# pylint:disable=fixme
-# TODO: Remove this once tests refactored - should be able to just use `RepositoryTestHelpers.`
-@pytest.fixture(name="test_helpers")
-def fixture_test_helpers() -> Type[RepositoryTestHelpers]:
-    """
-    Fixture to provide a TestHelpers class.
-    """
-    return RepositoryTestHelpers
diff --git a/test/unit/repositories/test_system.py b/test/unit/repositories/test_system.py
index c1bd06cf..39765fc7 100644
--- a/test/unit/repositories/test_system.py
+++ b/test/unit/repositories/test_system.py
@@ -1,5 +1,5 @@
 """
-Unit tests for the `SystemRepo` repository
+Unit tests for the `SystemRepo` repository.
 """
 
 # Expect some duplicate code inside tests as the tests for the different entities can be very similar
diff --git a/test/unit/services/conftest.py b/test/unit/services/conftest.py
index 0c36e659..9dc240d4 100644
--- a/test/unit/services/conftest.py
+++ b/test/unit/services/conftest.py
@@ -3,7 +3,7 @@
 """
 
 from datetime import datetime, timezone
-from typing import List, Type, Union
+from typing import List, Union
 from unittest.mock import Mock, patch
 
 import pytest
@@ -406,16 +406,6 @@ def construct_properties_in_and_post_with_ids(
         return expected_properties_in, property_post_schemas
 
 
-# pylint:disable=fixme
-# TODO: Remove this once tests refactored - should be able to just use `ServiceTestHelpers.`
-@pytest.fixture(name="test_helpers")
-def fixture_test_helpers() -> Type[ServiceTestHelpers]:
-    """
-    Fixture to provide a TestHelpers class.
-    """
-    return ServiceTestHelpers
-
-
 MODEL_MIXINS_FIXED_DATETIME_NOW = datetime(2024, 2, 16, 14, 0, 0, 0, tzinfo=timezone.utc)