Index: shared/scripts/configuration/config.py =================================================================== diff -u -r3f9d21a04d25f785833fca1381c6f23d6364b39e -r9ed766a31269686d91df7eec65b03ae213cea580 --- shared/scripts/configuration/config.py (.../config.py) (revision 3f9d21a04d25f785833fca1381c6f23d6364b39e) +++ shared/scripts/configuration/config.py (.../config.py) (revision 9ed766a31269686d91df7eec65b03ae213cea580) @@ -50,6 +50,9 @@ MAXIMUM_COUNTDOWN_TIME = 300 MINIMUM_COUNTDOWN_TIME = 0 COUNT_DOWN_TIME_100 = 100 +TIME_OUT_DURATION_300 = 300 +TIME_OUT_DURATION_200 = 200 +TIME_OUT_DURATION_100 = 100 LOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r3f9d21a04d25f785833fca1381c6f23d6364b39e -r9ed766a31269686d91df7eec65b03ae213cea580 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 3f9d21a04d25f785833fca1381c6f23d6364b39e) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 9ed766a31269686d91df7eec65b03ae213cea580) @@ -140,33 +140,36 @@ return time_text.time -def verify_countdown(screen_title): +def verify_countdown(screen_title, time_out): """ 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 """ 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): if screen_title == config.BEGIN_PRIME_TITLE: - hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(300, count_down) + hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(time_out, count_down) elif screen_title == config.PRIMING_TITLE: - hd_simulator.cmd_send_pre_treatment_disposables_prime_progress_data(300, count_down) + hd_simulator.cmd_send_pre_treatment_disposables_prime_progress_data(time_out, count_down) elif screen_title == config.SYSTEM_SELF_TEST_TITLE: - hd_simulator.cmd_send_pre_treatment_self_test_no_cartridge_progress_data(300, count_down) + hd_simulator.cmd_send_pre_treatment_self_test_no_cartridge_progress_data(time_out, count_down) else: - dg_simulator.cmd_send_dg_pre_treatment_filter_flush_progress_data(300, count_down) + dg_simulator.cmd_send_dg_pre_treatment_filter_flush_progress_data(time_out, count_down) actual_time = get_time(screen_title) expected_time = convert_seconds_into_min_and_sec(count_down) test.compare(actual_time, expected_time, "Actual count down time: {} should be equal to expected count down time {}".format(actual_time, expected_time)) - verify_the_progress(count_down, screen_title) + verify_the_progress(count_down, screen_title, time_out) test.endSection() - - -def verify_the_progress(count_down, screen_title): + + +def verify_the_progress(count_down, screen_title, time_out): """ - Method to verify the current progress - @param count_down - (int) current count down time, screen_title: (str) current title of the screen + Method to verify the current progress + @param count_down - (int) current count down time + @param screen_title - (str) current title of the screen + @param time_out - (int) time out duration in secs """ test.startSection("Verifying the current progress") if screen_title == config.BEGIN_PRIME_TITLE or screen_title == config.PRIMING_TITLE: @@ -176,7 +179,7 @@ else: current_progress = (squish.waitForObjectExists(names.o_filter_flush_progress)).progressValue #Since progress value is equal maximum count down value - current count down value - expected_progress = config.MAXIMUM_COUNTDOWN_TIME - count_down + expected_progress = time_out - count_down test.compare(current_progress, expected_progress, "{} should be the current progress".format(expected_progress)) test.endSection() Index: tst_pre_treatment_disposables/test.py =================================================================== diff -u -re9c9c9b0f2c241ce620f06432fdd7b9d3d6b3810 -r9ed766a31269686d91df7eec65b03ae213cea580 --- tst_pre_treatment_disposables/test.py (.../test.py) (revision e9c9c9b0f2c241ce620f06432fdd7b9d3d6b3810) +++ tst_pre_treatment_disposables/test.py (.../test.py) (revision 9ed766a31269686d91df7eec65b03ae213cea580) @@ -244,7 +244,9 @@ startApplication(AUT_NAME) navigate_to_disposables() - verify_countdown(SYSTEM_SELF_TEST_TITLE) + verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_100) + verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_200) + verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_300) verify_functionality_for_cartridge_installation()