Addressing some SonarQube issues

Author: adrianoaru-nhs

pages/datasets/investigation_dataset_page.py

@@ -73,6 +73,7 @@ def __init__(self, page: Page):
         self.edit_dataset_button = self.page.locator(
             "#UI_DIV_BUTTON_EDIT1"
         ).get_by_role("button", name="Edit Dataset")
+        self.visible_ui_results_string = 'select[id^="UI_RESULTS_"]:visible'
 
     def select_site_lookup_option(self, option: str) -> None:
         """
@@ -96,7 +97,7 @@ def select_site_lookup_option_index(self, option: int) -> None:
             option (int): The index of the option to select from the site lookup options.
         """
         self.click(self.site_lookup_link)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
+        select_locator = self.page.locator(self.visible_ui_results_string)
         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")
@@ -125,7 +126,7 @@ def select_practitioner_option_index(self, option: int) -> None:
             option (int): The index of the option to select from the practitioner options.
         """
         self.click(self.practitioner_link)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
+        select_locator = self.page.locator(self.visible_ui_results_string)
         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")
@@ -154,7 +155,7 @@ def select_testing_clinician_option_index(self, option: int) -> None:
             option (int): The index of the option to select from the testing clinician options.
         """
         self.click(self.testing_clinician_link)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
+        select_locator = self.page.locator(self.visible_ui_results_string)
         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")
@@ -183,7 +184,7 @@ def select_aspirant_endoscopist_option_index(self, option: int) -> None:
             option (int): The index of the option to select from the aspirant endoscopist options.
         """
         self.click(self.aspirant_endoscopist_link)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
+        select_locator = self.page.locator(self.visible_ui_results_string)
         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")
@@ -337,7 +338,7 @@ def select_polyp1_pathology_provider_option_index(self, option: int) -> None:
             option (int): The index of the option to select from the pathology provider options.
         """
         self.click(self.polyp1_pathology_provider)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
+        select_locator = self.page.locator(self.visible_ui_results_string)
         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")
@@ -353,7 +354,7 @@ def select_polyp1_pathologist_option_index(self, option: int) -> None:
             option (int): The index of the option to select from the pathologist options.
         """
         self.click(self.polyp1_pathologist)
-        select_locator = self.page.locator('select[id^="UI_RESULTS_"]:visible')
+        select_locator = self.page.locator(self.visible_ui_results_string)
         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")

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_advanced_colorectal_polyp.py

@@ -240,19 +240,6 @@ def test_identify_advanced_colorectal_polyp_from_histology_d(page: Page) -> None
     """
     This test identifies an advanced colorectal polyp from histology results (BCSS-5567 - D).
     """
-    polyp_1_histology = {
-        "date of receipt": datetime.today(),
-        "date of reporting": datetime.today(),
-        "pathology provider": -1,
-        "pathologist": -1,
-        "polyp type": PolypTypeOptions.SERRATED_LESION,
-        "serrated lesion sub type": SerratedLesionSubTypeOptions.MIXED_POLYP,
-        "polyp excision complete": PolypExcisionCompleteOptions.R1,
-        "polyp size": "11",
-        "polyp dysplasia": PolypDysplasiaOptions.NOT_REPORTED,
-        "polyp carcinoma": YesNoUncertainOptions.NO,
-    }
-
     polyp_1_information = make_polyp_1_information(
         **{
             "location": EndoscopyLocationOptions.SPLENIC_FLEXURE,
@@ -733,7 +720,6 @@ def test_identify_advanced_colorectal_polyp_from_histology_o(page: Page) -> None
 
     polyp_1_histology = make_polyp_1_histology(
         **{
-            "polyp type": PolypTypeOptions.ADENOMA,
             "polyp type": PolypTypeOptions.ADENOMA,
             "adenoma sub type": AdenomaSubTypeOptions.VILLOUS_ADENOMA,
             "polyp size": "3",

utils/investigation_dataset.py

@@ -78,6 +78,8 @@ def __init__(self, page: Page):
         self.page = page
         self.estimate_whole_polyp_size_string = "Estimate of whole polyp size"
         self.polyp_access_string = "Polyp Access"
+        self.failure_reasons_string = "Failure Reasons"
+        self.excision_technique_string = "Excision Technique"
 
     def complete_with_result(self, nhs_no: str, result: str) -> None:
         """This method fills out the investigation dataset forms based on the test result and the subject's age.
