Index: tst_AlarmStatusData/test.py =================================================================== diff -u -r8e2d609349eacfe609a48bc6a332d74d102c212d -r310f51a5ed4921f184572f90d07b350ec41c0bae --- tst_AlarmStatusData/test.py (.../test.py) (revision 8e2d609349eacfe609a48bc6a332d74d102c212d) +++ tst_AlarmStatusData/test.py (.../test.py) (revision 310f51a5ed4921f184572f90d07b350ec41c0bae) @@ -14,7 +14,9 @@ import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils +from dialin import HDSimulator +HDSimulator = HDSimulator() # buttons position/definition in alarm flags @@ -200,7 +202,6 @@ startApplication(names.AUT_NAME + " -q") utils.waitForGUI(1) - # --------------------- Alarm Dialog: test the buttons for buttons in (alarm_buttons_Ok , alarm_buttons_Resume , @@ -210,35 +211,35 @@ alarm_buttons_Resume_End , alarm_buttons_RinseBack_End , alarm_buttons_Resume_RinseBack_End ): - denaliMessages.setAlarmStatus(1, 1, 0, 0, buttons) + HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, 1, 0, 0, buttons) test_buttons ( buttons) ## -------------------- Alarm Dialog/Bar: test silence # --------------------- Alarm Dialog/Bar: not muted for mute_timeout in (0, 40, 40, 60, 75, 75): - denaliMessages.setAlarmStatus(1, 1 ,0, mute_timeout, alarm_flag_unmute) + HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, 1 ,0, mute_timeout, alarm_flag_unmute) test_silence ( mute_timeout, alarm_flag_unmute) # --------------------- Alarm Dialog/Bar: muted mouseClick(waitForObject(names.o_alarm_button_mute)) for mute_timeout in (0, 10, 20, 30, 30, 100): - denaliMessages.setAlarmStatus(1, 2 ,0, mute_timeout, alarm_flag_mute) + HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, 2 ,0, mute_timeout, alarm_flag_mute) test_silence ( mute_timeout, alarm_flag_mute) ## -------------------- Alarm Dialog/Bar: test alarm messages mouseClick(waitForObject(names.o_alarm_button_mute)) for alarm_id in (5, 5 , 6, 7, 8, 9, 10, 10, alarm_id_outofrange, alarm_id_outofrange, alarm_id_noalarm, alarm_id_noalarm): # not all of alarms are required to be tested. - denaliMessages.setAlarmStatus(1, alarm_id, 0, 0, 0) + HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, alarm_id, 0, 0, 0) test_messages ( alarm_id ) ## -------------------- Alarm Dialog/Bar: test alarm priority colors for alarm_priority in alarm_priorities: - denaliMessages.setAlarmStatus(alarm_priority, 1, 0, 0, 0) + HDSimulator.alarms_simulator.cmd_activate_alarm_id(alarm_priority, 1, 0, 0, 0) test_colors (alarm_priority )