Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r2a19cd281aed2c1f5ff192e1d147a35ba571ccc6 -rb4c9bea230cee577383592686ae7bb79c9716375 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 2a19cd281aed2c1f5ff192e1d147a35ba571ccc6) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision b4c9bea230cee577383592686ae7bb79c9716375) @@ -120,7 +120,7 @@ return time_text.time -def verify_the_countdown(screen_title): +def verify_countdown(screen_title): """ Method to verify the count down time in application Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -re9dd07363fb7d61e4c4303dde2eb495d92e0d197 -rb4c9bea230cee577383592686ae7bb79c9716375 --- tst_pre_treatment_priming/test.py (.../test.py) (revision e9dd07363fb7d61e4c4303dde2eb495d92e0d197) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision b4c9bea230cee577383592686ae7bb79c9716375) @@ -84,32 +84,32 @@ installation_state=0, dry_self_test_state=index, prime_state=0, recirculate_state=0, patient_connection_state=0) if (state == "DRY_SELF_TESTS_STATE") or (state == "DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE"): - verify_the_indicators(None, TEST_DRY_STEPS) + verify_indicators(None, TEST_DRY_STEPS) elif state == "DRY_SELF_TESTS_USED_CARTIDGE_CHECK_STATE": - verify_the_indicators(config.BUSY, "Used Cartridge Check") + verify_indicators(config.BUSY, "Used Cartridge Check") elif state == "DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE": - verify_the_indicators(config.CHECK, "Used Cartridge Check") - verify_the_indicators(config.BUSY, "Occlusion Sensors Check") + verify_indicators(config.CHECK, "Used Cartridge Check") + verify_indicators(config.BUSY, "Occlusion Sensors Check") elif (state == "DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE") or (state == "DRY_SELF_TESTS_PRESSURE_SENSORS_STATE") or (state == "DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE"): - verify_the_indicators(config.CHECK, "Used Cartridge Check") - verify_the_indicators(config.CHECK, "Occlusion Sensors Check") - verify_the_indicators(config.BUSY, "Pressure Sensors Check") + verify_indicators(config.CHECK, "Used Cartridge Check") + verify_indicators(config.CHECK, "Occlusion Sensors Check") + verify_indicators(config.BUSY, "Pressure Sensors Check") elif state == "DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE": - verify_the_indicators(config.CHECK, "Used Cartridge Check") - verify_the_indicators(config.CHECK, "Occlusion Sensors Check") - verify_the_indicators(config.CHECK, "Pressure Sensors Check") - verify_the_indicators(config.BUSY, "Syringe Pump Check") + verify_indicators(config.CHECK, "Used Cartridge Check") + verify_indicators(config.CHECK, "Occlusion Sensors Check") + verify_indicators(config.CHECK, "Pressure Sensors Check") + verify_indicators(config.BUSY, "Syringe Pump Check") elif state == "DRY_SELF_TESTS_STOPPED_STATE": - verify_the_indicators(config.CHECK, "Used Cartridge Check") - verify_the_indicators(config.CHECK, "Occlusion Sensors Check") - verify_the_indicators(config.CHECK, "Pressure Sensors Check") - verify_the_indicators(config.CHECK, "Syringe Pump Check") + verify_indicators(config.CHECK, "Used Cartridge Check") + verify_indicators(config.CHECK, "Occlusion Sensors Check") + verify_indicators(config.CHECK, "Pressure Sensors Check") + verify_indicators(config.CHECK, "Syringe Pump Check") verify_completion_message_and_indicator(False, SELF_TEST_COMPLETION_MSG) else: - verify_the_indicators(config.CHECK, "Used Cartridge Check") - verify_the_indicators(config.CHECK, "Occlusion Sensors Check") - verify_the_indicators(config.CHECK, "Pressure Sensors Check") - verify_the_indicators(config.BUSY, "Syringe Pump Check") + verify_indicators(config.CHECK, "Used Cartridge Check") + verify_indicators(config.CHECK, "Occlusion Sensors Check") + verify_indicators(config.CHECK, "Pressure Sensors Check") + verify_indicators(config.BUSY, "Syringe Pump Check") verify_completion_message_and_indicator(True, SELF_TEST_COMPLETION_MSG) test.endSection() test.endSection() @@ -128,11 +128,11 @@ consumables_self_test_state=0, no_cartridge_self_test_state=0, installation_state=0, dry_self_test_state=0, prime_state=0, recirculate_state=index, patient_connection_state=0) - verify_the_indicators(config.CHECK, "Blood Circuit Priming") - verify_the_indicators(config.CHECK, "Dialysate Circuit Priming") - verify_the_indicators(config.BUSY, "Wet Self Tests") + verify_indicators(config.CHECK, "Blood Circuit Priming") + verify_indicators(config.CHECK, "Dialysate Circuit Priming") + verify_indicators(config.BUSY, "Wet Self Tests") verify_completion_message_and_indicator(True, PRIMING_COMPLETE_MSG) - verify_the_continue_button(config.ENABLED) + verify_continue_button(config.ENABLED) test.endSection() test.endSection() @@ -150,33 +150,33 @@ installation_state=0, dry_self_test_state=0, prime_state=index, recirculate_state=0, patient_connection_state=0) if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE") : - verify_the_indicators(None, PRIMING_STEPS) + verify_indicators(None, PRIMING_STEPS) if state == "HD_PRIME_WAIT_FOR_USER_START_STATE": verify_the_start_priming_button(config.ENABLED) else: verify_the_start_priming_button(config.DISABLED) - verify_the_continue_button(config.DISABLED) + verify_continue_button(config.DISABLED) elif (state == "HD_PRIME_SALINE_SETUP_STATE") or (state == "HD_PRIME_SALINE_PURGE_AIR_STATE") or (state == "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE") or (state == "HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_DIALYSER_STATE"): - verify_the_indicators(config.BUSY, "Blood Circuit Priming") + verify_indicators(config.BUSY, "Blood Circuit Priming") verify_the_start_priming_button(config.DISABLED) - verify_the_continue_button(config.DISABLED) + verify_continue_button(config.DISABLED) elif (state == "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_BYPASS_STATE"): - verify_the_indicators(config.CHECK, "Blood Circuit Priming") - verify_the_indicators(config.BUSY, "Dialysate Circuit Priming") - verify_the_start_priming_button(config.DISABLED) - verify_the_continue_button(config.DISABLED) + verify_indicators(config.CHECK, "Blood Circuit Priming") + verify_indicators(config.BUSY, "Dialysate Circuit Priming") + verify_start_priming_button(config.DISABLED) + verify_continue_button(config.DISABLED) elif (state == "HD_PRIME_WET_SELF_TESTS_STATE") or (state == "HD_PRIME_PAUSE"): - verify_the_indicators(config.CHECK, "Blood Circuit Priming") - verify_the_indicators(config.CHECK, "Dialysate Circuit Priming") - verify_the_start_priming_button(config.DISABLED) - verify_the_continue_button(config.DISABLED) + verify_indicators(config.CHECK, "Blood Circuit Priming") + verify_indicators(config.CHECK, "Dialysate Circuit Priming") + verify_start_priming_button(config.DISABLED) + verify_continue_button(config.DISABLED) else: - verify_the_indicators(config.CHECK, "Blood Circuit Priming") - verify_the_indicators(config.CHECK, "Dialysate Circuit Priming") - verify_the_indicators(config.BUSY, "Wet Self Tests") + verify_indicators(config.CHECK, "Blood Circuit Priming") + verify_indicators(config.CHECK, "Dialysate Circuit Priming") + verify_indicators(config.BUSY, "Wet Self Tests") verify_the_start_priming_button(config.DISABLED) verify_completion_message_and_indicator(False, PRIMING_COMPLETE_MSG) - verify_the_continue_button(config.DISABLED) + verify_continue_button(config.DISABLED) test.endSection() test.endSection() @@ -195,7 +195,7 @@ return indicators -def verify_the_indicators(indicator, steps): +def verify_indicators(indicator, steps): """ Method to verify the indicator next to each check list steps @@ -241,7 +241,7 @@ test.endSection() -def verify_the_start_priming_button(expected_state): +def verify_start_priming_button(expected_state): """ Method to verify the 'Start Prime' button is enabled @@ -256,7 +256,7 @@ test.endSection() -def verify_the_continue_button(expected_state): +def verify_continue_button(expected_state): """ Method to verify the 'Continue' button is enabled @@ -278,13 +278,13 @@ test.startSection("Verifying 'Self Dry Test' screen") navigate_self_test_dry_screen() - utility.verify_the_countdown(config.BEGIN_PRIME_TITLE) + utility.verify_countdown(config.BEGIN_PRIME_TITLE) verify_dry_states() test.endSection() test.startSection("Verifying 'Priming' screen") navigate_to_priming_screen() - utility.verify_the_countdown(config.PRIMING_TITLE) + utility.verify_countdown(config.PRIMING_TITLE) verify_priming_states() verify_priming_recirculate_states() test.endSection()