Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb11714354c2bdc8df3cfd03bb9c46f688a8b7c0b --- tst_CANBusFaultCount/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision b11714354c2bdc8df3cfd03bb9c46f688a8b7c0b) @@ -45,7 +45,6 @@ test_values (100) - denaliMessages.setCanBUSFaultCount(0) test_values (0) Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb11714354c2bdc8df3cfd03bb9c46f688a8b7c0b --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision b11714354c2bdc8df3cfd03bb9c46f688a8b7c0b) @@ -84,6 +84,8 @@ def pause_RejectNTest(): + # [Normal Notification] + test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") # [Reject Pause] denaliMessages.setTreatmentAdjustUltrafiltrationRejected() # [Reject Notification] @@ -93,6 +95,8 @@ def pause_Accept(): # [Accept Pause] denaliMessages.setTreatmentAdjustUltrafiltrationAccepted() + # [Accept Notification] + test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") utils.waitForGUI(1) @@ -114,6 +118,8 @@ def resume_RejectNTest(): + # [Normal Notification] + test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") # [Reject Resume] denaliMessages.setTreatmentAdjustUltrafiltrationRejected() # [Reject Notification] @@ -123,6 +129,8 @@ def resume_Accept(): # [Accept Resume] denaliMessages.setTreatmentAdjustUltrafiltrationAccepted() + # [Accept Notification] + test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "Unable to Resume Ultrafiltration or already running") utils.waitForGUI(1) @@ -312,7 +320,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") # denaliSquish + startApplication("denaliSquish") utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration()