Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rdb6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e -re2b1198b35a5e13749755e0839255d13f746a7c9 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision db6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision e2b1198b35a5e13749755e0839255d13f746a7c9) @@ -14,10 +14,11 @@ import names from dialin.squish import utils, denaliMessages -# from dialin.squish.denaliMessages import setTreatmentStartState from dialin.squish.denaliMessages import txStates +from dialin.squish.denaliMessages import rejectReason + eInvalid = 0 eIncrease = 1 eDecrease = 2 @@ -105,14 +106,14 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") # [Reject Pause] - denaliMessages.setTreatmentAdjustUltrafiltrationRejected() + denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS, txStates.UF_RUNNING_STATE) # [Reject Notification] - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "Unable to Pause Ultrafiltration or already paused") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS") def pause_Accept(): # [Accept Pause] - denaliMessages.setTreatmentAdjustUltrafiltrationAccepted() + denaliMessages.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_PAUSED_STATE) # [Accept Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") utils.waitForGUI(1) @@ -139,14 +140,14 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") # [Reject Resume] - denaliMessages.setTreatmentAdjustUltrafiltrationRejected() + denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED, txStates.UF_PAUSED_STATE) # [Reject Notification] - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "Unable to Resume Ultrafiltration or already running") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "REQUEST_REJECT_REASON_UF_NOT_PAUSED") def resume_Accept(): # [Accept Resume] - denaliMessages.setTreatmentAdjustUltrafiltrationAccepted() + denaliMessages.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_RUNNING_STATE) utils.waitForGUI(1)