Index: shared/scripts/names.py =================================================================== diff -u -r53da790343ac7d1554b51465dbf1483d84772050 -r84797bef0eb4a0898718fde40d11e5f69d568c09 --- shared/scripts/names.py (.../names.py) (revision 53da790343ac7d1554b51465dbf1483d84772050) +++ shared/scripts/names.py (.../names.py) (revision 84797bef0eb4a0898718fde40d11e5f69d568c09) @@ -89,6 +89,7 @@ # Alarm Status o_ALARM_ID_MESSAGE = {"container": o_QQuickView, "id": "_alarm", "type": "Rectangle", "objectName": "NotificationBar", "visible": True} +o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_treatmentStart_SalineTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_SalineTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True} o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True} @@ -132,21 +133,21 @@ o_treatmentAdjustmentUltrafiltrationPaused_EditButton = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_editButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_resumeButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_notification" , "type": "NotificationBar" } -o_treatmentAdjustmentUltrafiltrationPaused_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_pausedNotification", "type": "NotificationBar" } +o_treatmentAdjustmentUltrafiltrationPaused_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_pausedNotification", "type": "NotificationBarSmall" } ## Edit Screen o_treatmentAdjustmentUltrafiltrationEdit_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit" , "type": "ContentItem" } o_treatmentAdjustmentUltrafiltrationEdit_NextButton = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_nextButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_notification" , "type": "NotificationBar" } -o_treatmentAdjustmentUltrafiltrationEdit_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_pausedNotification", "type": "NotificationBar" } +o_treatmentAdjustmentUltrafiltrationEdit_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_pausedNotification", "type": "NotificationBarSmall" } o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_volumeSlider" , "type": "Slider" } ## Confirm Screen o_treatmentAdjustmentUltrafiltrationConfirm_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationConfirm" , "type": "ContentItem" } o_treatmentAdjustmentUltrafiltrationConfirm_Title = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_titleText" , "type": "Text" } o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_confirmButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_notification" , "type": "NotificationBar" } -o_treatmentAdjustmentUltrafiltrationConfirm_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_pausedNotification" , "type": "NotificationBar" } +o_treatmentAdjustmentUltrafiltrationConfirm_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_pausedNotification" , "type": "NotificationBarSmall" } o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_rateAdjustmentButton" , "type": "UltrafiltrationButton"} o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_durationAdjustmentButton", "type": "UltrafiltrationButton"} ### Rate Option @@ -184,6 +185,7 @@ # Setting CANBusFaultCountText o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } +blood_sitting_too_long_alarm_5_min_Text = {"container": o_Overlay, "text": "Blood sitting too long alarm (>5 min). ", "type": "Text", "unnamed": 1, "visible": True} Index: tst_Alarm/test.py =================================================================== diff -u -r53da790343ac7d1554b51465dbf1483d84772050 -r84797bef0eb4a0898718fde40d11e5f69d568c09 --- tst_Alarm/test.py (.../test.py) (revision 53da790343ac7d1554b51465dbf1483d84772050) +++ tst_Alarm/test.py (.../test.py) (revision 84797bef0eb4a0898718fde40d11e5f69d568c09) @@ -13,60 +13,38 @@ # import names -import utils import denaliMessages +import utils +from time import sleep def main(): utils.tstStart() startApplication("denaliSquish") - utils.waitForGUI(1) + sleep(0.5) + high_priority_color = "#c53b33" + med_low_priority_color = "#f5a623" + denaliMessages.sendAlarm(3, 26, 2, 0, 0) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - utils.waitForGUI() # visual delay + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, high_priority_color) + sleep(0.5) denaliMessages.sendAlarm(3, 26, 2, 0, 65535) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - utils.waitForGUI() # visual delay + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, high_priority_color) + sleep(0.5) denaliMessages.sendAlarm(2, 2, 0, 10, 100) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 2) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#ffa500") - utils.waitForGUI() # visual delay + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, med_low_priority_color) + sleep(0.5) denaliMessages.sendAlarm(1, 3, 0, 0, 54) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 1) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#008000") - utils.waitForGUI() # visual delay + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, med_low_priority_color) + sleep(0.5) - denaliMessages.sendAlarm(0, 4, 0, 0, 91) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 0) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#ffffff") - utils.waitForGUI() # visual delay + denaliMessages.sendAlarm(1, 49, 2, 0, 0) + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, med_low_priority_color) + sleep(0.5) - denaliMessages.sendAlarm(3, 255, 0, 0, 0) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - utils.waitForGUI() # visual delay - - denaliMessages.sendAlarm(0, 0, 0, 0, 0) - try: # Notification Bar should be hidden - waitForObjectExists(names.o_ALARM_ID_MESSAGE,0) - test.compare(False, True) - except LookupError: - test.compare(False, False) - - # Coverage : These messages have not been implemented completely yet. - # but as long as the coverage is 100% it means the portion of the implementation for them are working fine. - denaliMessages.setAlarmTriggered(1) - denaliMessages.send_acknowledge_UI() - denaliMessages.setAlarmCleared (1) - denaliMessages.send_acknowledge_UI() - denaliMessages.sendUnknown_HD() - denaliMessages.sendUnknown_DG() - utils.tstDone() Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -r84797bef0eb4a0898718fde40d11e5f69d568c09 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 84797bef0eb4a0898718fde40d11e5f69d568c09) @@ -27,7 +27,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication("denaliSquish -q") utils.waitForGUI(1) gotoScreenNtest_Contains_FlowsSection() Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rf8aa7703738b9dce05d14c319fe2a4473b9c2a5b -r84797bef0eb4a0898718fde40d11e5f69d568c09 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision f8aa7703738b9dce05d14c319fe2a4473b9c2a5b) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 84797bef0eb4a0898718fde40d11e5f69d568c09) @@ -319,7 +319,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication("denaliSquish -q") utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration()