Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r4e525fac94941a1451bd54f2390f47ece7f4f1b0 -re668ae1e012a1ab6ed5b1ff62f7001f977049ded --- shared/scripts/configuration/utility.py (.../utility.py) (revision 4e525fac94941a1451bd54f2390f47ece7f4f1b0) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision e668ae1e012a1ab6ed5b1ff62f7001f977049ded) @@ -24,12 +24,7 @@ from dialin.ui import utils from datetime import datetime from dialin.ui import utils -from dialin.common.hd_defs import HDOpModes -from dialin.ui.hd_simulator import HDSimulator -from dialin.ui.dg_simulator import DGSimulator -hd_simulator = HDSimulator() -dg_simulator = DGSimulator() def color_verification(exp_val = "Red", act_val = "#c53b33"): """ @@ -470,19 +465,7 @@ """ padded_str = "###"+string return padded_str - -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(HDOpModes.MODE_PRET.value,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) - def convert_seconds_into_min_and_sec(seconds): min_and_sec = time.strftime("%M:%S", time.gmtime(seconds)) return min_and_sec @@ -492,17 +475,6 @@ names.o_self_test_dry_check_list_text["text"] = text return names.o_self_test_dry_check_list_text -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(HDOpModes.MODE_PRET.value,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) - def convert_seconds_into_min_and_sec(seconds): min_and_sec = time.strftime("%M:%S", time.gmtime(seconds)) return min_and_sec @@ -529,12 +501,14 @@ 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 HDSimulator class + @Param dg_simulator - Instance of DGSimulator class """ test.startSection("Verify the count down time in application") for count_down in range(config.COUNT_DOWN_TIME_100, config.MINIMUM_COUNTDOWN_TIME-1, -1):