Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r20f2c70f789de08ea7f19df58de2362c5df240a9 -rb795e6250294344ef7b0396bae4648fb2aa306b3 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 20f2c70f789de08ea7f19df58de2362c5df240a9) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) @@ -13,21 +13,17 @@ # import names -import squishapi.utils as utils -import squishapi.denaliMessages as denaliMessages +import utils +import denaliMessages def gotoScreenNtest_Contains_Ultrafiltration(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True) def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): - for i in range(vMinUF, vMaxUF+1, 100): + for i in range(vMinUF, vMaxUF+1, 10): denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) - -def resetNTestTreatmentUltrafiltration(): - denaliMessages.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) - test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), 0) def main(): utils.tstStart() @@ -38,26 +34,13 @@ gotoScreenNtest_Contains_Ultrafiltration() utils.waitForGUI(1) - minUF = 1000 - maxUF = 2000 - denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0) - denaliMessages.send_acknowledge_UI() - test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF) - test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF) - - resetNTestTreatmentUltrafiltration() - startNTestTreatmentUltrafiltration(minUF, maxUF) - resetNTestTreatmentUltrafiltration() - minUF = 0 - maxUF = 1000 - denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0) + maxUF = 600 denaliMessages.send_acknowledge_UI() test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF) - - resetNTestTreatmentUltrafiltration() startNTestTreatmentUltrafiltration(minUF, maxUF) - resetNTestTreatmentUltrafiltration() - utils.tstDone() \ No newline at end of file + utils.tstDone() + + \ No newline at end of file