Index: shared/scripts/denaliMessages.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -r99810cece725cd3b1070c61756563b90b6d36650 --- shared/scripts/denaliMessages.py (.../denaliMessages.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ shared/scripts/denaliMessages.py (.../denaliMessages.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) @@ -67,7 +67,7 @@ # it seems it's needed otherwise the test will check a value which has not been received yet. # ################################################################################################## def waitForMessageToBeSent(): - time.sleep(0.1) + time.sleep(0.200) # 200ms ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: tst_HomeScreen/test.py =================================================================== diff -u -r40df2a58a855b561c1ca8dabd3b272ac48b8924e -r99810cece725cd3b1070c61756563b90b6d36650 --- tst_HomeScreen/test.py (.../test.py) (revision 40df2a58a855b561c1ca8dabd3b272ac48b8924e) +++ tst_HomeScreen/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) @@ -13,6 +13,7 @@ # import names +import utils def main(): startApplication("denaliSquish") @@ -27,11 +28,14 @@ test.compare(str(waitForObjectExists(names.o_mainMenu_settings ).text.text), "Settings" , "SRSUI 028") mouseClick (waitForObjectExists(names.o_mainMenu_manager)) + utils.waitForGUI() test.compare(waitForObjectExists(names.o_managerHome ).visible, True , "SRSUI 027") mouseClick (waitForObjectExists(names.o_mainMenu_settings )) + utils.waitForGUI() test.compare(waitForObjectExists(names.o_settingsHome ).visible, True , "SRSUI 029") mouseClick (waitForObjectExists(names.o_mainMenu_treatment)) + utils.waitForGUI() test.compare(waitForObjectExists(names.o_treatmentHome).visible, True , "SRSUI 535") Index: tst_ServiceShutdown/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -r99810cece725cd3b1070c61756563b90b6d36650 --- tst_ServiceShutdown/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_ServiceShutdown/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) @@ -27,10 +27,12 @@ def gotoScreenNtest_Contains_PowerOffButton(vSRSUI=""): mouseClick (waitForObjectExists(names.o_mainMenu_settings)) + utils.waitForGUI() test.compare(waitForObjectExists(names.o_settingsHome).visible, True, globals.SRSUI(vSRSUI)) def gotoScreenNtest_Contains_TreatmentHome(vSRSUI=""): mouseClick (waitForObjectExists(names.o_mainMenu_treatment)) + utils.waitForGUI() test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, globals.SRSUI(vSRSUI)) def showNtest_PowerOffDialog(vSRSUI=""): @@ -50,7 +52,6 @@ utils.waitForGUI(5) # dialog timeout utils.waitForGUI(1) # animation transition - def showNtest_PowerOffRejectionDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) denaliMessages.show_PowerOffRejectionDialog() Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -r99810cece725cd3b1070c61756563b90b6d36650 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) @@ -24,11 +24,11 @@ mouseClick(waitForObject(names.o_treatmentStart_flowsTouchArea_TreatmentFlows)) test.compare(waitForObjectExists(names.o_modalDialog).visible, True) -def test_Dialysate_Ranges(): - test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).minimum, 150) - test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).maximum, 550) - test.compare(str(waitForObjectExists(names.o_dialysateFlowSlider_Slider).minText.text), "150mL/min") - test.compare(str(waitForObjectExists(names.o_dialysateFlowSlider_Slider).maxText.text), "550mL/min") +def test_Dialysate_Ranges(vMin, vMax): + test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).minimum, vMin) + test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).maximum, vMax) + test.compare(str(waitForObjectExists(names.o_dialysateFlowSlider_Slider).minText.text), "{}mL/min".format(vMin)) + test.compare(str(waitForObjectExists(names.o_dialysateFlowSlider_Slider).maxText.text), "{}mL/min".format(vMax)) def main(): startApplication("denaliSquish") @@ -38,9 +38,20 @@ gotoScreenNTest_Contains_Ranges() utils.waitForGUI(1) - denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) #coverage - denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) + + minDF = 150 + maxDF = 550 + denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) #coverage denaliMessages.send_acknowledge_UI() + test_Dialysate_Ranges(minDF, maxDF) + + denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) + denaliMessages.send_acknowledge_UI() + test_Dialysate_Ranges(minDF, maxDF) - test_Dialysate_Ranges() + minDF = 200 + maxDF = 500 + denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) + denaliMessages.send_acknowledge_UI() + test_Dialysate_Ranges(minDF, maxDF) Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -r99810cece725cd3b1070c61756563b90b6d36650 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) @@ -32,6 +32,9 @@ denaliMessages.setTreatmentPressureOcclusion(200, 100, 50, 25, 15) # Coverage + test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 200) + test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure, 100) + denaliMessages.setTreatmentPressureOcclusion(200, 100, 50, 25, 15) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 200) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure, 100) Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -r99810cece725cd3b1070c61756563b90b6d36650 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) @@ -20,12 +20,12 @@ mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True) -def startNTestTreatmentUltrafiltration(vVolume): - for i in range(0,vVolume+1): - denaliMessages.setTreatmentUltrafiltration(vVolume, i, 1, 1, 1, 1, 1) +def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): + for i in range(vMinUF, vMaxUF+1): + denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, i) -def resetNTestTreatmentUltrafiltration(vVolume): +def resetNTestTreatmentUltrafiltration(): denaliMessages.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0) @@ -35,29 +35,25 @@ gotoScreenNtest_Contains_Ultrafiltration() utils.waitForGUI(1) - minUF = 0 - maxUF = 100 - + minUF = 10 + maxUF = 20 denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0) denaliMessages.send_acknowledge_UI() test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum, minUF) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum, maxUF) - - volume = maxUF - resetNTestTreatmentUltrafiltration(volume) - startNTestTreatmentUltrafiltration(volume) - resetNTestTreatmentUltrafiltration(volume) - + + resetNTestTreatmentUltrafiltration() + startNTestTreatmentUltrafiltration(minUF, maxUF) + resetNTestTreatmentUltrafiltration() + minUF = 0 maxUF = 10 - denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0) denaliMessages.send_acknowledge_UI() test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum, minUF) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum, maxUF) - volume = maxUF - resetNTestTreatmentUltrafiltration(volume) - startNTestTreatmentUltrafiltration(volume) - resetNTestTreatmentUltrafiltration(volume) + resetNTestTreatmentUltrafiltration() + startNTestTreatmentUltrafiltration(minUF, maxUF) + resetNTestTreatmentUltrafiltration()