Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -r54849f9bbce1803f0a5330508e4891c161bb86d4 -r73969b18137fd7bd26bf608ec45de3d0b3cc0e81 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 54849f9bbce1803f0a5330508e4891c161bb86d4) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 73969b18137fd7bd26bf608ec45de3d0b3cc0e81) @@ -15,6 +15,7 @@ import names from dialin.squish import utils, denaliMessages +from dialin.squish.denaliMessages import txStates REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16 @@ -36,15 +37,15 @@ test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineTarget ).text) , "({:.0f} {})".format(vTarget, getUnit())) -def test_state(vAccept, vText): +def test_state(vAccept, vText, vState): mReason = 0 if (not vAccept): mReason = 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 # value and reason are not related by added those two to have a different value in case of rejection target = 50 + mReason - denaliMessages.setSalineBolusResponse(vAccept, mReason, target) + denaliMessages.setSalineBolusResponse(vAccept, mReason, target, vState) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(vText)) test_target(target) @@ -64,32 +65,32 @@ utils.waitForGUI(1) # Init stopped, stopped =(accepted)=> running (Text => STOP ) - test_state(True , "STOP" ) + test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) test_ultrafiltration(False) # Now running, running =(rejected)== running (Text == STOP ) - test_state(False, "STOP" ) + test_state(False, "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) test_ultrafiltration(False) # multiple same request should not affect if rejected # Now running, running =(rejected)== running (Text == STOP ) - test_state(False, "STOP" ) + test_state(False, "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) test_ultrafiltration(False) # Still running, running =(accepted)=> stopped (Text == START) - test_state(True , "START") + test_state(True , "START" , txStates.SALINE_BOLUS_STATE_IDLE ) test_ultrafiltration(True) # Now stopped, stopped =(rejected)== stopped (Text == START) - test_state(False, "START") + test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) test_ultrafiltration(True) # Now stopped, stopped =(accepted)=> running (Text == STOP ) - test_state(True , "STOP" ) + test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) test_ultrafiltration(False) # Still running, running =(accepted)=> stopped (Text == START) - test_state(True, "START") + test_state(True, "START", txStates.SALINE_BOLUS_STATE_IDLE ) test_ultrafiltration(True) utils.tstDone()