Index: simulator/run.py =================================================================== diff -u -rbefca1db0402e031a5b692aa93dc74bfb314eb9e -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- simulator/run.py (.../run.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) +++ simulator/run.py (.../run.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -4,8 +4,8 @@ # import project classes # import names -from dialin.squish import utils, denaliMessages -from dialin.squish.denaliMessages import txStates, EResponse +from dialin.ui import utils, hd_simulator +from dialin.ui.hd_simulator import txStates, EResponse # Import PySide2 classes from PySide2.QtUiTools import QUiLoader from PySide2 import QtCore, QtWidgets @@ -262,7 +262,7 @@ self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS target = self.cmbSalineAcceptTarget.currentText() - denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state) + hd_simulator.setSalineBolusResponse(True, 0, target, self.saline_requested_state) self.lblSalineAction.setText('Accepted ' + target) @Slot() @@ -272,7 +272,7 @@ :return: none """ reason = self.spnSalineRejectReason.value() - denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state) + hd_simulator.setSalineBolusResponse(False, reason, 0, self.saline_requested_state) self.lblSalineAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -281,7 +281,7 @@ the slot for accept ultrafiltration pause button :return: none """ - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( + hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted, 0, txStates.UF_PAUSED_STATE) self.lblUfPauseAction.setText('Accepted ') @@ -292,7 +292,7 @@ :return: none """ reason = self.spnUfPauseRejectReason.value() - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( + hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected, reason, txStates.UF_RUNNING_STATE) self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason)) @@ -302,7 +302,7 @@ the slot for accept ultrafiltration resume accept :return: none """ - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( + hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted, 0, txStates.UF_RUNNING_STATE) self.lblUfResumeAction.setText('Accepted ') @@ -313,7 +313,7 @@ :return: none """ reason = self.spnUfResumeRejectReason.value() - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( + hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected, reason, txStates.UF_PAUSED_STATE) self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason)) @@ -323,7 +323,7 @@ the slot for accept ultrafiltration next button :return: none """ - denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( + hd_simulator.setTreatmentAdjustUltrafiltrationEditResponse( EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Accepted ') @@ -334,7 +334,7 @@ :return: none """ reason = self.spnUfEditRejectReason.value() - denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( + hd_simulator.setTreatmentAdjustUltrafiltrationEditResponse( EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Rejected ' + "{}".format(reason)) @@ -347,7 +347,7 @@ sub_mode = self.tblSalineSubMode.verticalHeaderItem(self.tblSalineSubMode.currentRow()).text() uf_state = self.tblSalineUFStates.verticalHeaderItem(self.tblSalineUFStates.currentRow()).text() saline = self.tblSalineSalineStates.verticalHeaderItem(self.tblSalineSalineStates.currentRow()).text() - denaliMessages.setTreatmentStatesData(sub_mode, uf_state, saline) + hd_simulator.setTreatmentStatesData(sub_mode, uf_state, saline) @Slot() def do_saline_data(self): @@ -356,25 +356,25 @@ by calling the denaliMessage API setTreatmentSalineBolusData :return: none """ - denaliMessages.setTreatmentSalineBolusData(self.sldSalineTarget.value(), - self.sldSalineCumulative.value(), - self.sldSalineVolume.value()) + hd_simulator.setTreatmentSalineBolusData(self.sldSalineTarget.value(), + self.sldSalineCumulative.value(), + self.sldSalineVolume.value()) @Slot() def do_uf_volume_data(self): """ sends the ultrafiltration delivered volume message :return: none """ - denaliMessages.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0) @Slot() def do_ranges_data(self): """ sends the treatment ranges message with given value on the screen :return: none """ - denaliMessages.setTreatmentParamRanges( + hd_simulator.setTreatmentParamRanges( self.spnDurationMin.value(), self.spnDurationMax.value(), self.spnUFVolumeMin.value(), Index: tst_AlarmCleared/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_AlarmCleared/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_AlarmCleared/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -14,7 +14,7 @@ import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils, hd_simulator # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) @@ -28,17 +28,17 @@ utils.waitForGUI(1) for i in range(len(names.AlarmTextMap)): - denaliMessages.setAlarmCleared(i) + hd_simulator.setAlarmCleared(i) test_values (i) - denaliMessages.setAlarmCleared(1) + hd_simulator.setAlarmCleared(1) test_values (1) # Coverage - denaliMessages.setAlarmCleared(1) + hd_simulator.setAlarmCleared(1) test_values (1) - denaliMessages.setAlarmCleared(0) + hd_simulator.setAlarmCleared(0) test_values (0) utils.tstDone() Index: tst_AlarmStatusData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_AlarmStatusData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_AlarmStatusData/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -14,7 +14,7 @@ import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils, hd_simulator def isNotificationBar(): @@ -61,26 +61,26 @@ startApplication(names.AUT_NAME) utils.waitForGUI(1) - denaliMessages.setAlarmStatus(0, 0, 0, 0, 0) + hd_simulator.setAlarmStatus(0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0) for i in range(len(names.AlarmTextMap)): # setting priority is to see notification dialog is also showing correct text for j in names.AlarmPriority: - denaliMessages.setAlarmStatus(j, i, 0, 0, 0) + hd_simulator.setAlarmStatus(j, i, 0, 0, 0) test_values (j, i, 0, 0, 0) - denaliMessages.setAlarmStatus(1, 2, 3, 4, 5) + hd_simulator.setAlarmStatus(1, 2, 3, 4, 5) test_values (1, 2, 3, 4, 5) # Coverage - denaliMessages.setAlarmStatus(1, 2, 3, 4, 5) + hd_simulator.setAlarmStatus(1, 2, 3, 4, 5) test_values (1, 2, 3, 4, 5) - denaliMessages.setAlarmStatus(0, 1, 3, 4, 5) + hd_simulator.setAlarmStatus(0, 1, 3, 4, 5) test_values (0, 1, 3, 4, 5) - denaliMessages.setAlarmStatus(0, 0, 0, 0, 0) + hd_simulator.setAlarmStatus(0, 0, 0, 0, 0) #test_values (0, 0, 0, 0, 0) utils.tstDone() Index: tst_AlarmTriggered/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_AlarmTriggered/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_AlarmTriggered/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -14,7 +14,7 @@ import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils, hd_simulator # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) @@ -28,17 +28,17 @@ utils.waitForGUI(1) for i in range(len(names.AlarmTextMap)): - denaliMessages.setAlarmTriggered(i) + hd_simulator.setAlarmTriggered(i) test_values (i) - denaliMessages.setAlarmTriggered(1) + hd_simulator.setAlarmTriggered(1) test_values (1) # Coverage - denaliMessages.setAlarmTriggered(1) + hd_simulator.setAlarmTriggered(1) test_values (1) - denaliMessages.setAlarmTriggered(0) + hd_simulator.setAlarmTriggered(0) test_values (0) utils.tstDone() Index: tst_Alarm_Colors/test.py =================================================================== diff -u -r4b28ff7783e97be695b5d942b9eaf17d95347434 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Alarm_Colors/test.py (.../test.py) (revision 4b28ff7783e97be695b5d942b9eaf17d95347434) +++ tst_Alarm_Colors/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -16,7 +16,7 @@ from time import sleep import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils, hd_simulator HIGH = 3 @@ -110,15 +110,15 @@ continue #test.log("Testing {0} = {1}".format(alarm_list[idx], alarm_id)) color = HIGH_PRIORITY_COLOR if priority == HIGH else MED_LOW_PRIORITY_COLOR - denaliMessages.setAlarmStatus(priority, alarm_id, escalates_in, silent_expires_in, flags) + hd_simulator.setAlarmStatus(priority, alarm_id, escalates_in, silent_expires_in, flags) test.compare(waitForObject(names.o_alarm_dialog).color.name, color) mouseClick(waitForObject(names.o_dismiss_alarm)) mouseClick(waitForObject(names.o_alarm_bar)) mouseClick(waitForObject(names.o_dismiss_alarm)) mouseClick(waitForObject(names.o_alarm_bar)) mouseClick(waitForObject(names.o_okay_alarm)) mouseClick(waitForObject(names.o_alarm_bar)) - denaliMessages.clear_all_alarms() + hd_simulator.clear_all_alarms() def test_alarm_acknowledge(alarms): """ @@ -128,12 +128,12 @@ """ #test.log("Testing alarm acknowledgement") - denaliMessages.clear_all_alarms() - denaliMessages.setAlarmStatus(*alarms.ALARM_ID_SOFTWARE_FAULT) + hd_simulator.clear_all_alarms() + hd_simulator.setAlarmStatus(*alarms.ALARM_ID_SOFTWARE_FAULT) test.compare(waitForObject(names.o_alarm_dialog).color.name, HIGH_PRIORITY_COLOR) mouseClick(waitForObject(names.o_okay_alarm)) - denaliMessages.clear_all_alarms() - denaliMessages.setAlarmStatus(*alarms.ALARM_ID_SOFTWARE_FAULT) + hd_simulator.clear_all_alarms() + hd_simulator.setAlarmStatus(*alarms.ALARM_ID_SOFTWARE_FAULT) def get_alarm_list(alarms): Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_CANBusFaultCount/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_CANBusFaultCount/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_CANBusFaultCount(): @@ -34,16 +34,16 @@ gotoScreenNtest_Contains_CANBusFaultCount() utils.waitForGUI(1) - denaliMessages.setCanBUSFaultCount(10) + hd_simulator.setCanBUSFaultCount(10) test_values (10) - denaliMessages.setCanBUSFaultCount(100) + hd_simulator.setCanBUSFaultCount(100) test_values (100) - denaliMessages.setCanBUSFaultCount(100) # Coverage + hd_simulator.setCanBUSFaultCount(100) # Coverage test_values (100) - denaliMessages.setCanBUSFaultCount(0) + hd_simulator.setCanBUSFaultCount(0) test_values (0) utils.tstDone() Index: tst_ConfirmPrimingBegin/test.py =================================================================== diff -u -ra6462504dcafb3bfbc8638c83bc06321d1362912 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_ConfirmPrimingBegin/test.py (.../test.py) (revision a6462504dcafb3bfbc8638c83bc06321d1362912) +++ tst_ConfirmPrimingBegin/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*-" import names -from dialin.squish import utils +from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.common.msg_defs import RequestRejectReasons -from dialin.squish.utils import waitForGUI +from dialin.ui.utils import waitForGUI def skip_create_treatment(hd_simulator: HDSimulator): """ Index: tst_CreateTreatment/test.py =================================================================== diff -u -rc15701755e407fff174072b9a5de3aee4e598b2f -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_CreateTreatment/test.py (.../test.py) (revision c15701755e407fff174072b9a5de3aee4e598b2f) +++ tst_CreateTreatment/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -2,7 +2,7 @@ import names -from dialin.squish import utils +from dialin.ui import utils from dialin.common.msg_defs import RequestRejectReasons from dialin import HDSimulator from time import sleep Index: tst_DGDrainPumpData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGDrainPumpData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGDrainPumpData/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_DGDrainPumpData(): @@ -37,17 +37,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGDrainPumpData(i, i + step * 1) + hd_simulator.setDGDrainPumpData(i, i + step * 1) test_values (i, i + step * 1) - denaliMessages.setDGDrainPumpData(100, 200) + hd_simulator.setDGDrainPumpData(100, 200) test_values (100, 200) - denaliMessages.setDGDrainPumpData(100, 200) + hd_simulator.setDGDrainPumpData(100, 200) test_values (100, 200) # Coverage - denaliMessages.setDGDrainPumpData(0, 0) + hd_simulator.setDGDrainPumpData(0, 0) test_values (0, 0) utils.tstDone() Index: tst_DGHeatersData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGHeatersData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGHeatersData/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_DGHeatersData(): @@ -38,17 +38,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGHeatersData(i, i + step * 1, i + step * 2) + hd_simulator.setDGHeatersData(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - denaliMessages.setDGHeatersData(100, 200, 300) + hd_simulator.setDGHeatersData(100, 200, 300) test_values (100, 200, 300) - denaliMessages.setDGHeatersData(100, 200, 300) + hd_simulator.setDGHeatersData(100, 200, 300) test_values (100, 200, 300) # Coverage - denaliMessages.setDGHeatersData(0, 0, 0) + hd_simulator.setDGHeatersData(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGLoadCellReadingsData/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_DGLoadCellReadingsData(): @@ -39,17 +39,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGLoadCellReadingsData(i, i + step * 1, i + step * 2, i + step * 3) + hd_simulator.setDGLoadCellReadingsData(i, i + step * 1, i + step * 2, i + step * 3) test_values (i, i + step * 1, i + step * 2, i + step * 3) - denaliMessages.setDGLoadCellReadingsData(100, 200, 300, 400) + hd_simulator.setDGLoadCellReadingsData(100, 200, 300, 400) test_values (100, 200, 300, 400) - denaliMessages.setDGLoadCellReadingsData(100, 200, 300, 400) + hd_simulator.setDGLoadCellReadingsData(100, 200, 300, 400) test_values (100, 200, 300, 400) # Coverage - denaliMessages.setDGLoadCellReadingsData(0, 0, 0, 0) + hd_simulator.setDGLoadCellReadingsData(0, 0, 0, 0) test_values (0, 0, 0, 0) utils.tstDone() Index: tst_DGOperationMode/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGOperationMode/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGOperationMode/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 opModes = [ @@ -54,21 +54,21 @@ step = 1 for i in range ( 0, len(opModes), step): - denaliMessages.setDGOperationMode(i) + hd_simulator.setDGOperationMode(i) test_values (i) - denaliMessages.setDGOperationMode(1) + hd_simulator.setDGOperationMode(1) test_values (1) # Coverage - denaliMessages.setDGOperationMode(1) + hd_simulator.setDGOperationMode(1) test_values (1) - denaliMessages.setDGOperationMode(0) + hd_simulator.setDGOperationMode(0) test_values (0) outOfRangeCheck = len(opModes) + 1 - denaliMessages.setDGOperationMode(outOfRangeCheck) + hd_simulator.setDGOperationMode(outOfRangeCheck) test_values (outOfRangeCheck) utils.tstDone() Index: tst_DGPressureData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGPressureData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGPressureData/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_DGPressuresData(): @@ -39,17 +39,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGPressuresData(i, i + step * 1, i + step * 2, i + step * 3) + hd_simulator.setDGPressuresData(i, i + step * 1, i + step * 2, i + step * 3) test_values (i, i + step * 1, i + step * 2, i + step * 3) - denaliMessages.setDGPressuresData(100, 200, 300, 400) + hd_simulator.setDGPressuresData(100, 200, 300, 400) test_values (100, 200, 300, 400) - denaliMessages.setDGPressuresData(100, 200, 300, 400) + hd_simulator.setDGPressuresData(100, 200, 300, 400) test_values (100, 200, 300, 400) # Coverage - denaliMessages.setDGPressuresData(0, 0, 0, 0) + hd_simulator.setDGPressuresData(0, 0, 0, 0) test_values (0, 0, 0, 0) utils.tstDone() Index: tst_DGROPumpData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGROPumpData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGROPumpData/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_DGROPumpData(): @@ -38,17 +38,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGROPumpData(i, i + step * 1, i + step * 2) + hd_simulator.setDGROPumpData(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - denaliMessages.setDGROPumpData(100, 200, 300) + hd_simulator.setDGROPumpData(100, 200, 300) test_values (100, 200, 300) - denaliMessages.setDGROPumpData(100, 200, 300) + hd_simulator.setDGROPumpData(100, 200, 300) test_values (100, 200, 300) # Coverage - denaliMessages.setDGROPumpData(0, 0, 0) + hd_simulator.setDGROPumpData(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGReservoirData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGReservoirData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGReservoirData/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_DGReservoirData(): @@ -38,17 +38,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGReservoirData(i, i + step * 1, i + step * 2) + hd_simulator.setDGReservoirData(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - denaliMessages.setDGReservoirData(100, 200, 300) + hd_simulator.setDGReservoirData(100, 200, 300) test_values (100, 200, 300) - denaliMessages.setDGReservoirData(100, 200, 300) + hd_simulator.setDGReservoirData(100, 200, 300) test_values (100, 200, 300) # Coverage - denaliMessages.setDGReservoirData(0, 0, 0) + hd_simulator.setDGReservoirData(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGTemperaturesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGTemperaturesData/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_DGTemperaturesData(): @@ -47,17 +47,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGTemperaturesData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6, i + step * 7, i + step * 8, i + step * 9, i + step * 10, i + step * 11) + hd_simulator.setDGTemperaturesData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6, i + step * 7, i + step * 8, i + step * 9, i + step * 10, i + step * 11) test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6, i + step * 7, i + step * 8, i + step * 9, i + step * 10, i + step * 11) - denaliMessages.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + hd_simulator.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) - denaliMessages.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + hd_simulator.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) # Coverage - denaliMessages.setDGTemperaturesData(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + hd_simulator.setDGTemperaturesData(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) utils.tstDone() Index: tst_DGValvesStatesData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DGValvesStatesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGValvesStatesData/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 valvesBitLen = 12 @@ -35,19 +35,19 @@ gotoScreenNtest_Contains_DGValvesStatesData() utils.waitForGUI(1) - denaliMessages.setDGValvesStates(1) + hd_simulator.setDGValvesStates(1) test_values (1) - denaliMessages.setDGValvesStates(2) + hd_simulator.setDGValvesStates(2) test_values (2) i = 2 while ( i < 2 ** valvesBitLen ): - denaliMessages.setDGValvesStates(i) + hd_simulator.setDGValvesStates(i) test_values (i) i *= 2 - denaliMessages.setDGValvesStates(0) + hd_simulator.setDGValvesStates(0) test_values (0) utils.tstDone() Index: tst_DebugText/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_DebugText/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DebugText/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 main(): @@ -23,8 +23,8 @@ utils.waitForGUI(1) # these tests are used for debugging and are placeholder for later use cases. - denaliMessages.send_CheckIn_DG() - denaliMessages.setDGDebugText("01234567890123456789012345678901234567820123456789") - denaliMessages.setHDDebugText("01234567890123456789012345678901234567810123456789") + hd_simulator.send_CheckIn_DG() + hd_simulator.setDGDebugText("01234567890123456789012345678901234567820123456789") + hd_simulator.setHDDebugText("01234567890123456789012345678901234567810123456789") utils.tstDone() Index: tst_HDBloodFlowData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_HDBloodFlowData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_HDBloodFlowData/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_BloodFlowData(): @@ -42,17 +42,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setTreatmentBloodFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + hd_simulator.setTreatmentBloodFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) - denaliMessages.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) + hd_simulator.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - denaliMessages.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) + hd_simulator.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - denaliMessages.setTreatmentBloodFlowRate(0, 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentBloodFlowRate(0, 0, 0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0, 0, 0) utils.tstDone() Index: tst_HDInletFlowData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_HDInletFlowData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_HDInletFlowData/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_InletFlowData(): @@ -42,17 +42,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + hd_simulator.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) - denaliMessages.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) + hd_simulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - denaliMessages.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) + hd_simulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - denaliMessages.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0, 0, 0) utils.tstDone() Index: tst_HDOperationModeData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_HDOperationModeData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_HDOperationModeData/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 opModes = [ @@ -51,21 +51,21 @@ step = 1 for i in range ( 0, len(opModes), step): - denaliMessages.setHDOperationModeData(i + step * 0) + hd_simulator.setHDOperationModeData(i + step * 0) test_values (i + step * 0) - denaliMessages.setHDOperationModeData(1) + hd_simulator.setHDOperationModeData(1) test_values (1) # Coverage - denaliMessages.setHDOperationModeData(1) + hd_simulator.setHDOperationModeData(1) test_values (1) - denaliMessages.setHDOperationModeData(0) + hd_simulator.setHDOperationModeData(0) test_values (0) outOfRangeCheck = len(opModes) + 1 - denaliMessages.setHDOperationModeData(outOfRangeCheck) + hd_simulator.setHDOperationModeData(outOfRangeCheck) test_values (outOfRangeCheck) utils.tstDone() Index: tst_HDOutletFlowData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_HDOutletFlowData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_HDOutletFlowData/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_OutletFlowData(): @@ -42,17 +42,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setTreatmentUltrafiltration(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + hd_simulator.setTreatmentUltrafiltration(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) - denaliMessages.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700) + hd_simulator.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - denaliMessages.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700) + hd_simulator.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - denaliMessages.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0, 0, 0) utils.tstDone() Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u -rbefca1db0402e031a5b692aa93dc74bfb314eb9e -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) +++ tst_HDPressureOcclusionData/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_PressureOcclusionData(): @@ -40,17 +40,17 @@ step = 10 for i in range ( 10, 500, step): - denaliMessages.setPressureOcclusionData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) + hd_simulator.setPressureOcclusionData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) - denaliMessages.setPressureOcclusionData(100, 200, 300, 400, 500) + hd_simulator.setPressureOcclusionData(100, 200, 300, 400, 500) test_values (100, 200, 300, 400, 500) # Coverage - denaliMessages.setPressureOcclusionData(100, 200, 300, 400, 500) + hd_simulator.setPressureOcclusionData(100, 200, 300, 400, 500) test_values (100, 200, 300, 400, 500) - denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0) + hd_simulator.setPressureOcclusionData(0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0) utils.tstDone() Index: tst_HomeScreen/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_HomeScreen/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_HomeScreen/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,7 +13,7 @@ # import names -from dialin.squish import utils +from dialin.ui import utils def main(): Index: tst_Internals/test.py =================================================================== diff -u -r08e394d6afe01356f9ab4da613180112ff86f32d -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Internals/test.py (.../test.py) (revision 08e394d6afe01356f9ab4da613180112ff86f32d) +++ tst_Internals/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,8 +13,7 @@ # -from dialin.squish import utils -from dialin.squish import unittests +from dialin.ui import utils, unittests from dialin.utils.base import is_interface_present, is_interface_up Index: tst_ServiceShutdown/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_ServiceShutdown/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_ServiceShutdown/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,7 +13,8 @@ # import names -from dialin.squish import utils, globals, denaliMessages +from dialin.ui import globals, hd_simulator +from dialin.ui import utils ################################################################################ @@ -38,16 +39,16 @@ test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, globals.SRSUI(vSRSUI)) def showNtest_PowerOffDialog(vSRSUI=""): - denaliMessages.show_PowerOffDialog() + hd_simulator.show_PowerOffDialog() test_PowerOffDialog(vSRSUI) def hideNtest_PowerOffDialog(vSRSUI=""): - denaliMessages.hide_PowerOffDialog() + hd_simulator.hide_PowerOffDialog() test_PowerOffButton(vSRSUI) def showNtest_PowerOffNotificationDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) - denaliMessages.show_PowerOffNotificationDialog() + hd_simulator.show_PowerOffNotificationDialog() test.compare(str(waitForObjectExists(names.o_poweroff_notification).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog") constantPartOfTheMessage = "System is shutting down" test.compare(str(waitForObjectExists(names.o_poweroff_notification).text)[0:len(constantPartOfTheMessage)], constantPartOfTheMessage, mSRSUI + " - Message Text") @@ -56,7 +57,7 @@ def showNtest_PowerOffRejectionDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) - denaliMessages.show_PowerOffRejectionDialog() + hd_simulator.show_PowerOffRejectionDialog() test.compare(str(waitForObjectExists(names.o_poweroff_rejection).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog") constantPartOfTheMessage = "Cannot shutdown during " # there might be the reason, concatenated at the end of the string. test.compare(str(waitForObjectExists(names.o_poweroff_rejection).text)[0:len(constantPartOfTheMessage)], constantPartOfTheMessage, mSRSUI + " - Message Text") Index: tst_TreatmentSalineData/test.py =================================================================== diff -u -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_TreatmentSalineData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4) +++ tst_TreatmentSalineData/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -19,7 +19,7 @@ # o_managerHome_TreatmentSalineBolusData_Delivered = {"container": o_managerHome, "objectName": "_TreatmentSalineBolusData2", "type": "Text"} import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils, hd_simulator def getUnit(): global saline_unit @@ -59,22 +59,22 @@ cumulitive = 0 step = 1 for target in [100, 200, 300]: - denaliMessages.setTreatmentSalineBolusData(target, 0, 0) + hd_simulator.setTreatmentSalineBolusData(target, 0, 0) test_target(target) for value in range ( 0, target, step): cumulitive += step - denaliMessages.setTreatmentSalineBolusData(target, cumulitive, value+1) # 0 is not a step + hd_simulator.setTreatmentSalineBolusData(target, cumulitive, value + 1) # 0 is not a step test_values ( cumulitive, value+1) # 0 is not a step - denaliMessages.setTreatmentSalineBolusData(200, 110, 10) + hd_simulator.setTreatmentSalineBolusData(200, 110, 10) test_target (200 ) test_values ( 110, 10) - denaliMessages.setTreatmentSalineBolusData(200, 110, 10) + hd_simulator.setTreatmentSalineBolusData(200, 110, 10) test_target (200 ) test_values ( 110, 10) - denaliMessages.setTreatmentSalineBolusData( 0, 0, 0) + hd_simulator.setTreatmentSalineBolusData(0, 0, 0) test_target ( 0 ) test_values ( 0, 0) Index: tst_TreatmentScreen/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_TreatmentScreen/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_TreatmentScreen/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,7 +13,7 @@ # import names -from dialin.squish import utils +from dialin.ui import utils def main(): Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -re2b1198b35a5e13749755e0839255d13f746a7c9 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_TreatmentStatesData/test.py (.../test.py) (revision e2b1198b35a5e13749755e0839255d13f746a7c9) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,8 +13,8 @@ # import names -from dialin.squish import utils, denaliMessages -from dialin.squish.denaliMessages import txStates +from dialin.ui import utils, hd_simulator +from dialin.ui.hd_simulator import txStates def gotoScreenNtest_Contains_TreatmentStatesData(): @@ -88,163 +88,163 @@ utils.waitForGUI(1) # start - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_START_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_START_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_RUNNING_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_IDLE) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_COMPLETED_STATE, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_COMPLETED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ) utils.waitForGUI(secPause) Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r9ee1a8b18061f1e3aaf101fb017d546dda397f58 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 9ee1a8b18061f1e3aaf101fb017d546dda397f58) +++ tst_Treatment_Adjustment_BloodDialysate/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_FlowsSection(): @@ -33,14 +33,14 @@ gotoScreenNtest_Contains_FlowsSection() utils.waitForGUI(1) - denaliMessages.setTreatmentBloodFlowRate(175, 0, 0, 0, 0, 0, 0) - denaliMessages.setTreatmentDialysateFlowRate(250, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(175, 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentDialysateFlowRate(250, 1, 1, 1, 1, 1, 1) gotoScreenNTest_Adjustment() utils.waitForGUI(1) - denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) - denaliMessages.send_acknowledge_UI() + hd_simulator.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) + hd_simulator.send_acknowledge_UI() mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) @@ -50,17 +50,17 @@ # sendTreatmentAdjustBloodDialysateRequest mouseClick(waitForObject(names.o_confirmButton)) - denaliMessages.waitForMessageToBeSent() + hd_simulator.waitForMessageToBeSent() utils.waitForGUI(7) # wait for ack timeout 5 is the timeout added +2 Sec for safe range. # sendTreatmentAdjustBloodDialysateRequest again mouseClick(waitForObject(names.o_confirmButton)) - denaliMessages.waitForMessageToBeSent() - denaliMessages.send_acknowledge_HD() + hd_simulator.waitForMessageToBeSent() + hd_simulator.send_acknowledge_HD() - denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage - denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage - denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250) + hd_simulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage + hd_simulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage + hd_simulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250) utils.waitForGUI(2) mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) @@ -69,12 +69,12 @@ test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225) test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).value, 200) - denaliMessages.sendTreatmentAdjustBloodDialysateResponse(1, 0, - waitForObjectExists(names.o_bloodFlowSlider_Slider).value, - waitForObjectExists(names.o_dialysateFlowSlider_Slider).value - ) - denaliMessages.setTreatmentBloodFlowRate(225, 1, 1, 1, 1, 1, 1) - denaliMessages.setTreatmentDialysateFlowRate(200, 0, 0, 0, 0, 0, 0) + hd_simulator.sendTreatmentAdjustBloodDialysateResponse(1, 0, + waitForObjectExists(names.o_bloodFlowSlider_Slider).value, + waitForObjectExists(names.o_dialysateFlowSlider_Slider).value + ) + hd_simulator.setTreatmentBloodFlowRate(225, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentDialysateFlowRate(200, 0, 0, 0, 0, 0, 0) test.compare(str(waitForObjectExists(names.o_treatmentStart_225_Text).text), "225") test.compare(str(waitForObjectExists(names.o_treatmentStart_200_Text).text), "200") Index: tst_Treatment_Adjustment_Duration/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_Adjustment_Duration/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_DurationSection(): @@ -33,13 +33,13 @@ gotoScreenNtest_Contains_DurationSection() utils.waitForGUI(1) - denaliMessages.setTreatmentStartState() + hd_simulator.setTreatmentStartState() durationMin = 0 durationMax = 60 * 3 # 3h durationElapsed = 10 # 10m - denaliMessages.setTreatmentTime(durationMax * 60 , durationElapsed* 60 ) + hd_simulator.setTreatmentTime(durationMax * 60, durationElapsed * 60) test.compare(str(waitForObjectExists(names.o_treatmentStart_TimeText_TimeText ).time), "02:50:00") test.compare(str(waitForObjectExists(names.o_treatmentStart_TimeText_hour_Text ).text), "02") @@ -49,13 +49,13 @@ gotoScreenNTest_Adjustment() utils.waitForGUI(1) - denaliMessages.setTreatmentParamRanges(durationMin, durationMax, 0, 0, 0, 0) + hd_simulator.setTreatmentParamRanges(durationMin, durationMax, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_durationSlider_Slider).minimum, durationMin) test.compare(waitForObjectExists(names.o_durationSlider_Slider).maximum, durationMax) durationMin = 10 # 10m durationMax = 60 * 2 # 2h - denaliMessages.setTreatmentParamRanges(durationMin, durationMax, 0, 0, 0, 0) + hd_simulator.setTreatmentParamRanges(durationMin, durationMax, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_durationSlider_Slider).minimum, durationMin) test.compare(waitForObjectExists(names.o_durationSlider_Slider).maximum, durationMax) @@ -73,20 +73,20 @@ mouseClick(waitForObjectExists(names.o_confirmButton)) # rejected 65, revert to 75 - denaliMessages.sendTreatmentAdjustDurationResponse(0, 4, 75, 0) + hd_simulator.sendTreatmentAdjustDurationResponse(0, 4, 75, 0) test.compare(str(waitForObjectExists(names.o_TimeText_hour_Text_2 ).text), "01") test.compare(str(waitForObjectExists(names.o_TimeText_minute_Text_2).text), "15") # rejected 65, revert to 75 # let's see if we got twice with no change do we still act the same - denaliMessages.sendTreatmentAdjustDurationResponse(0, 4, 75, 0) + hd_simulator.sendTreatmentAdjustDurationResponse(0, 4, 75, 0) test.compare(str(waitForObjectExists(names.o_TimeText_hour_Text_2 ).text), "01") test.compare(str(waitForObjectExists(names.o_TimeText_minute_Text_2).text), "15") test.compare(waitForObjectExists(names.o_modalDialog).visible, True) # accepted - denaliMessages.sendTreatmentAdjustDurationResponse(1, 0, 45, 1000) + hd_simulator.sendTreatmentAdjustDurationResponse(1, 0, 45, 1000) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).visible, True) utils.tstDone() Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -r24485172848ae32d15cf665b2ef024129dec6ca2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 24485172848ae32d15cf665b2ef024129dec6ca2) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -14,8 +14,8 @@ import names -from dialin.squish import utils, denaliMessages -from dialin.squish.denaliMessages import txStates +from dialin.ui import utils, hd_simulator +from dialin.ui.hd_simulator import txStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason @@ -43,7 +43,7 @@ # although rejected value has been sent to check UI only looks for Accept field # value and reason are not related by added those two to have a different value in case of rejection target = 50 + mReason - denaliMessages.setSalineBolusResponse(vAccept, mReason, target, vState) + hd_simulator.setSalineBolusResponse(vAccept, mReason, target, vState) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(vText)) test_target(target) Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -r24485172848ae32d15cf665b2ef024129dec6ca2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 24485172848ae32d15cf665b2ef024129dec6ca2) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,8 +13,8 @@ # import names -from dialin.squish import utils, denaliMessages -from dialin.squish.denaliMessages import txStates +from dialin.ui import utils, hd_simulator +from dialin.ui.hd_simulator import txStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason @@ -61,7 +61,7 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) @@ -105,14 +105,14 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") # [Reject Pause] - denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.value, txStates.UF_RUNNING_STATE) + hd_simulator.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.value, txStates.UF_RUNNING_STATE) # [Reject Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.name) def pause_Accept(): # [Accept Pause] - denaliMessages.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_PAUSED_STATE) + hd_simulator.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_PAUSED_STATE) # [Accept Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") utils.waitForGUI(1) @@ -139,14 +139,14 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") # [Reject Resume] - denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.value, txStates.UF_PAUSED_STATE) + hd_simulator.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.value, txStates.UF_PAUSED_STATE) # [Reject Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.name) def resume_Accept(): # [Accept Resume] - denaliMessages.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_RUNNING_STATE) + hd_simulator.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_RUNNING_STATE) utils.waitForGUI(1) @@ -177,15 +177,15 @@ def edit_RejectNTest(): - denaliMessages.setTreatmentAdjustUltrafiltrationEditRejected(rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.value) + hd_simulator.setTreatmentAdjustUltrafiltrationEditRejected(rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.value) test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).visible, True) #this error message needs to be changed later when translated. test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.name) def updateNTest_Adjustment_Ranges(vMinUFVolume, vMaxUFVolume): # HD sends Ultrafiltration ranges - denaliMessages.setTreatmentParamRanges(0, 0, vMinUFVolume, vMaxUFVolume, 0, 0) + hd_simulator.setTreatmentParamRanges(0, 0, vMinUFVolume, vMaxUFVolume, 0, 0) # Edit Screen updates Ultrafiltration ranges on Slider upon Receiving Ranges test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider).minText.text), "{:.3f}".format(utils.ml2l(vMinUFVolume))) test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider).maxText.text), "{:.3f}".format(utils.ml2l(vMaxUFVolume))) @@ -201,7 +201,7 @@ def adjustmentResponse(): - denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(_Accepted, _Reason, _Volume, _Duration, _DurationDiff, _Rate, _RateDiff, _RateOld) + hd_simulator.setTreatmentAdjustUltrafiltrationEditResponse(_Accepted, _Reason, _Volume, _Duration, _DurationDiff, _Rate, _RateDiff, _RateOld) def next_Accepted(vVolume, vRateState, vDurationState): @@ -319,19 +319,19 @@ def confirm_RejectNTest(): - denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.value) + hd_simulator.setTreatmentAdjustUltrafiltrationConfirmRejected(rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.value) test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True) test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.name) def confirm_RejectNTest_Unknow(): - denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(200) + hd_simulator.setTreatmentAdjustUltrafiltrationConfirmRejected(200) test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True) test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), "[200] Unknown Error") def confirm_Accept(vVolume, vDuration, vRate): - denaliMessages.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, vVolume, vDuration, vRate) + hd_simulator.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, vVolume, vDuration, vRate) def main(): @@ -353,7 +353,7 @@ closeScreen() # Back to main # set the ultrafiltration to running state - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE ) + hd_simulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE) gotoScreen_UltrafiltrationAdjustment() Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_BloodDialysateFlowRate/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_FlowsSection(): @@ -31,49 +31,49 @@ test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "0") - denaliMessages.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) # coverage - denaliMessages.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) + hd_simulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) # coverage + hd_simulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "125") test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "0") - denaliMessages.setTreatmentBloodFlowRate(175, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(175, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "175") - denaliMessages.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + hd_simulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") - denaliMessages.setTreatmentBloodFlowRate(150, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(150, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "150") - denaliMessages.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + hd_simulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125") - denaliMessages.setTreatmentBloodFlowRate(200, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(200, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "200") - denaliMessages.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + hd_simulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125") - denaliMessages.setTreatmentBloodFlowRate(250, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(250, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "250") - denaliMessages.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + hd_simulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") - denaliMessages.setTreatmentBloodFlowRate(275, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(275, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "275") - denaliMessages.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + hd_simulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") - denaliMessages.setTreatmentBloodFlowRate(300, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(300, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "300") - denaliMessages.setTreatmentDialysateFlowRate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55) + hd_simulator.setTreatmentDialysateFlowRate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "155") - denaliMessages.setTreatmentBloodFlowRate(350, 1, 1, 1, 1, 1, 1) + hd_simulator.setTreatmentBloodFlowRate(350, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "350") utils.tstDone() \ No newline at end of file Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_ParametersRange/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_FlowsSection(): @@ -45,18 +45,18 @@ minDF = 150 maxDF = 550 - denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) #coverage - denaliMessages.send_acknowledge_UI() + hd_simulator.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) #coverage + hd_simulator.send_acknowledge_UI() test_Dialysate_Ranges(minDF, maxDF) - denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) - denaliMessages.send_acknowledge_UI() + hd_simulator.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) + hd_simulator.send_acknowledge_UI() test_Dialysate_Ranges(minDF, maxDF) minDF = 200 maxDF = 500 - denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) - denaliMessages.send_acknowledge_UI() + hd_simulator.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) + hd_simulator.send_acknowledge_UI() test_Dialysate_Ranges(minDF, maxDF) utils.tstDone() \ No newline at end of file Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_PressureOcclusion/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_PressureOcclusion(): @@ -29,21 +29,21 @@ gotoScreenNtest_Contains_PressureOcclusion() utils.waitForGUI(1) - denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0) + hd_simulator.setPressureOcclusionData(0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 0) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure , 0) - denaliMessages.setPressureOcclusionData(200, 100, 50, 25, 15) # Coverage + hd_simulator.setPressureOcclusionData(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.setPressureOcclusionData(200, 100, 50, 25, 15) + hd_simulator.setPressureOcclusionData(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) - denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0) + hd_simulator.setPressureOcclusionData(0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 0) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure , 0) Index: tst_Treatment_Section_BloodDialysate/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) @@ -13,7 +13,7 @@ # import names -from dialin.squish import utils +from dialin.ui import utils def main(): Index: tst_Treatment_Time/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3 --- tst_Treatment_Time/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_Time/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_TimeSection(): @@ -22,12 +22,12 @@ def startNTestTreatmentTime(vTotal): for i in range(0,vTotal+1): - denaliMessages.setTreatmentTime(vTotal, i, vTotal - i) + hd_simulator.setTreatmentTime(vTotal, i, vTotal - i) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).parent.parent.parent.parent.progressValue, i) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).parent.parent.parent.parent.timeTextValue, vTotal - i) def resetNTestTreatmentTime(vTotal): - denaliMessages.setTreatmentTime(vTotal, 0, vTotal) + hd_simulator.setTreatmentTime(vTotal, 0, vTotal) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).parent.parent.parent.parent.maximum, vTotal) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).parent.parent.parent.parent.minimum, 0) @@ -40,7 +40,7 @@ gotoScreenNtest_Contains_TimeSection() utils.waitForGUI(1) - denaliMessages.setTreatmentStartState() + hd_simulator.setTreatmentStartState() total = 60 resetNTestTreatmentTime(total) 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)