Cleanup test fixture syntax and imports

Author: andchiind

tests/conftest.py

@@ -147,12 +147,6 @@ def state_machine(container: ApplicationContainer) -> StateMachine:
     return container.state_machine()
 
 
-@pytest.fixture()
-def robot() -> StubRobot:
-    """Fixture to provide a mock robot instance."""
-    return StubRobot()
-
-
 @pytest.fixture()
 def uploader(container: ApplicationContainer) -> Uploader:
     """Fixture to provide a mock robot instance."""
@@ -170,7 +164,7 @@ def scheduling_utilities(
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def state_machine_thread(
     container: ApplicationContainer,
     mocker: MockerFixture,
@@ -183,7 +177,7 @@ def state_machine_thread(
     state_machine_thread.join()
 
 
-@pytest.fixture
+@pytest.fixture()
 def state_machine_thread_with_db(
     setup_db_connection_string: str,
     container: ApplicationContainer,
@@ -202,7 +196,7 @@ def state_machine_thread_with_db(
     state_machine_thread.join()
 
 
-@pytest.fixture
+@pytest.fixture()
 def robot_service_thread(
     container: ApplicationContainer,
 ) -> Generator[RobotServiceThreadMock]:
@@ -219,7 +213,7 @@ def robot_service_thread(
     robot_service_thread.join()
 
 
-@pytest.fixture
+@pytest.fixture()
 def robot_inspection_service_thread(
     container: ApplicationContainer,
 ) -> Generator[Thread]:
@@ -237,7 +231,7 @@ def robot_inspection_service_thread(
     robot_inspection_service_thread.join()
 
 
-@pytest.fixture
+@pytest.fixture()
 def mocked_robot_service(
     container: ApplicationContainer, mocker: MockerFixture
 ) -> RobotService:

tests/isar/services/utilities/test_scheduling_utilities.py

@@ -8,7 +8,6 @@
 from isar.apis.models.models import ControlMissionResponse
 from isar.config.settings import settings
 from isar.models.events import APIEvent, Event, EventTimeoutError
-from isar.modules import ApplicationContainer
 from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.state_machine.states.await_next_mission import AwaitNextMission
 from isar.state_machine.states.going_to_lockdown import GoingToLockdown
@@ -254,9 +253,8 @@ def test_return_home_twice_causes_conflict(
 
 
 def test_api_with_unsuccessful_return_home_stop(
-    mocker: MockerFixture, container: ApplicationContainer
+    mocker: MockerFixture, scheduling_utilities: SchedulingUtilities
 ) -> None:
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     stopped_mission_response: ControlMissionResponse = ControlMissionResponse(
         success=False, failure_reason="ISAR failed to stop mission"
     )

tests/isar/state_machine/states/test_await_next_mission_state.py

@@ -4,7 +4,6 @@
 
 from isar.config.settings import settings
 from isar.models.events import Events
-from isar.modules import ApplicationContainer
 from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.state_machine.state import EventHandlerMapping
 from isar.state_machine.states.resuming import Resuming
@@ -24,7 +23,7 @@
 
 
 def test_state_machine_with_successful_mission_stop(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     robot_service_thread: RobotServiceThreadMock,
     state_machine_thread: StateMachineThreadMock,
     mocker: MockerFixture,
@@ -45,8 +44,6 @@ def test_state_machine_with_successful_mission_stop(
         tasks=[StubTask.take_image() for _ in range(20)],
     )
 
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
-
     state_machine_thread.start()
     robot_service_thread.start()
     wait_until(

tests/isar/state_machine/states/test_monitor_state.py

@@ -8,7 +8,6 @@
 
 from isar.config.settings import settings
 from isar.models.events import EmptyMessage, Events
-from isar.modules import ApplicationContainer
 from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.state_machine.state import EventHandlerMapping
 from isar.state_machine.states.monitor import Monitor
@@ -121,7 +120,7 @@ def test_transition_from_resuming_to_monitor(events: Events) -> None:
 
 
 def test_state_machine_with_unsuccessful_mission_stop(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     mocker: MockerFixture,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
@@ -131,7 +130,6 @@ def test_state_machine_with_unsuccessful_mission_stop(
         id="id", name="Dummy misson", tasks=[StubTask.take_image()]
     )
 
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     mocker.patch.object(
         StubRobot, "mission_status", return_value=MissionStatus.InProgress
     )
@@ -168,7 +166,7 @@ def test_state_machine_with_unsuccessful_mission_stop(
 
 
 def test_state_machine_with_unsuccessful_mission_stop_with_mission_id(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     mocker: MockerFixture,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
@@ -180,7 +178,6 @@ def test_state_machine_with_unsuccessful_mission_stop_with_mission_id(
         id="id", name="Dummy misson", tasks=[StubTask.take_image()]
     )
 
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     mocker.patch.object(
         StubRobot, "mission_status", return_value=MissionStatus.InProgress
     )
@@ -217,7 +214,7 @@ def test_state_machine_with_unsuccessful_mission_stop_with_mission_id(
 
 
 def test_robot_mission_status_exception_handling(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
 ) -> None:
@@ -226,7 +223,6 @@ def test_robot_mission_status_exception_handling(
         name="Dummy mission",
         tasks=[StubTask.take_image()],
     )
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
 
     robot_service_thread.robot_service.robot = StubRobotMissionStatusRaisesException()
 

tests/isar/state_machine/test_integration_test_for_states.py

@@ -27,9 +27,9 @@
 
 
 def test_state_machine_transitions_when_running_full_mission(
-    container: ApplicationContainer,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
+    scheduling_utilities: SchedulingUtilities,
     mocker: MockerFixture,
 ) -> None:
     mocker.patch.object(settings, "RETURN_HOME_DELAY", 5.0)
@@ -61,7 +61,6 @@ def test_state_machine_transitions_when_running_full_mission(
     )
     mission: Mission = Mission(id="id", name="Dummy mission", tasks=[task_1, task_2])
 
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     scheduling_utilities.start_mission(mission=mission)
 
     expected_transitions = deque(
@@ -82,7 +81,7 @@ def test_state_machine_transitions_when_running_full_mission(
 
 
 def test_state_machine_failed_dependency(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
     mocker: MockerFixture,
@@ -109,7 +108,6 @@ def test_state_machine_failed_dependency(
         in state_machine_thread.state_machine.transitions_list,
         timeout=10,
     )
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     scheduling_utilities.start_mission(mission=mission)
 
     expected_transitions = deque(
@@ -135,6 +133,7 @@ def test_state_machine_failed_dependency(
 
 def test_state_machine_with_successful_collection(
     container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
     robot_inspection_service_thread: Thread,
@@ -153,7 +152,6 @@ def test_state_machine_with_successful_collection(
     mission: Mission = Mission(
         id="id", name="Dummy misson", tasks=[StubTask.take_image()]
     )
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
 
     mocker.patch.object(settings, "RETURN_HOME_DELAY", 2.0)
     state_machine_thread.start()
@@ -184,6 +182,7 @@ def test_state_machine_with_successful_collection(
 
 def test_state_machine_with_unsuccessful_collection(
     container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     mocker: MockerFixture,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
@@ -208,7 +207,6 @@ def test_state_machine_with_unsuccessful_collection(
     mission: Mission = Mission(
         id="id", name="Dummy misson", tasks=[StubTask.take_image()]
     )
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     scheduling_utilities.start_mission(mission=mission)
 
     expected_transitions = deque(
@@ -233,7 +231,7 @@ def test_state_machine_with_unsuccessful_collection(
 
 
 def test_state_machine_with_mission_start_during_return_home_without_queueing_stop_response(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     mocker: MockerFixture,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
@@ -242,7 +240,6 @@ def test_state_machine_with_mission_start_during_return_home_without_queueing_st
     mission: Mission = Mission(
         id="id", name="Dummy misson", tasks=[StubTask.take_image()]
     )
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     mocker.patch.object(
         StubRobot, "mission_status", return_value=MissionStatus.InProgress
     )
@@ -280,7 +277,7 @@ def test_state_machine_with_mission_start_during_return_home_without_queueing_st
 
 
 def test_state_machine_failed_to_initiate_mission_and_return_home(
-    container: ApplicationContainer,
+    scheduling_utilities: SchedulingUtilities,
     state_machine_thread: StateMachineThreadMock,
     robot_service_thread: RobotServiceThreadMock,
     mocker: MockerFixture,
@@ -309,7 +306,6 @@ def test_state_machine_failed_to_initiate_mission_and_return_home(
         timeout=10,
     )
 
-    scheduling_utilities: SchedulingUtilities = container.scheduling_utilities()
     scheduling_utilities.start_mission(mission=mission)
 
     expected_transitions = deque(