Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) @@ -13,7 +13,9 @@ # import names -from dialin.ui import utils, hd_simulator +from dialin.ui import utils +from dialin import HDSimulator +HDSimulator = HDSimulator() def gotoScreenNtest_Contains_Ultrafiltration(): @@ -22,12 +24,12 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - hd_simulator.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) + HDSimulator.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) def resetNTestTreatmentUltrafiltration(): - hd_simulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) + HDSimulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0) @@ -49,7 +51,7 @@ startNTestTreatmentUltrafiltration(minUF, maxUF) maxUF = 300 - hd_simulator.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, maxUF, 30, 5) + HDSimulator.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)