Removing hardcoded calues from C3 and using the properties file instead

Author: adrianoaru-nhs

tests/smokescreen/bcss_smokescreen_tests.properties

@@ -15,8 +15,8 @@
 #   compartment 3
 # ----------------------------------
 #    c3_fit_kit_results_test_org_id=23159
-#    c3_fit_kit_normal_result=75
-#    c3_fit_kit_abnormal_result=150
+    c3_fit_kit_normal_result=75
+    c3_fit_kit_abnormal_result=150
 #    c3_fit_kit_authorised_user=AUTO1
 #    c3_fit_kit_analyser_code=HMJackalt1
 
@@ -66,8 +66,8 @@
 #    c3_eng_number_of_abnormal_gfobt_kits_to_log=0
 #    c3_eng_number_of_normal_gfobt_kits_to_log=0
 #    c3_eng_number_of_weak_positive_gfobt_kits_to_log=0
-#    c3_eng_number_of_abnormal_fit_kits=7
-#    c3_eng_number_of_normal_fit_kits=1
+    c3_eng_number_of_abnormal_fit_kits=9
+    c3_eng_number_of_normal_fit_kits=1
 
 # ----------------------------------
 #   compartment 4

tests/smokescreen/test_compartment_3.py

@@ -10,11 +10,34 @@
     execute_stored_procedures,
 )
 from utils.user_tools import UserTools
+from jproperties import Properties
+from sys import platform
+
+
+@pytest.fixture
+def smokescreen_properties() -> dict:
+    """
+    Reads the 'bcss_smokescreen_tests.properties' file and populates a 'Properties' object.
+    Returns a dictionary of properties for use in tests.
+
+    Returns:
+        dict: A dictionary containing the values loaded from the 'bcss_smokescreen_tests.properties' file.
+    """
+    configs = Properties()
+    if platform == "win32":  # File path from content root is required on Windows OS
+        with open(
+            "tests/smokescreen/bcss_smokescreen_tests.properties", "rb"
+        ) as read_prop:
+            configs.load(read_prop)
+    elif platform == "darwin":  # Only the filename is required on macOS
+        with open("bcss_smokescreen_tests.properties", "rb") as read_prop:
+            configs.load(read_prop)
+    return configs.properties
 
 
 @pytest.mark.smokescreen
 @pytest.mark.compartment3
-def test_compartment_3(page: Page) -> None:
+def test_compartment_3(page: Page, smokescreen_properties: dict) -> None:
     """
     This is the main compartment 3 method
     First it finds any relevant test data from the DB and stores it in a pandas dataframe
@@ -27,13 +50,15 @@ def test_compartment_3(page: Page) -> None:
 
     # Find data , separate it into normal and abnormal, Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
     # and get device IDs and their flags
-    device_ids = process_kit_data()
+    device_ids = process_kit_data(smokescreen_properties)
     # Retrieve NHS numbers for each device_id and determine normal/abnormal status
     nhs_numbers = []
     normal_flags = []
 
     for device_id, is_normal in device_ids:
-        nhs_number = update_kit_service_management_entity(device_id, is_normal)
+        nhs_number = update_kit_service_management_entity(
+            device_id, is_normal, smokescreen_properties
+        )
         nhs_numbers.append(nhs_number)
         normal_flags.append(
             is_normal
@@ -66,7 +91,6 @@ def test_compartment_3(page: Page) -> None:
                 f"Verification failed for NHS number {nhs_number} with status {expected_status}: {str(e)}"
             )
             raise
-
     # Process S2 batch
     batch_processing(
         page,
@@ -75,14 +99,12 @@ def test_compartment_3(page: Page) -> None:
         "S158 - Subject Discharge Sent (Normal)",
         True,
     )
-
     # Process S158 batch
     batch_processing(
         page,
         "S158",
         "GP Result (Normal)",
         "S159 - GP Discharge Sent (Normal)",
     )
-
     # Log out
     Logout(page).log_out()

utils/fit_kit_logged.py

@@ -5,7 +5,7 @@
 import pytest
 
 
-def process_kit_data() -> list:
+def process_kit_data(smokescreen_properties) -> list:
     """
     This method retrieved the test data needed for compartment 3 and then splits it into two data frames:
     - 1 normal
@@ -17,7 +17,9 @@ def process_kit_data() -> list:
     kit_id_df = get_kit_id_logged_from_db()
 
     # Split dataframe into two different dataframes, normal and abnormal
-    normal_fit_kit_df, abnormal_fit_kit_df = split_fit_kits(kit_id_df)
+    normal_fit_kit_df, abnormal_fit_kit_df = split_fit_kits(
+        kit_id_df, smokescreen_properties
+    )
 
     # Prepare a list to store device IDs and their respective flags
     device_ids = []
@@ -47,12 +49,14 @@ def process_kit_data() -> list:
 
 
 # Seperate kits into normal and abnormal
-def split_fit_kits(kit_id_df) -> pd.DataFrame:
+def split_fit_kits(kit_id_df, smokescreen_properties: dict) -> pd.DataFrame:
     """
     This method splits the dataframe into two, 1 normal and 1 abnormal
     """
-    number_of_normal = 1
-    number_of_abnormal = 9
+    number_of_normal = int(smokescreen_properties["c3_eng_number_of_normal_fit_kits"])
+    number_of_abnormal = int(
+        smokescreen_properties["c3_eng_number_of_abnormal_fit_kits"]
+    )
     # Split dataframe into two dataframes
     normal_fit_kit_df = kit_id_df.iloc[:number_of_normal]
     abnormal_fit_kit_df = kit_id_df.iloc[

utils/oracle/oracle_specific_functions.py

@@ -117,7 +117,9 @@ def get_service_management_by_device_id(deviceid) -> pd.DataFrame:
     return get_service_management_df
 
 
-def update_kit_service_management_entity(device_id, normal) -> str:
+def update_kit_service_management_entity(
+    device_id, normal, smokescreen_properties: dict
+) -> str:
     """
     This method is used to update the KIT_QUEUE table on the DB
     This is done so that we can then run two stored procedures to update the subjects and kits status to either normal or abnormal
@@ -141,9 +143,9 @@ def update_kit_service_management_entity(device_id, normal) -> str:
         + f"{datetime.now().microsecond:06d}000"
     )
     if normal:
-        test_result = 75
+        test_result = int(smokescreen_properties["c3_fit_kit_normal_result"])
     else:
-        test_result = 150
+        test_result = int(smokescreen_properties["c3_fit_kit_abnormal_result"])
         # Parameterized query
     update_query = """
     UPDATE kit_queue kq