Index: shared/scripts/configuration/config.py =================================================================== diff -u -rce5a0db0c7033fbf15d8725a4e9973372a611c92 -r12616c1433e07f9fad99a5a5cf5243cf5b38d7a5 --- shared/scripts/configuration/config.py (.../config.py) (revision ce5a0db0c7033fbf15d8725a4e9973372a611c92) +++ shared/scripts/configuration/config.py (.../config.py) (revision 12616c1433e07f9fad99a5a5cf5243cf5b38d7a5) @@ -44,9 +44,9 @@ ACCEPTED = True REJECTED = False -NUM_OF_ALARM_ID = 296 +NUM_OF_ALARM_ID = 291 ALARM_ID_NO_ALARM = 0 -ALARM_ID_OUT_OF_RANGE = 296 +ALARM_ID_OUT_OF_RANGE = 291 # alarm colors ALARMS_COLORS_HEADER = { Index: shared/scripts/names.py =================================================================== diff -u -r5c6c2daa8dc7d453535a9e9f59df872e81d805ca -r12616c1433e07f9fad99a5a5cf5243cf5b38d7a5 --- shared/scripts/names.py (.../names.py) (revision 5c6c2daa8dc7d453535a9e9f59df872e81d805ca) +++ shared/scripts/names.py (.../names.py) (revision 12616c1433e07f9fad99a5a5cf5243cf5b38d7a5) @@ -14,7 +14,8 @@ o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} o_Overlay = {"container": o_Gui_MainView, "type": "Overlay", "unnamed": 1, "visible": True} o_borderRect_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_borderRect", "type": "Rectangle", "unnamed": 1, "visible": True} -o_minimizeButton_UpDownButton = {"container": o_Overlay, "gradient": 0, "id": "_minimizeButton", "type": "UpDownButton", "unnamed": 1, "visible": True} +# o_minimizeButton_UpDownButton = {"container": o_Overlay, "gradient": 0, "id": "_minimizeButton", "type": "UpDownButton", "unnamed": 1, "visible": True} +o_minimizeButton_UpDownButton = {"container": o_Overlay, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_shape_Shape = {"container": o_Gui_MainView, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True} o_PreTreatmentCreateStack_PreTreatmentCreateStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentCreateStack", "type": "PreTreatmentCreateStack", "visible": True} o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} @@ -71,17 +72,26 @@ o_alarm_id = {"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} #alarm dialog o_alarm_dialog_content = {"container": o_Overlay , "objectName": "_NotificationDialog" , "type": "ContentItem" } -o_alarm_dialog_titleBar = {"container": o_alarm_dialog_content , "id" : "_titleBar" , "type": "Rectangle" } -o_alarm_button_minimize = {"container": o_alarm_dialog_content , "id" : "_minimizeButton" , "type": "UpDownButton" ,"visible": True } -o_alarm_button_mute = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} +o_alarm_dialog_titleBar = {"container": o_Overlay , "id" : "_titleBar" , "type": "Rectangle" } +o_alarm_button_minimize = {"container": o_Overlay , "id" : "_minimizeButton" , "type": "UpDownButton" ,"visible": True } +o_alarm_button_mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton", "visible": True} +# o_alarm_button_mute = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} o_alarm_button_mute_img = {"container": o_alarm_button_mute , "id" : "_image" , "type": "Image", "unnamed": 1, "visible": True} o_alarm_button_mute_min = {"container": o_alarm_button_mute , "id" : "_hourText" , "type": "Text" } o_alarm_button_mute_sec = {"container": o_alarm_button_mute , "id" : "_minuteText" , "type": "Text" } o_alarm_button_row = {"container": o_alarm_dialog_content , "id" : "_buttonGroup" , "type": "Row" } -o_alarm_button_resume = {"container": o_alarm_button_row , "id" : "_resumeTouchRect" , "type": "TouchRect" } -o_alarm_button_rinseback = {"container": o_alarm_button_row , "id" : "_rinsebackTouchRect" , "type": "TouchRect" } -o_alarm_button_end = {"container": o_alarm_button_row , "id" : "_endTouchRect" , "type": "TouchRect" } -o_alarm_button_ok = {"container": o_alarm_button_row , "id" : "_okTouchRect" , "type": "TouchRect" } +o_alarm_button_resume = {"container": o_Overlay , "id" : "_resumeTouchRect" , "type": "TouchRect" } +o_resume_mouse_Area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} +o_resume_button_mouse_Area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": False} +o_alarm_button_rinseback = {"container": o_Overlay , "id" : "_rinsebackTouchRect" , "type": "TouchRect" } +o_rinseback_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": False} +o_rinseback_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": True} +o_alarm_button_end = {"container": o_Overlay , "id" : "_endTouchRect" , "type": "TouchRect" } +o_end_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} +o_end_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": False} +o_alarm_button_ok = {"container": o_Overlay , "id" : "_okTouchRect" , "type": "TouchRect" } +o_ok_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} +o_ok_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} o_alarm_text_description = {"container": o_alarm_dialog_content , "id" : "_desc" , "type": "Text" } o_alarm_bar = {"container": o_QQuickView , "id" : "_alarmBar" , "type": "NotificationBar" } o_alarm_bar_text = {"container": o_alarm_bar , "id" : "_text" , "type": "Text" } @@ -92,8 +102,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} +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} o_blood_priming_value_by_default = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True} Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -reb47b728e03c07a2ecb47a858983bfbbc9ad657e -r12616c1433e07f9fad99a5a5cf5243cf5b38d7a5 --- tst_ui_alarms_dialog/test.py (.../test.py) (revision eb47b728e03c07a2ecb47a858983bfbbc9ad657e) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 12616c1433e07f9fad99a5a5cf5243cf5b38d7a5) @@ -151,20 +151,22 @@ vButtons == config.ALARM_BUTTONS_END_RESUME_RINSEBACK , "Button visible [End]") - obj = waitForObjectExists(names.o_alarm_button_ok) + obj = waitForObjectExists(names.o_ok_button_mouse_area) if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) - obj = waitForObjectExists(names.o_alarm_button_resume) + obj = waitForObjectExists(names.o_resume_button_mouse_Area) if obj.visible : mouseClick(obj) - - obj = waitForObjectExists(names.o_alarm_button_rinseback) + utils.waitForGUI(0.5) + + obj = waitForObjectExists(names.o_rinseback_mouse_area) if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) - obj = waitForObjectExists(names.o_alarm_button_end) + obj = waitForObjectExists(names.o_end_button_mouse_area) if obj.visible : mouseClick(obj) + utils.waitForGUI(0.5) - utils.waitForGUI(1) - alarm.cmd_alarm_condition_cleared(alarm_id = 1) def test_all_buttons(): @@ -174,15 +176,15 @@ @output N/A """ - obj = waitForObjectExists(names.o_alarm_button_resume) + obj = waitForObjectExists(names.o_resume_mouse_Area) if obj.visible : mouseClick(obj) test.compare(waitForObjectExists(names.o_alarm_button_resume ).visible, True ,"Button visible [Resume]") - obj = waitForObjectExists(names.o_alarm_button_rinseback) + obj = waitForObjectExists(names.o_rinseback_button_mouse_area) if obj.visible : mouseClick(obj) test.compare(waitForObjectExists(names.o_alarm_button_rinseback ).visible, True ,"Button visible [RINSEBACK]") - obj = waitForObjectExists(names.o_alarm_button_end) + obj = waitForObjectExists(names.o_end_mouse_area) if obj.visible : mouseClick(obj) test.compare(waitForObjectExists(names.o_alarm_button_end ).visible, True ,"Button visible [End]") Index: tst_ui_alarms_list/test.py =================================================================== diff -u -rce5a0db0c7033fbf15d8725a4e9973372a611c92 -r12616c1433e07f9fad99a5a5cf5243cf5b38d7a5 --- tst_ui_alarms_list/test.py (.../test.py) (revision ce5a0db0c7033fbf15d8725a4e9973372a611c92) +++ tst_ui_alarms_list/test.py (.../test.py) (revision 12616c1433e07f9fad99a5a5cf5243cf5b38d7a5) @@ -479,31 +479,20 @@ def main(): -# verify_alarmMapping_csv() -# + verify_alarmMapping_csv() + utils.tstStart(__file__) startApplication(config.AUT_NAME) - utils.waitForGUI(1) -# verify_alarm_list_when_minimize_button_is_available(accept=config.ACCEPTED, reason_id=0) -# -# utils.waitForGUI(1) -# verify_alarm_list_when_minimize_button_is_available(accept=config.REJECTED, reason_id=20) -# -# utils.waitForGUI(1) -# verify_alarm_list_when_only_alarm_list_button_is_available(accept=config.ACCEPTED, reason_id=0) -# utils.waitForGUI(1) -# verify_alarm_list_when_only_alarm_list_button_is_available(accept=config.REJECTED, reason_id=7) - generate_alarm_ids(accept=config.ACCEPTED, reason_id=0) -# utils.waitForGUI(1) -# verify_alarm_msg_for_undefined_alarm_id() -# -# utils.waitForGUI(1) -# verify_alarm_dialogue_is_displayed(id=1000, state=AlarmPriorities.ALARM_PRIORITY_MEDIUM.value) -# -# utils.tstDone() + utils.waitForGUI(1) + verify_alarm_msg_for_undefined_alarm_id() + + utils.waitForGUI(1) + verify_alarm_dialogue_is_displayed(id=1000, state=AlarmPriorities.ALARM_PRIORITY_MEDIUM.value) + + utils.tstDone() \ No newline at end of file