Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 20f2c70f789de08ea7f19df58de2362c5df240a9) @@ -13,21 +13,21 @@ # import names -import utils -import denaliMessages +import squishapi.utils as utils +import squishapi.denaliMessages as 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): + for i in range(vMinUF, vMaxUF+1, 100): denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) - test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, i) + 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(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0) + test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), 0) def main(): utils.tstStart() @@ -38,23 +38,23 @@ gotoScreenNtest_Contains_Ultrafiltration() utils.waitForGUI(1) - minUF = 10 - maxUF = 20 + minUF = 1000 + maxUF = 2000 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) + 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 = 10 + maxUF = 1000 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) + 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)