Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r0f715a819769807fe9ae6362e1906268a9c7a4b3 -re2b1198b35a5e13749755e0839255d13f746a7c9 --- tst_TreatmentStatesData/test.py (.../test.py) (revision 0f715a819769807fe9ae6362e1906268a9c7a4b3) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision e2b1198b35a5e13749755e0839255d13f746a7c9) @@ -16,6 +16,7 @@ from dialin.squish import utils, denaliMessages from dialin.squish.denaliMessages import txStates + def gotoScreenNtest_Contains_TreatmentStatesData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) # default state of the in-treatment @@ -85,7 +86,7 @@ gotoScreenNtest_Contains_TreatmentStatesData() utils.waitForGUI(1) - + # start denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -r73969b18137fd7bd26bf608ec45de3d0b3cc0e81 -re2b1198b35a5e13749755e0839255d13f746a7c9 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 73969b18137fd7bd26bf608ec45de3d0b3cc0e81) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision e2b1198b35a5e13749755e0839255d13f746a7c9) @@ -16,11 +16,9 @@ import names from dialin.squish import utils, denaliMessages from dialin.squish.denaliMessages import txStates +from dialin.squish.denaliMessages import rejectReason -REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16 - - def gotoScreenNtest_Contains_TreatmentSalineBolusData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "START BOLUS") @@ -39,7 +37,7 @@ def test_state(vAccept, vText, vState): mReason = 0 - if (not vAccept): mReason = REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS + if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS mouseClick(waitForObject(names.o_treatmentStart_SalineStart)) # when rejected reason set 16 # although rejected value has been sent to check UI only looks for Accept field 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)