Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -r466c4dd33fcc6f9dcd28d4d75cf6f437f1280ce5 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_ui_alarms_dialog/test.py (.../test.py) (revision 466c4dd33fcc6f9dcd28d4d75cf6f437f1280ce5) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -15,7 +15,7 @@ import names import logging from dialin.ui import utils -from configuration import config +from configuration import config, utility from dialin.ui.hd_simulator import HDSimulator from dialin.protocols.CAN import DenaliCanMessenger from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator @@ -30,7 +30,7 @@ alarms_msgs = [] count_of_alarms = [] title_count_dict = {} -text_obj_names = [names.o_alarm_title_text,names.o_alarm_id,names.o_alarm_dialogue_box_msg ] +text_obj_names = [names.o_alarm_title_text,names.o_alarm_id_text,names.o_alarm_dialogue_box_msg ] logging.basicConfig(filename='log_file.log',level=logging.INFO, datefmt='%d-%b-%y %H:%M:%S') hd_simulator = HDSimulator() logger = logging.getLogger("INFO") @@ -152,22 +152,23 @@ vButtons == config.ALARM_BUTTONS_END_RESUME_RINSEBACK , "Button visible [End]") - obj = waitForObjectExists(names.o_ok_button_mouse_area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) - - obj = waitForObjectExists(names.o_resume_button_mouse_Area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) + if waitForObjectExists(names.o_alarm_button_ok ).visible: # Ok button + obj = waitForObjectExists(names.o_ok_button_mouse_area) + if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) + if waitForObjectExists(names.o_alarm_button_resume ).visible: # Resume button + obj = waitForObjectExists(names.o_resume_button_mouse_Area) + if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) + if waitForObjectExists(names.o_alarm_button_rinseback ).visible: # Rinse back button + obj = waitForObjectExists(names.o_rinseback_mouse_area) + if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) + if waitForObjectExists(names.o_alarm_button_end ).visible: # End button + obj = waitForObjectExists(names.o_end_button_mouse_area) + if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) - obj = waitForObjectExists(names.o_rinseback_mouse_area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) - - obj = waitForObjectExists(names.o_end_button_mouse_area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) - alarm.cmd_alarm_condition_cleared(alarm_id = 1) def test_all_buttons(): @@ -284,10 +285,11 @@ test.endSection() -def test_message_based_on_alarm_id(alarm_id): +def test_message_based_on_alarm_id(alarm_id, alarm_info_dict): """ Method to verify alarm message based on alarm id @param alarm id - (int) alarm id to be set. + @param alarm_info_dict - (dict) Alarm dict containing title and alarm message @output N/A """ test.startSection("verification of alarm message based on alarm id -> " + str(alarm_id)) @@ -298,21 +300,20 @@ test.compare(str(waitForObjectExists(names.o_alarm_bar_text ).text), config.UNDEFINED_ALARM_ID_MSG.format(alarm_id), "verified alarm message for exceeded alarm id's") else: test.log(str(alarm_id)) - test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), config.ALARM_ID_AND_ALARM_MESSAGES[alarm_id], "Alarm message is verified from alarm dialog box") +# utils.waitForGUI(0.5) + test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_info_dict[alarm_id]['message'], "Alarm message is verified from alarm dialog box") minimize() - test.compare(str(waitForObjectExists(names.o_alarm_bar_text ).text), config.ALARM_ID_AND_ALARM_MESSAGES[alarm_id], "Alarm message is verified from alarm bar") + test.compare(str(waitForObjectExists(names.o_alarm_bar_text ).text), alarm_info_dict[alarm_id]['title'], "Alarm title is verified from alarm bar") maximize() if alarm_id < config.NUM_OF_ALARM_ID: - alarm_title = read_message_title_from_alarms_conf_file(alarm_id) - test.compare(str(waitForObjectExists(names.o_alarm_id ).text), alarm_title, "Alarm message is verified from alarm bar") - - 'TODO: Empty message discription for some of the alarm ids from Alarms.conf. Dynamic verification kept as hold.' - #alarm_message = read_alarm_message_from_alarms_conf_file(alarm_id) - #test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_message, "Alarm message is verified from alarm dialog box") + alarm_id_text = f"ID:{alarm_id}" + test.compare(str(waitForObjectExists(names.o_alarm_screen_id ).text), alarm_id_text, "Alarm id is verified from alarm dialog box") + alarm_message = alarm_info_dict[alarm_id]['message'] + test.com6pare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_message, "Alarm message is verified from alarm dialog box") test.endSection() - +#Check this function def test_verify_alarm_mute(alarm_timeout = 0, v_flags = 0, alarm_status = "Mute"): """ Method to verify alarm mute and unmute characteristics. @@ -354,7 +355,9 @@ @output N/A """ test.startSection("verification of alarm bar parameters") + alarm_info_dict = utility.extract_alarm_info_from_alarms_conf_file() for alarm_id in range(0, config.NUM_OF_ALARM_ID): +# for alarm_id in [73]: if alarm_id == config.ALARM_ID_NO_ALARM: test.log("validate alarm condition for alarm id : 0") @@ -378,7 +381,7 @@ alarm.cmd_activate_alarm_id( alarm = alarm_id) #verify alarm message based on id on alarm bar section. - test_message_based_on_alarm_id(alarm_id) + test_message_based_on_alarm_id(alarm_id, alarm_info_dict) test.endSection() @@ -423,7 +426,6 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) - verification_of_alarm_messages() verification_of_alarm_parameters() verification_of_alarm_flag()