Addressing SonarQube comments

Author: adrianoaru-nhs

pages/datasets/investigation_dataset_page.py

@@ -93,6 +93,7 @@ def __init__(self, page: Page):
         self.visible_search_text_input = self.page.locator(
             'input[id^="UI_SEARCH_"]:visible'
         )
+        self.diagnostic_test_result = self.page.locator('#datasetContent > div:nth-child(1) > div:nth-child(7) > span.userInput')
 
         # Repeat strings:
         self.bowel_preparation_administered_string = "Bowel Preparation Administered"
@@ -1221,6 +1222,10 @@ def does_field_contain_expected_value(
             logging.info(
                 f"[UI ASSERTIONS COMPLETE] Value as expected. Expected: {expected_value}, Actual: '{actual_value}'"
             )
+        else:
+            raise ValueError(
+                f"[UI ASSERTIONS FAILED] Field '{field_name}' with expected value '{expected_value}' not found."
+            )
 
     def map_fields_and_values(
         self, dataset_section: str, dataset_subsection: str | None
@@ -1250,25 +1255,26 @@ def map_fields_and_values(
                     tag_name = value_from_list.evaluate(
                         "el => el.tagName.toLowerCase()"
                     )
-                    if tag_name == "select":
-                        # Get selected option text
-                        selected_option = value_from_list.locator("option:checked")
-                        field_value += selected_option.inner_text()
-                    elif tag_name == "li":
-                        input_elem = value_from_list.locator("input")
-                        if input_elem.is_checked():
-                            label_elem = value_from_list.locator("label")
-                            field_value = label_elem.inner_text()
-                    elif tag_name == "input":
-                        input_type = value_from_list.get_attribute("type")
-                        if input_type == "text":
-                            field_value += value_from_list.input_value()
-                    elif tag_name == "p":
-                        field_value += value_from_list.inner_text()
-                    else:
-                        logging.debug(
-                            f"tag type not specified, tag ignored = {tag_name}"
-                        )
+                    match tag_name:
+                        case "select":
+                            # Get selected option text
+                            selected_option = value_from_list.locator("option:checked")
+                            field_value += selected_option.inner_text()
+                        case "li":
+                            input_elem = value_from_list.locator("input")
+                            if input_elem.is_checked():
+                                label_elem = value_from_list.locator("label")
+                                field_value = label_elem.inner_text()
+                        case "input":
+                            input_type = value_from_list.get_attribute("type")
+                            if input_type == "text":
+                                field_value += value_from_list.input_value()
+                        case "p":
+                            field_value += value_from_list.inner_text()
+                        case _:
+                            logging.debug(
+                                f"tag type not specified, tag ignored = {tag_name}"
+                            )
             fields_with_values[field_label] = field_value
 
         logging.debug("end: map_fields_and_values()")
@@ -1340,6 +1346,17 @@ def map_fields_and_elements(
         logging.debug("end: map_fields_and_elements()")
         return fields_and_elements
 
+    def assert_test_result(self, expected_text: str) -> None:
+        """
+        Asserts that the text in the test result matches the expected text.
+        Args:
+            expected_text (str): The text expected to be found in the element.
+        """
+        actual_text = self.diagnostic_test_result.inner_text().strip()
+        assert (
+            actual_text.lower() == expected_text.lower()
+        ), f"Expected '{expected_text}', but found '{actual_text}'"
+
 
 def normalize_label(text: str) -> str:
     """

pages/screening_subject_search/handover_into_symptomatic_care_page.py

@@ -26,6 +26,7 @@ def __init__(self, page: Page):
         self.mdt_date_field = self.page.locator("#UI_MDT_DATE")
         self.site_dropdown = self.page.locator("#UI_NS_SITE_SELECT_LINK")
         self.date_responsibility_accepted_field = self.page.locator("#UI_OTHER_DATE")
+        self.select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
 
     def select_referral_dropdown_option(self, value: str) -> None:
         """
@@ -51,11 +52,10 @@ def select_non_screening_practitioner_link(self, practitioner_index: int) -> Non
             practitioner_index (int): The index of the non screening practitioner to select.
         """
         self.non_screening_practitioner_link.click()
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
-        select_locator.first.wait_for(state="visible")
+        self.select_locator.first.wait_for(state="visible")
 
         # Find all option elements inside the select and click the one at the given index
-        option_elements = select_locator.first.locator("option")
+        option_elements = self.select_locator.first.locator("option")
         option_elements.nth(practitioner_index).wait_for(state="visible")
         self.click(option_elements.nth(practitioner_index))
 
@@ -82,11 +82,10 @@ def select_consultant_from_index(self, consultant_index: int) -> None:
             consultant_index (int): The index of the consultant to select.
         """
         self.click(self.consultant_link)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
-        select_locator.first.wait_for(state="visible")
+        self.select_locator.first.wait_for(state="visible")
 
         # Find all option elements inside the select and click the one at the given index
-        option_elements = select_locator.first.locator("option")
+        option_elements = self.select_locator.first.locator("option")
         option_elements.nth(consultant_index).wait_for(state="visible")
         self.click(option_elements.nth(consultant_index))
 
@@ -140,11 +139,10 @@ def select_site_dropdown_option_index(self, index: int) -> None:
             value (str): The value of the option you want to select
         """
         self.click(self.site_dropdown)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
-        select_locator.first.wait_for(state="visible")
+        self.select_locator.first.wait_for(state="visible")
 
         # Find all option elements inside the select and click the one at the given index
-        option_elements = select_locator.first.locator("option")
+        option_elements = self.select_locator.first.locator("option")
         option_elements.nth(index).wait_for(state="visible")
         self.click(option_elements.nth(index))
 

tests/regression/regression_tests/surveillance_regression_tests/test_surveillance_scenario_10.py

@@ -373,7 +373,7 @@ def test_scenario_10(page: Page, general_properties: dict) -> None:
     )
 
     # Then the Investigation Dataset result message is "High-risk findings"
-    InvestigationDatasetsPage(page).expect_text_to_be_visible("High-risk findings")
+    InvestigationDatasetsPage(page).assert_test_result("High-risk findings")
 
     # Then I confirm the Polyp Algorithm Size for Polyp 1 is 10
     InvestigationDatasetsPage(page).assert_polyp_algorithm_size(1, "10")