Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r1360b54e0f3f64259e03e1b1700fcd04dec9d384 -r88021b78150355dab24a99207a98cf16801b1c1b --- shared/scripts/configuration/utility.py (.../utility.py) (revision 1360b54e0f3f64259e03e1b1700fcd04dec9d384) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 88021b78150355dab24a99207a98cf16801b1c1b) @@ -21,13 +21,8 @@ from configuration import config from builtins import int as pyInt from configuration.config import * -from dialin.ui.hd_simulator import HDSimulator -from dialin.ui.dg_simulator import DGSimulator -hd_simulator = HDSimulator() -dg_simulator = DGSimulator() - - + def check_if_object_is_within_the_container(obj=None, container=None): """ check if an object is inside a container @@ -107,12 +102,15 @@ time_text = progress_circle_children[1] return time_text.time -def verify_countdown(screen_title, time_out): + +def verify_countdown(screen_title, time_out, hd_simulator, dg_simulator): """ Method to verify the count down time in application @param screen_title - (str) current title of the screen @param time_out - (int) time out duration in secs + @Param hd_simulator - Instance of class HDSimulator + @Param dg_simulator - Instance of class DGSimulator """ test.startSection("Verify the count down time in application") for count_down in range(COUNT_DOWN_TIME_100, MINIMUM_COUNTDOWN_TIME-1, -1): @@ -197,15 +195,5 @@ names.o_bullet_object["container"] = screen_obj names.o_bullet_object["occurrence"] = num + 1 return names.o_bullet_object - -def navigate_to_pretreatment_screen(mode): - """ - Method to navigate to sub mode under pre-treatment screen - @param mode - (int) pre treatment state - """ - hd_simulator.cmd_set_hd_operation_mode_data(5,0) - - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=mode, water_sample_state=0,consumables_self_test_state=0, - no_cartridge_self_test_state=0,installation_state=0, dry_self_test_state=0, - prime_state=0,recirculate_state=0, patient_connection_state=0) +