Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -rbefca1db0402e031a5b692aa93dc74bfb314eb9e -r24485172848ae32d15cf665b2ef024129dec6ca2 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 24485172848ae32d15cf665b2ef024129dec6ca2) @@ -16,7 +16,7 @@ import names from dialin.squish import utils, denaliMessages from dialin.squish.denaliMessages import txStates -from dialin.squish.denaliMessages import rejectReason +from dialin.common.msg_defs import RequestRejectReasons as rejectReason def gotoScreenNtest_Contains_TreatmentSalineBolusData(): @@ -37,7 +37,7 @@ def test_state(vAccept, vText, vState): mReason = 0 - if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS + if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS.value 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 -re2b1198b35a5e13749755e0839255d13f746a7c9 -r24485172848ae32d15cf665b2ef024129dec6ca2 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision e2b1198b35a5e13749755e0839255d13f746a7c9) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 24485172848ae32d15cf665b2ef024129dec6ca2) @@ -15,10 +15,9 @@ import names from dialin.squish import utils, denaliMessages from dialin.squish.denaliMessages import txStates -from dialin.squish.denaliMessages import rejectReason +from dialin.common.msg_defs import RequestRejectReasons as rejectReason - eInvalid = 0 eIncrease = 1 eDecrease = 2 @@ -106,9 +105,9 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") # [Reject Pause] - denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS, txStates.UF_RUNNING_STATE) + denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.value, txStates.UF_RUNNING_STATE) # [Reject Notification] - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.name) def pause_Accept(): @@ -140,9 +139,9 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") # [Reject Resume] - denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED, txStates.UF_PAUSED_STATE) + denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.value, txStates.UF_PAUSED_STATE) # [Reject Notification] - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "REQUEST_REJECT_REASON_UF_NOT_PAUSED") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.name) def resume_Accept(): @@ -178,10 +177,10 @@ def edit_RejectNTest(): - denaliMessages.setTreatmentAdjustUltrafiltrationEditRejected(12) + denaliMessages.setTreatmentAdjustUltrafiltrationEditRejected(rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.value) test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).visible, True) #this error message needs to be changed later when translated. - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), "REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.name) def updateNTest_Adjustment_Ranges(vMinUFVolume, vMaxUFVolume): @@ -320,9 +319,9 @@ def confirm_RejectNTest(): - denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(2) + denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.value) test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True) - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), "REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.name) def confirm_RejectNTest_Unknow():