Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rca79dc7f50fc912b05da91321d8652934aee0764 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision ca79dc7f50fc912b05da91321d8652934aee0764) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -121,14 +121,14 @@ # [Accept Pause] hd_simulator.cmd_set_treatment_adjust_ultrafiltration_accepted(TXStates.UF_PAUSED_STATE) # [Accept Notification] - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar, "text", "")).text), "") # --------------- Paused Screen def testScreen_Paused_Ultrafiltration(): # [Paused Screen] - test.compare(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen).visible, True) + test.compare(waitForObjectExists(utils.dict_update(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen, "visible", True)).visible, True) ## Edit Button test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_EditButton).text.text), "EDIT ULTRAFILTRATION VOLUME") ## Resume Button @@ -344,7 +344,7 @@ def confirm_Accept(vVolume, vDuration, vRate): hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(1, 0, vVolume, vDuration, vRate) - utils.waitForGUI() + utils.waitForGUI(3) test.compare(utils.l2ml(waitForObject(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), 1200) @@ -366,7 +366,7 @@ closeScreen() # Back to main # set the ultrafiltration to running state - hd_simulator.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE_NOT, TXStates.UF_RUNNING_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) + hd_simulator.cmd_set_treatment_states_data(TXStates.TREATMENT_START_STATE, TXStates.UF_RUNNING_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) closeScreen() gotoScreen_UltrafiltrationAdjustment()