@@ -109,7 +111,7 @@ def complete_with_result(self, nhs_no: str, result: str) -> None:
             self.default_investigation_dataset_forms_continuation()
             InvestigationDatasetsPage(self.page).click_show_failure_information()
             DatasetFieldUtil(self.page).populate_select_locator_for_field_inside_div(
-                "Failure Reasons",
+                self.failure_reasons_string,
                 "divFailureSection",
                 FailureReasonsOptions.NO_FAILURE_REASONS,
             )
@@ -205,7 +207,7 @@ def investigation_datasets_failure_reason(self) -> None:
         # Failure Information
         InvestigationDatasetsPage(self.page).click_show_failure_information()
         DatasetFieldUtil(self.page).populate_select_locator_for_field_inside_div(
-            "Failure Reasons",
+            self.failure_reasons_string,
             "divFailureSection",
             FailureReasonsOptions.BLEEDING_INCIDENT,
         )
@@ -262,7 +264,7 @@ def polyps_for_high_risk_result(self) -> None:
             "Retrieved", "divPolypTherapy2_1Section", YesNoOptions.NO
         )
         DatasetFieldUtil(self.page).populate_select_locator_for_field_inside_div(
-            "Excision Technique",
+            self.excision_technique_string,
             "divPolypTherapy2_1Section",
             PolypInterventionExcisionTechniqueOptions.EN_BLOC,
         )
@@ -307,7 +309,7 @@ def polyp1_intervention(self) -> None:
             "Retrieved", "divPolypTherapy1_1Section", YesNoOptions.NO
         )
         DatasetFieldUtil(self.page).populate_select_locator_for_field_inside_div(
-            "Excision Technique",
+            self.excision_technique_string,
             "divPolypTherapy1_1Section",
             PolypInterventionExcisionTechniqueOptions.EN_BLOC,
         )
@@ -440,8 +442,6 @@ def complete_dataset_with_args(
                     DatasetFieldUtil(self.page).populate_select_locator_for_field(
                         "Late outcome", value
                     )
-                case _:
-                    pass
 
         # Completion Proof Information
         if completion_information:
@@ -455,7 +455,7 @@ def complete_dataset_with_args(
         # Failure Information
         InvestigationDatasetsPage(self.page).click_show_failure_information()
         DatasetFieldUtil(self.page).populate_select_locator_for_field_inside_div(
-            "Failure Reasons",
+            self.failure_reasons_string,
             "divFailureSection",
             failure_information["failure reasons"],
         )
@@ -510,8 +510,6 @@ def complete_dataset_with_args(
                             "divLeftInSitu1",
                             value,
                         )
-                    case _:
-                        pass
 
             if polyp_1_intervention:
                 InvestigationDatasetsPage(
@@ -553,7 +551,7 @@ def complete_dataset_with_args(
                             DatasetFieldUtil(
                                 self.page
                             ).populate_select_locator_for_field_inside_div(
-                                "Excision Technique",
+                                self.excision_technique_string,
                                 "divPolypTherapy1_1Section",
                                 value,
                             )
@@ -565,8 +563,6 @@ def complete_dataset_with_args(
                                 "divPolypAppearsFullyResected1_1",
                                 value,
                             )
-                        case _:
-                            pass
 
             if polyp_1_histology:
                 for key, value in polyp_1_histology.items():
@@ -651,8 +647,6 @@ def complete_dataset_with_args(
                                 "divTumourFindings1_1",
                                 value,
                             )
-                        case _:
-                            pass
 
         InvestigationDatasetsPage(self.page).check_dataset_complete_checkbox()
         InvestigationDatasetsPage(self.page).click_save_dataset_button()