Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r40568c277aa2c01963d0f3f9da41748c2686d343 -r929c42f19c662c57ae264d200658fb1690353008 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 40568c277aa2c01963d0f3f9da41748c2686d343) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) @@ -13,7 +13,7 @@ # import names -import time +import utils import denaliMessages def gotoScreenNtest_Contains_FlowsSection(): @@ -28,13 +28,13 @@ startApplication("denaliSquish") gotoScreenNtest_Contains_FlowsSection() - time.sleep(1) + utils.waitForGUI(1) denaliMessages.setTreatmentBloodFlowRate(175) denaliMessages.setTreatmentDialysateFlowRate(250) gotoScreenNTest_Contains_Ranges() - time.sleep(1) + utils.waitForGUI(1) denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) denaliMessages.send_acknowledge_UI() @@ -44,12 +44,22 @@ test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225) test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).value, 200) + + # sendTreatmentAdjustBloodDialysateRequest mouseClick(waitForObject(names.o_TouchRect)) - - denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250) + denaliMessages.waitForMessageToBeSent() + utils.waitForGUI(7) # wait for ack timeout 5 is the timeout added +2 Sec for safe range. - time.sleep(2) + # sendTreatmentAdjustBloodDialysateRequest again + mouseClick(waitForObject(names.o_TouchRect)) + denaliMessages.waitForMessageToBeSent() + denaliMessages.send_acknowledge_HD() + denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage + denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage + denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250) + utils.waitForGUI(2) + mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) @@ -60,13 +70,9 @@ waitForObjectExists(names.o_bloodFlowSlider_Slider).value, waitForObjectExists(names.o_dialysateFlowSlider_Slider).value ) - - time.sleep(1) - denaliMessages.setTreatmentBloodFlowRate(225) denaliMessages.setTreatmentDialysateFlowRate(200) test.compare(str(waitForObjectExists(names.o_treatmentStart_225_Text).text), "225") test.compare(str(waitForObjectExists(names.o_treatmentStart_200_Text).text), "200") - time.sleep(1)