Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -rd3bf374c35bfa0f897b1c3637e43cfc7166d99e7 -r58a2be77a9b05cb5f8007dbc1941a91ee37ae15d --- tst_ui_alarms_dialog/test.py (.../test.py) (revision d3bf374c35bfa0f897b1c3637e43cfc7166d99e7) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 58a2be77a9b05cb5f8007dbc1941a91ee37ae15d) @@ -156,13 +156,14 @@ 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) + #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_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.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]") #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) @@ -173,14 +174,14 @@ 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) + #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=0, no_minimize=1) 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.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): @@ -268,6 +269,7 @@ if alarm_id == config.ALARM_ID_NO_ALARM: test.log("validate alarm condition for alarm id : 0") alarm.cmd_set_alarm_cleared_condition(alarm_id = 0) + alarm.cmd_activate_alarm_id(0, 0, 0, 0, 0) utils.waitForGUI() dlg = names.o_modalDialog bar = names.o_alarm_bar