Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r0b9e1c4d2429e9ad58420f00a52adf8ec800ef35 -r0dc92661c3b8e321499fdfcc08ec20bb96676fb6 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 0b9e1c4d2429e9ad58420f00a52adf8ec800ef35) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 0dc92661c3b8e321499fdfcc08ec20bb96676fb6) @@ -64,27 +64,30 @@ o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } o_VersionColumn = {"container": o_Overlay, "id": "_versionColumn", "type": "Column", "unnamed": 1 } -# General Alarm Requirements Instruction -o_AlarmButton_Mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton" } -o_AlarmButton_Mute_Min = {"container": o_AlarmButton_Mute, "id": "_hourText", "type": "Text" } -o_AlarmButton_Mute_Sec = {"container": o_AlarmButton_Mute, "id": "_minuteText", "type": "Text" } -o_AlarmButton_Mute_Img = {"container": o_AlarmButton_Mute, "id": "_image", "type": "Image", "unnamed": 1 } -o_Alarm_Bar = {"container": o_QQuickView, "id": "_alarmBar", "type": "NotificationBar" } -o_Alarm_Bar_Mute_Img = {"container": o_Alarm_Bar, "id": "_image", "type": "Image" } -o_Alarm_Bar_Mute_Min = {"container": o_Alarm_Bar, "id": "_hourText", "type": "Text" } -o_Alarm_Bar_Mute_Sec = {"container": o_Alarm_Bar, "id": "_minuteText", "type": "Text" } -o_AlarmsList_IconButton = {"container": o_Overlay, "id": "_alarmsList", "type": "IconButton", "unnamed": 1 } -o_AlarmButton_Minimize = {"container": o_Overlay, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } -o_AlarmButton_Maximize = {"container": o_Gui_MainView, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } -o_Alarm_Dialog_TitleBar = {"container": o_Overlay , "id": "_titleBar", "type": "Rectangle" } -o_Alarm_List = {"container": o_Overlay, "id": "_grid", "type": "Grid" } -o_AlarmReject_Notification_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text" } -o_Alarm_Ok_Button = {"container": o_Overlay, "id": "_okTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_Resume_Button = {"container": o_Overlay, "id": "_resumeTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_Rinseback_Button = {"container": o_Overlay, "id": "_rinsebackTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_End_Treatment_Button = {"container": o_Overlay, "id": "_endTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_timerRect_Rectangle = {"container": o_Overlay, "id": "_timerRect", "type": "Rectangle", "unnamed": 1 } - +# General Alarm Requirements Instruction +o_AlarmButton_Mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton", } +o_AlarmButton_Mute_Min = {"container": o_AlarmButton_Mute, "id": "_hourText", "type": "Text", } +o_AlarmButton_Mute_Sec = {"container": o_AlarmButton_Mute, "id": "_minuteText", "type": "Text", } +o_AlarmButton_Mute_Img = {"container": o_AlarmButton_Mute, "id": "_image", "type": "Image", "unnamed": 1 } +o_Alarm_Minimized_hour_Text = {"container": o_Gui_MainView, "objectName": "_TimeText_hour", "type": "Text", "visible": True } +o_Alarm_Minimized_minute_Text = {"container": o_Gui_MainView, "objectName": "_TimeText_minute", "type": "Text", "visible": True } +#The 'visible' property is required here and This allows Squish to correctly find the object and get its text +o_Alarm_Minimized_Mute_Img = {"container": o_Gui_MainView, "id": "_image", "source": "qrc:/images/iBellOff", "type": "Image", "unnamed": 1 } +o_Alarm_Minimized_Unmute_Img = {"container": o_Gui_MainView, "id": "_image", "source": "qrc:/images/iBellOn", "type": "Image", "unnamed": 1 } +o_Alarm_titleBar_Rectangle = {"container": o_Overlay, "id": "_titleBar", "type": "Rectangle", "unnamed": 1 } +o_AlarmsList_IconButton = {"container": o_Overlay, "id": "_alarmsList", "type": "IconButton", "unnamed": 1 } +o_AlarmButton_Minimize = {"container": o_Overlay, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } +o_AlarmButton_Maximize = {"container": o_Gui_MainView, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } +o_Alarm_Dialog_TitleBar = {"container": o_Overlay, "id": "_titleBar", "type": "Rectangle", } +o_Alarm_List = {"container": o_Overlay, "id": "_grid", "type": "Grid", } +o_AlarmReject_Notification_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text", } +o_Alarm_Ok_Button = {"container": o_Overlay, "id": "_okTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_Resume_Button = {"container": o_Overlay, "id": "_resumeTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_Rinseback_Button = {"container": o_Overlay, "id": "_rinsebackTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_End_Treatment_Button = {"container": o_Overlay, "id": "_endTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_timerRect_Rectangle = {"container": o_Overlay, "id": "_timerRect", "type": "Rectangle", "unnamed": 1 } +o_Alarm_temporaryBreak_Button = {"container": o_Overlay, "type": "Text", "unnamed": 1 } + #ultrafiltration o_treatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration" } o_editButton_ultrafiltration_IconButton = {"container": o_treatmentUltrafiltration, "id": "_editButton", "type": "IconButton", "unnamed": 1 } Index: suite_leahi/tst_general_alarm_requirements_instruction/test.py =================================================================== diff -u -rf76dd433d5475331775ab0a0a42c530e0d46d521 -r0dc92661c3b8e321499fdfcc08ec20bb96676fb6 --- suite_leahi/tst_general_alarm_requirements_instruction/test.py (.../test.py) (revision f76dd433d5475331775ab0a0a42c530e0d46d521) +++ suite_leahi/tst_general_alarm_requirements_instruction/test.py (.../test.py) (revision 0dc92661c3b8e321499fdfcc08ec20bb96676fb6) @@ -162,12 +162,12 @@ minimize() test.compare( - utility.get_object_color(names.o_Alarm_Bar, 2000), + utility.get_object_color(names.o_Alarm_titleBar_Rectangle, 2000), config.ALARMS_COLORS_HEADER[config.ALARM_PRIORITY_OPTIONS[alarm_priority]], "Comparison of Alarm Bar Color After Alarm minimized", ) - maximize() + test.endSection() @@ -222,17 +222,17 @@ ) minimize() test.compare( - utility.get_object_source_path(names.o_Alarm_Bar_Mute_Img, 2000), + utility.get_object_source_path(names.o_Alarm_Minimized_Mute_Img), "/images/iBellOff", "Comparison of Alarm BellOff After minimized", ) test.compare( - utility.get_object_text(names.o_Alarm_Bar_Mute_Min, 2000), + utility.get_object_text(names.o_Alarm_Minimized_hour_Text, 2000), "{}".format(muteTimeout_min), "Comparison of Mute Minutes After minimized", ) test.compare( - utility.get_object_text(names.o_Alarm_Bar_Mute_Sec, 2000), + utility.get_object_text(names.o_Alarm_Minimized_minute_Text, 3000), "{0:02}".format(muteTimeout_sec), "Comparison of Mute seconds After minimized", ) @@ -245,7 +245,7 @@ ) minimize() test.compare( - utility.get_object_source_path(names.o_Alarm_Bar_Mute_Img, 2000), + utility.get_object_source_path(names.o_Alarm_Minimized_Unmute_Img, 2000), "/images/iBellOn", "Comparison of Alarm BellOn After minimized", ) @@ -384,8 +384,7 @@ parent_container, config.ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION ) - test.compare( - alarm_countdown_description.text, + test.compare( alarm_countdown_description.text, config.ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION, f"Comparison of Alarm Blood Stop Countdown Description Text", ) @@ -428,7 +427,7 @@ def main(): utils.tstStart(__file__) - startApplication(utility.aut()) + startApplication(utility.aut("-q")) verification_of_alarm_parameters() verification_of_alarm_flag() test_send_active_list_response_batch_alarms()