Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,7 +13,7 @@ # import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils, hd_simulator def gotoScreenNtest_Contains_Ultrafiltration(): @@ -22,12 +22,12 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - denaliMessages.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) def resetNTestTreatmentUltrafiltration(): - denaliMessages.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0) @@ -49,7 +49,7 @@ startNTestTreatmentUltrafiltration(minUF, maxUF) maxUF = 300 - denaliMessages.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, maxUF, 30, 5) + hd_simulator.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, maxUF, 30, 5) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF)