wip

moved some logging from test files into the methods

Author: Andyg79

pages/screening_subject_search/subject_screening_summary_page.py

@@ -365,6 +365,7 @@ def assert_subject_age(self, expected_age: int) -> None:
         assert (
             actual_age == expected_age
         ), f"[AGE MISMATCH] Expected age {expected_age}, but found {actual_age} in UI."
+        logging.info("[UI ASSERTIONS COMPLETE] Subject age checked in the UI")
 
     def assert_screening_status(self, expected_status: str) -> None:
         """
@@ -380,6 +381,7 @@ def assert_screening_status(self, expected_status: str) -> None:
         assert (
             actual_status.lower() == expected_status.lower()
         ), f"[SCREENING STATUS MISMATCH] Expected '{expected_status}', but found '{actual_status}' in UI."
+        logging.info("[UI ASSERTIONS COMPLETE] Subject screening status checked in the UI")
 
     def assert_latest_event_status(self, expected_status: str) -> None:
         """
@@ -395,6 +397,7 @@ def assert_latest_event_status(self, expected_status: str) -> None:
         assert (
             actual_status == expected_status
         ), f"[LATEST EVENT STATUS MISMATCH] Expected '{expected_status}', but found '{actual_status}' in UI."
+        logging.info("[UI ASSERTIONS COMPLETE] Subject latest event status checked in the UI")
 
     def click_reopen_fobt_screening_episode_button(self) -> None:
         """Click on the 'Reopen FOBT Screening Episode' button"""

tests/regression/regression_tests/fobt_regression_tests/test_scenario_2.py

@@ -2,7 +2,6 @@
 import logging
 from datetime import datetime
 from playwright.sync_api import Page
-from pages.communication_production.batch_list_page import ActiveBatchListPage
 from utils.oracle.subject_creation_util import CreateSubjectSteps
 from utils.user_tools import UserTools
 from utils.subject_assertion import subject_assertion
@@ -13,7 +12,6 @@
 from pages.screening_subject_search.subject_screening_summary_page import (
     SubjectScreeningSummaryPage,
 )
-from pages.communication_production.batch_list_page import BatchListPage
 from pages.logout.log_out_page import LogoutPage
 
 
@@ -79,7 +77,6 @@ def test_scenario_2(page: Page) -> None:
     # Assert subject details in the UI
     summary_page.assert_subject_age(66)
     summary_page.assert_screening_status("Inactive")
-    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # When I run the FOBT failsafe trawl for my subject
     CallAndRecallUtils().run_failsafe(nhs_no)
@@ -103,7 +100,6 @@ def test_scenario_2(page: Page) -> None:
 
     # Assert subject details in the UI
     summary_page.assert_screening_status("Call")
-    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # When I invite my subject for FOBT screening
     CallAndRecallUtils().invite_subject_for_fobt_screening(nhs_no, user_role)
@@ -170,7 +166,6 @@ def test_scenario_2(page: Page) -> None:
     summary_page.assert_latest_event_status(
         "S43 - Kit Returned and Logged (Initial Test)"
     )
-    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # When I read my subject's latest logged FIT kit as "NORMAL"
     FitKitLogged().read_latest_logged_kit(user_role, 2, fit_kit, "NORMAL")
@@ -188,7 +183,6 @@ def test_scenario_2(page: Page) -> None:
 
     # Assert subject details in the UI
     summary_page.assert_latest_event_status("S2 - Normal")
-    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # And there is a "S2" letter batch for my subject with the exact title "Subject Result (Normal)"
     # When I process the open "S2" letter batch for my subject

tests/regression/regression_tests/fobt_regression_tests/test_scenario_4.py

@@ -79,9 +79,6 @@ def test_scenario_4(page: Page) -> None:
     if nhs_no is None:
         pytest.fail("Failed to create subject: NHS number not returned.")
 
-    # And I pause for 5 seconds to let the process complete
-    page.wait_for_timeout(5000)
-
     # Then Comment: NHS number
     logging.info(f"[SUBJECT CREATED] NHS number: {nhs_no}")
 
@@ -94,7 +91,7 @@ def test_scenario_4(page: Page) -> None:
             "screening status": "Inactive",
         },
     )
-
+    # Assert subject details in the UI
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
     summary_page.assert_subject_age(62)
     summary_page.assert_screening_status("Inactive")
@@ -116,15 +113,13 @@ def test_scenario_4(page: Page) -> None:
         },
     )
 
+    # Assert subject details in the UI
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
     summary_page.assert_screening_status("Call")
 
     # When I invite my subject for FOBT screening
     CallAndRecallUtils().invite_subject_for_fobt_screening(nhs_no, user_role)
 
-    # And I pause for 5 seconds to let the process complete
-    page.wait_for_timeout(5000)
-
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,