Index: shared/scripts/names.py =================================================================== diff -u -r6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03 -r8e6ac91b167d60d4a8c1f2110e51ae7d423f66b7 --- shared/scripts/names.py (.../names.py) (revision 6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03) +++ shared/scripts/names.py (.../names.py) (revision 8e6ac91b167d60d4a8c1f2110e51ae7d423f66b7) @@ -91,6 +91,8 @@ o_EndTreatmentRinsebackComplete_Back_to_treatment_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True} #Rinseback Additional rinseback text o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True} +#Rinseback complete confirm button +o_EndTreatmentRinsebackComplete_Confirm_Button = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True} #Rinseback setup Progress circle o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_Circle", "type": "ProgressCircle", "visible": True} #Rinseback Title text Index: tst_rinseback_setup/test.py =================================================================== diff -u -r6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03 -r8e6ac91b167d60d4a8c1f2110e51ae7d423f66b7 --- tst_rinseback_setup/test.py (.../test.py) (revision 6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03) +++ tst_rinseback_setup/test.py (.../test.py) (revision 8e6ac91b167d60d4a8c1f2110e51ae7d423f66b7) @@ -29,6 +29,8 @@ COUNT_DOWN_VALUE = 120 COUNT_DOWN_DEFAULT_VALUE = 0 TIMER_DEFAULT_VALUE = 1 +SEC_ELAPSED = 20 +SEC_REMAINING = 100 NUM_OF_INSTRUCTION = 3 def set_custom_object_property_rinseback_ml(text, container): @@ -46,7 +48,7 @@ Method to navigate and verify to Rinseback Stop INIT state screens """ test.startSection("verifying Rinseback Stop INIT state screens") - hd_simulator.cmd_set_treatment_time(sec_total = 120, sec_elapsed = 20, sec_remain = 100) + hd_simulator.cmd_set_treatment_time(sec_total = COUNT_DOWN_VALUE, sec_elapsed = SEC_ELAPSED, sec_remain = SEC_REMAINING) hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDOpSubModes.SUBMODE_START.value) hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, @@ -146,14 +148,12 @@ Method to navigate and verify to Rinseback Stop state screens """ test.startSection("verifying Rinseback Stop state screens") -# hd_simulator.cmd_send_treatment_rinseback_data(target_vol = 2, current_vol = 1, flow_rate = 1, timeout = 4, -# timeout_countdown = 8, is_completed = True) hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) test.startSection("Verifying count down value of timer in " + config.RINSEBACK_COMPLETE_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): - hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed= 0) + hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed=True) min = utility.convert_seconds_into_min_and_sec(num, time_format="%M") sec = utility.convert_seconds_into_min_and_sec(num, time_format="%S") test.compare(str(waitForObject(names.o_EndTreatmentRinsebackComplete_TimeText_minute_Text).text),str(sec), "Verifying seconds on timer in" + config.RINSEBACK_COMPLETE_TEXT) @@ -170,6 +170,8 @@ test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text).text), config.BACK_TO_TREATMENT_BUTTON_TEXT, "BACK TO TREATMENT button text must be {}".format(config.BACK_TO_TREATMENT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text).enabled, "BACK TO TREATMENT button on rinse back complete screen must be active") mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text)) + test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Confirm_Button).enabled, "Confirm button on rinse back complete screen must be enabled") + mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_Confirm_Button)) verify_rinseback_rejection_msg() test.endSection()