Index: shared/scripts/names.py =================================================================== diff -u -r196ab367532a1829d88d42e304592bb20f242924 -ra913fb6ac1f72e4ae024c717b4524d6d0f89b4ee --- shared/scripts/names.py (.../names.py) (revision 196ab367532a1829d88d42e304592bb20f242924) +++ shared/scripts/names.py (.../names.py) (revision a913fb6ac1f72e4ae024c717b4524d6d0f89b4ee) @@ -89,6 +89,8 @@ o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True} o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True} o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True} +o_alarm_not_silence_img = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} +o_alarm_silence_img = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} #in-treatment o_blood_priming = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True} Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -r0d9927860bbb47002720c9138fdce9fa9cb43a9c -ra913fb6ac1f72e4ae024c717b4524d6d0f89b4ee --- tst_ui_alarms_dialog/test.py (.../test.py) (revision 0d9927860bbb47002720c9138fdce9fa9cb43a9c) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision a913fb6ac1f72e4ae024c717b4524d6d0f89b4ee) @@ -141,25 +141,48 @@ flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=1) alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) test_all_buttons() - flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=0, no_minimize=0, alarms_silenced=1) + flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, alarms_silenced=1) alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) test_all_buttons() - flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=0, no_minimize=1, alarms_silenced=0) + flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, no_minimize=1) alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) test_all_buttons() - - #enables all the flags at same time - flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=1, alarms_silenced=1, no_minimize=1) + #enables and verifies user must acknowledge flag + flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=1, alarms_silenced=0, no_minimize=0) alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) test.compare(waitForObjectExists(names.o_alarm_button_ok ).visible, True ,"Button visible [OK]") test.compare(waitForObjectExists(names.o_alarm_button_resume ).visible, True ,"Button visible [Resume]") test.compare(waitForObjectExists(names.o_alarm_button_rinseback ).visible, True ,"Button visible [RINSEBACK]") test.compare(waitForObjectExists(names.o_alarm_button_end ).visible, True ,"Button visible [End]") + #enables and verifies alarm no minimize flag + flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=0, alarms_silenced=1, no_minimize=1) + alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) + test.compare(waitForObjectExists(names.o_alarm_button_ok ).visible, False ,"Button not visible [OK]") + test.compare(waitForObjectExists(names.o_alarm_button_resume ).visible, True ,"Button visible [Resume]") + test.compare(waitForObjectExists(names.o_alarm_button_rinseback ).visible, True ,"Button visible [RINSEBACK]") + test.compare(waitForObjectExists(names.o_alarm_button_end ).visible, True ,"Button visible [End]") + + #enables and verifies alarm silence flag + flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=0, no_minimize=0, alarms_silenced=1) + alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) + test.compare(waitForObjectExists(names.o_alarm_silence_img ).visible, True ,"Alarm silence button is visible") + test.compare(waitForObjectExists(names.o_alarm_button_ok ).visible, False ,"Button not visible [OK]") + test.compare(waitForObjectExists(names.o_alarm_button_resume ).visible, True ,"Button visible [Resume]") + test.compare(waitForObjectExists(names.o_alarm_button_rinseback ).visible, True ,"Button visible [RINSEBACK]") + test.compare(waitForObjectExists(names.o_alarm_button_end ).visible, True ,"Button visible [End]") + + #enables and verifies no alarm silence flag + flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=0, no_minimize=0, alarms_silenced=0) + alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag_status) + test.compare(waitForObjectExists(names.o_alarm_not_silence_img ).visible, True ,"Alarm not silence button is visible") + test.compare(waitForObjectExists(names.o_alarm_button_ok ).visible, False ,"Button not visible [OK]") + test.compare(waitForObjectExists(names.o_alarm_button_resume ).visible, True ,"Button visible [Resume]") + test.compare(waitForObjectExists(names.o_alarm_button_rinseback ).visible, True ,"Button visible [RINSEBACK]") + test.compare(waitForObjectExists(names.o_alarm_button_end ).visible, True ,"Button visible [End]") test.endSection() - def test_color_based_on_alarm_priority(alarm_priority): """ Method to verify alarm dialog box color based on alarm priority @@ -308,7 +331,7 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) - + verification_of_alarm_messages() verification_of_alarm_parameters() verification_of_alarm_flag()