Index: shared/scripts/configuration/strings.py =================================================================== diff -u -rab93cf9a55ce63ce83a05af7f9d8514fd2a497f6 -rf2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb --- shared/scripts/configuration/strings.py (.../strings.py) (revision ab93cf9a55ce63ce83a05af7f9d8514fd2a497f6) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision f2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb) @@ -15,6 +15,8 @@ #recirculate screens RECIRCULATE_TEXT = "Recirculate" RECONNECT_BUTTON_TEXT = "RECONNECT" +END_TREATMENT_BUTTON_TEXT = "END TREATMENT" +BACK_TO_RECIRCULATE_TEXT = "BACK TO RECIRCULATE" RECONNECT_TEXT = "Reconnect" #Blood Priming Index: shared/scripts/names.py =================================================================== diff -u -r6c88a2beef01f7961d99b85bdf227c2d4ab79228 -rf2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb --- shared/scripts/names.py (.../names.py) (revision 6c88a2beef01f7961d99b85bdf227c2d4ab79228) +++ shared/scripts/names.py (.../names.py) (revision f2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb) @@ -66,6 +66,12 @@ o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RECONNECT", "type": "Text", "unnamed": 1, "visible": True} #Reconnect button text o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True} +#End Treatment button text +o_EndTreatmentBase_END_TREATMENT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True} +#Back to recirculate button text +o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "BACK TO RECIRCULATE", "type": "Text", "unnamed": 1, "visible": True} +#Recirculate stop state confirm button text +o_EndTreatmentBase_confirm_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "type": "Text", "unnamed": 1, "visible": True} #Recirculate timer seconds object o_EndTreatmentBase_TimeText_minute_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "objectName": "_TimeText_minute", "type": "Text", "visible": True} #Recirculate timer minutes object Index: tst_recirculate/test.py =================================================================== diff -u -rab93cf9a55ce63ce83a05af7f9d8514fd2a497f6 -rf2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb --- tst_recirculate/test.py (.../test.py) (revision ab93cf9a55ce63ce83a05af7f9d8514fd2a497f6) +++ tst_recirculate/test.py (.../test.py) (revision f2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb) @@ -35,6 +35,7 @@ Method to verify Treatment Recirculate Recirculate state screens """ test.startSection("verifying Treatment Recirculate Recirculate state screens") + hd_simulator.cmd_set_treatment_time(sec_total = 120, sec_elapsed = 20, sec_remain = 100) hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_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= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, @@ -52,6 +53,9 @@ test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).text), config.RECONNECT_BUTTON_TEXT, "Reconnect button text must be {}".format(config.RECONNECT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).enabled, "Reconnect button must be active") mouseClick(waitForObject(names.o_EndTreatmentBase_RECONNECT_Text)) + test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "End Treatment button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT)) + test.verify(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).enabled, "End Treatment button on recirculate state screen must be active") + mouseClick(waitForObject(names.o_EndTreatmentBase_END_TREATMENT_Text)) verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION) verify_left_instruction_in_recirculate_state(NUM_OF_INSTRUCTION) verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION) @@ -77,6 +81,14 @@ test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_hour_Text).text), str(min),"Verifying minutes on Timer in recirculate stopped state") test.endSection() test.compare(str(waitForObject(names.o_EndTreatmentBase_Reconnect_Text).text), config.RECONNECT_TEXT, "Reconnect text must be {}".format(config.RECONNECT_TEXT)) + test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text).text), config.BACK_TO_RECIRCULATE_TEXT, "Back to recirculate button text must be {}".format(config.BACK_TO_RECIRCULATE_TEXT)) + test.verify(waitForObjectExists(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text).enabled, "Back to recirculate button must be active") + mouseClick(waitForObject(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text)) + test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "End Treatment button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT)) + test.verify(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).enabled, "End Treatment button on recirculate stopped state screen must be active") + mouseClick(waitForObject(names.o_EndTreatmentBase_END_TREATMENT_Text)) + test.verify(waitForObjectExists(names.o_EndTreatmentBase_confirm_Text).enabled, "Confirm button on recirculate stopped state screen must be active") + mouseClick(waitForObject(names.o_EndTreatmentBase_confirm_Text)) verify_rejection_messages_for_recirculate() test.endSection()