Addressing SonarQube issues

Author: adrianoaru-nhs

tests/regression/regression_tests/test_regression_test_setup_steps.py

@@ -16,12 +16,11 @@
     set_org_parameter_value,
     check_parameter,
 )
-from utils.dataset_field_util import DatasetFieldUtil
 
 from utils.oracle.oracle import OracleDB
 
 
-def test_allow_10_minute_colonsocopy_assessment_Appointments(page: Page) -> None:
+def test_allow_10_minute_colonsocopy_assessment_appointments(page: Page) -> None:
     """
     Scenario: 1: Allow 10 minute colonoscopy assessment appointments between 7am and 8pm at BCS001
 

utils/table_util.py

@@ -25,6 +25,8 @@ def __init__(self, page: Page, table_locator: str) -> None:
             table_locator
         )  # Create a locator object for the table
 
+        self.tbody_tr_string = "tbody tr"
+
     def get_column_index(self, column_name: str) -> int:
         """
         Finds the column index dynamically based on column name.
@@ -41,7 +43,9 @@ def get_column_index(self, column_name: str) -> int:
         if not header_row.locator("th").count():
             # Fallback: look for header in <tbody> if <thead> is missing or empty
             header_row = (
-                self.table.locator("tbody tr").filter(has=self.page.locator("th")).first
+                self.table.locator(self.tbody_tr_string)
+                .filter(has=self.page.locator("th"))
+                .first
             )
 
         headers = header_row.locator("th")
@@ -163,7 +167,9 @@ def get_table_headers(self) -> dict:
 
         # Strategy 3: Last resort — try to find header from tbody row (some old tables use <tbody> only)
         fallback_row = (
-            self.table.locator("tbody tr").filter(has=self.page.locator("th")).first
+            self.table.locator(self.tbody_tr_string)
+            .filter(has=self.page.locator("th"))
+            .first
         )
         if fallback_row.locator("th").count():
             try:
@@ -372,7 +378,7 @@ def click_surname_if_bcss_user_and_has_code(self):
         if -1 in (surname_col, user_code_col, bcss_col):
             raise ValueError("One or more required columns not found")
 
-        rows = self.table.locator("tbody tr")
+        rows = self.table.locator(self.tbody_tr_string)
 
         for i in range(rows.count()):
             row = rows.nth(i)