As per PR - #96 comments, Code Refactoring is implemented on below 4 files.

Author: vidhya-chandra1

pages/screening_subject_search/subject_screening_search_page.py

@@ -10,6 +10,8 @@ class SubjectScreeningPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
+        self.results_table_locator = "table#subject-search-results"
+
         # Subject Search Criteria - page filters
         self.episodes_filter = self.page.get_by_role("radio", name="Episodes")
         self.demographics_filter = self.page.get_by_role("radio", name="Demographics")
@@ -149,6 +151,7 @@ def select_dob_using_calendar_picker(self, date) -> None:
         CalendarPicker(self.page).v1_calender_picker(date)
 
     def verify_date_of_birth_filter_input(self, expected_text: str) -> None:
+        """Verifies that the Date of Birth filter input field has the expected value."""
         expect(self.date_of_birth_filter).to_have_value(expected_text)
 
 

tests/regression/subject_search_criteria/test_screening_subject_search_criteria_page_regression.py

@@ -1,9 +1,12 @@
 import pytest
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page
 from utils.user_tools import UserTools
 from utils.table_util import TableUtils
 from pages.base_page import BasePage
 from utils.screening_subject_page_searcher import search_subject_by_surname
+from pages.screening_subject_search.subject_screening_search_page import (
+    SubjectScreeningPage,
+)
 
 @pytest.mark.regression
 @pytest.mark.subject_search
@@ -12,7 +15,7 @@ def test_user_can_search_for_subject_and_results_are_returned(page: Page):
     Verify that User can log in to BCSS "England" as user role "Hub Manager - State Registered"
     Navigate it to the Subject Search Criteria Page & added value "S*" to the "Surname" search field
     Clicking on the search button on the subject search criteria page
-    Then Some subject search criteria results are returned & paused to admire the view for "5" seconds
+    Then Verifies that search results contain Surnames beginning with S
     """
 
     # Log in as Hub Manager - State Registered (England)
@@ -25,8 +28,7 @@ def test_user_can_search_for_subject_and_results_are_returned(page: Page):
     # click search button on the subject search criteria page
     search_subject_by_surname(page, "S*")
 
-    # Assert that some results are returned
-    # Replace the below selector with the actual table locator if different
-    table_locator = "table#subject-search-results"  # Example CSS selector
-    TableUtils(page, table_locator).assert_surname_in_table("S*")
-
+    # Assert that some results are returned with the surname starting with "S*"
+    TableUtils(
+        page, SubjectScreeningPage(page).results_table_locator
+    ).assert_surname_in_table("S*")

utils/table_util.py

@@ -238,15 +238,22 @@ def get_cell_value(self, column_name: str, row_index: int) -> str:
     def assert_surname_in_table(self, surname_pattern):
         """
         Asserts that a surname matching the given pattern exists in the table.
-
         Args:
             surname_pattern (str): The surname or pattern to search for (supports '*' as a wildcard at the end).
         """
         # Locate all surname cells (adjust selector as needed)
-        surname_criteria = self.page.locator("//table//tr[position()>1]/td[2]")  # Use the correct column index
+        surname_criteria = self.page.locator(
+            "//table//tr[position()>1]/td[3]"
+        )  # Use the correct column index
         if surname_pattern.endswith("*"):
             prefix = surname_pattern[:-1]
-            found = any(cell.inner_text().startswith(prefix) for cell in surname_criteria.element_handles())
+            found = any(
+                cell.inner_text().startswith(prefix)
+                for cell in surname_criteria.element_handles()
+            )
         else:
-            found = any(surname_pattern == cell.inner_text() for cell in surname_criteria.element_handles())
+            found = any(
+                surname_pattern == cell.inner_text()
+                for cell in surname_criteria.element_handles()
+            )
         assert found, f"No surname matching '{surname_pattern}' found in table."

utils/user_tools.py

@@ -36,11 +36,6 @@ def user_login(page: Page, username: str) -> None:
             raise ValueError("Environment variable 'BCSS_PASS' is not set")
         CognitoLoginPage(page).login_as_user(user_details["username"], password)
 
-    @staticmethod
-    def login(page, user_role, region):
-        # Implement login logic here
-        pass
-
     @staticmethod
     def get_subject_with_criteria(episode_type, episode_status, has_referral_date, has_diagnosis_date, diagnosis_date_reason):
         # Example implementation: fetch NHS number from a test data file based on criteria
@@ -59,8 +54,8 @@ def get_subject_with_criteria(episode_type, episode_status, has_referral_date, h
                 subject.get("diagnosis_date_reason") == diagnosis_date_reason
             ):
                 return subject.get("nhs_number", "1234567890")
-        # If no match found, return dummy NHS number
-        return "1234567890"
+        # If no match found, then exception is raised
+        raise SubjectNotFoundError("No NHS number found using the provided criteria.")
 
     @staticmethod
     def retrieve_user(user: str) -> dict:
@@ -85,3 +80,7 @@ def retrieve_user(user: str) -> dict:
 
 class UserToolsException(Exception):
     pass
+
+class SubjectNotFoundError(Exception):
+    """Raised when no subject matches the provided criteria."""
+    pass