Minor refactoring

Author: Andyg79

tests/Smokescreen/test_compartment_3.py

@@ -9,27 +9,13 @@
 
 
 def test_compartment_3(page: Page) -> None:
-    page.goto("/")
-    BcssLoginPage(page).login_as_user("BCSS401")
+    UserTools.user_login(page, "Hub Manager State Registered")
 
     # Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
     fit_kit_logged.process_kit_data()
-    #  Run the database procedure to process any kit queue records at status BCSS_READY
-    fit_kit_logged.execute_stored_procedures()
-
 
     # (STEP - 4) Run two stored procedures to process any kit queue records at status BCSS_READY
-    # (processKitQueue function in selenium tests)
-
-    logging.info("start: oracle.OracleDB.execute_stored_procedure")
-
-    # Run stored procedure 1 - validate kit queue
-    oracle.OracleDB.execute_stored_procedure(OracleDB,"PKG_TEST_KIT_QUEUE.p_validate_kit_queue")
-
-    # Run stored procedure 2 - calculate result
-    oracle.OracleDB.execute_stored_procedure(OracleDB,"PKG_TEST_KIT_QUEUE.p_calculate_result")
-
-    logging.info("exit: oracle.OracleDB.execute_stored_procedure")
+    fit_kit_logged.execute_stored_procedures()
 
     # (STEP - 5) Check the results of the processed FIT kits have correctly updated the status of the associated subjects
     # Navigate to log devices page

utils/fit_kit_logged.py

@@ -92,8 +92,11 @@ def get_service_management_by_device_id(deviceid):
 
 def execute_stored_procedures():
     db_instance = OracleDB()  # Create an instance of the OracleDB class
-    db_instance.execute_stored_procedure('PKG_TEST_KIT_QUEUE.p_validate_kit_queue')
-    db_instance.execute_stored_procedure('PKG_TEST_KIT_QUEUE.p_calculate_result')
+    logging.info("start: oracle.OracleDB.execute_stored_procedure")
+    db_instance.execute_stored_procedure('PKG_TEST_KIT_QUEUE.p_validate_kit_queue') # Run stored procedure - validate kit queue
+    db_instance.execute_stored_procedure('PKG_TEST_KIT_QUEUE.p_calculate_result') # Run stored procedure - calculate result
+    logging.info("exit: oracle.OracleDB.execute_stored_procedure")
+
 
 
 def update_kit_service_management_entity(device_id, normal):