Index: requirements.txt =================================================================== diff -u -r08e394d6afe01356f9ab4da613180112ff86f32d -r867655840cada2d79fa5028c8fab68516ea59673 --- requirements.txt (.../requirements.txt) (revision 08e394d6afe01356f9ab4da613180112ff86f32d) +++ requirements.txt (.../requirements.txt) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -1,12 +1,16 @@ -aenum==2.2.3 -configparser==5.0.0 +aenum==2.2.4 +certifi==2020.11.8 cycler==0.10.0 -dialin @ git+ssh://git@dvm-linux02:7999/vv/dialin.git@a38adf9aa031c52a18f21b74f91b42bbbfafb794 -kiwisolver==1.2.0 -matplotlib==3.2.2 -numpy==1.18.5 +dialin @ git+ssh://git@192.168.10.132:7999/vv/dialin.git@ced5678ead1dc30ee56f53786c4cce3ac2e1efd6 +kiwisolver==1.3.1 +matplotlib==3.3.2 +numpy==1.19.4 +Pillow==8.0.1 +pkg-resources==0.0.0 pyparsing==2.4.7 -python-can==3.3.3 +PySide2==5.15.0 +python-can==3.3.4 python-dateutil==2.8.1 +shiboken2==5.15.0 six==1.15.0 wrapt==1.12.1 Index: simulator/run.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- simulator/run.py (.../run.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ simulator/run.py (.../run.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -6,12 +6,11 @@ # import names from dialin.ui import utils from dialin import HDSimulator -from dialin.ui.hd_simulator import txStates, EResponse +from dialin.ui.hd_simulator import TXStates, EResponse # Import PySide2 classes from PySide2.QtUiTools import QUiLoader from PySide2 import QtCore, QtWidgets from PySide2.QtCore import QFile, Slot -from PySide2.QtGui import qApp from PySide2.QtCore import QTimer HDSimulator = HDSimulator() @@ -164,11 +163,11 @@ tblSalineSalineStates: QtWidgets.QTableWidget # static class variables - saline_requested_state: txStates + saline_requested_state: TXStates def __init__(self): super().__init__(Simulator.ui_file_name) - self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE self.initialize() def setup_ranges(self): @@ -259,13 +258,13 @@ :return: none """ # toggle the saline requested state - if self.saline_requested_state == txStates.SALINE_BOLUS_STATE_IN_PROGRESS: - self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + if self.saline_requested_state == TXStates.SALINE_BOLUS_STATE_IN_PROGRESS: + self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE else: - self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS + self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IN_PROGRESS target = self.cmbSalineAcceptTarget.currentText() - HDSimulator.setSalineBolusResponse(True, 0, target, self.saline_requested_state) + HDSimulator.cmd_set_saline_bolus_response(True, 0, target, self.saline_requested_state) self.lblSalineAction.setText('Accepted ' + target) @Slot() @@ -275,7 +274,7 @@ :return: none """ reason = self.spnSalineRejectReason.value() - HDSimulator.setSalineBolusResponse(False, reason, 0, self.saline_requested_state) + HDSimulator.cmd_set_saline_bolus_response(False, reason, 0, self.saline_requested_state) self.lblSalineAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -284,8 +283,8 @@ the slot for accept ultrafiltration pause button :return: none """ - HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Accepted, 0, txStates.UF_PAUSED_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + EResponse.Accepted, 0, TXStates.UF_PAUSED_STATE) self.lblUfPauseAction.setText('Accepted ') @Slot() @@ -295,8 +294,8 @@ :return: none """ reason = self.spnUfPauseRejectReason.value() - HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Rejected, reason, txStates.UF_RUNNING_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + EResponse.Rejected, reason, TXStates.UF_RUNNING_STATE) self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -305,8 +304,8 @@ the slot for accept ultrafiltration resume accept :return: none """ - HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Accepted, 0, txStates.UF_RUNNING_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + EResponse.Accepted, 0, TXStates.UF_RUNNING_STATE) self.lblUfResumeAction.setText('Accepted ') @Slot() @@ -316,8 +315,8 @@ :return: none """ reason = self.spnUfResumeRejectReason.value() - HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Rejected, reason, txStates.UF_PAUSED_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + EResponse.Rejected, reason, TXStates.UF_PAUSED_STATE) self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -326,7 +325,7 @@ the slot for accept ultrafiltration next button :return: none """ - HDSimulator.setTreatmentAdjustUltrafiltrationEditResponse( + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_edit_response( EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Accepted ') @@ -337,7 +336,7 @@ :return: none """ reason = self.spnUfEditRejectReason.value() - HDSimulator.setTreatmentAdjustUltrafiltrationEditResponse( + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_edit_response( EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Rejected ' + "{}".format(reason)) @@ -350,34 +349,34 @@ 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() - HDSimulator.setTreatmentStatesData(sub_mode, uf_state, saline) + HDSimulator.cmd_set_treatment_states_data(sub_mode, uf_state, saline) @Slot() def do_saline_data(self): """ the slot which is called to send the saline bolus data - by calling the denaliMessage API setTreatmentSalineBolusData + by calling the denaliMessage API cmd_set_treatment_saline_bolus_data :return: none """ - HDSimulator.setTreatmentSalineBolusData(self.sldSalineTarget.value(), - self.sldSalineCumulative.value(), - self.sldSalineVolume.value()) + HDSimulator.cmd_set_treatment_saline_bolus_data(self.sldSalineTarget.value(), + self.sldSalineCumulative.value(), + self.sldSalineVolume.value()) @Slot() def do_uf_volume_data(self): """ sends the ultrafiltration delivered volume message :return: none """ - HDSimulator.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(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 """ - HDSimulator.setTreatmentParamRanges( + HDSimulator.cmd_set_treatment_parameter_ranges( self.spnDurationMin.value(), self.spnDurationMax.value(), self.spnUFVolumeMin.value(), @@ -406,15 +405,15 @@ utils.tstStart(__file__) # create qt application - QtWidgets.QApplication(sys.argv) + qapp = QtWidgets.QApplication(sys.argv) simulator = Simulator() simulator.show() utils.tstDone() # start qt application main loop - sys.exit(qApp.exec_()) + sys.exit(qapp.exec_()) if __name__ == "__main__": Index: tst_DGDrainPumpData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGDrainPumpData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGDrainPumpData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -23,9 +23,9 @@ test_values(0, 0) -def test_values(vSetPtRPM, vDACValue): - test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPumpData_SetPtRPM).text), "{:.0f}".format(vSetPtRPM)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPumpData_DACValue).text), "{:.0f}".format(vDACValue)) +def test_values(vSetPtRPM, vDACValue): + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGDrainPumpData_SetPtRPM, "text", "{:.0f}".format(vSetPtRPM))).text), "{:.0f}".format(vSetPtRPM)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGDrainPumpData_DACValue, "text", "{:.0f}".format(vDACValue))).text), "{:.0f}".format(vDACValue)) def main(): @@ -39,17 +39,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setDGDrainPumpData(i, i + step * 1) + HDSimulator.cmd_set_dg_drain_pump_data(i, i + step * 1) test_values (i, i + step * 1) - HDSimulator.setDGDrainPumpData(100, 200) + HDSimulator.cmd_set_dg_drain_pump_data(100, 200) test_values (100, 200) - HDSimulator.setDGDrainPumpData(100, 200) + HDSimulator.cmd_set_dg_drain_pump_data(100, 200) test_values (100, 200) # Coverage - HDSimulator.setDGDrainPumpData(0, 0) + HDSimulator.cmd_set_dg_drain_pump_data(0, 0) test_values (0, 0) utils.tstDone() Index: tst_DGHeatersData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGHeatersData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGHeatersData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -40,17 +40,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setDGHeatersData(i, i + step * 1, i + step * 2) + HDSimulator.cmd_set_dg_heaters_data(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - HDSimulator.setDGHeatersData(100, 200, 300) + HDSimulator.cmd_set_dg_heaters_data(100, 200, 300) test_values (100, 200, 300) - HDSimulator.setDGHeatersData(100, 200, 300) + HDSimulator.cmd_set_dg_heaters_data(100, 200, 300) test_values (100, 200, 300) # Coverage - HDSimulator.setDGHeatersData(0, 0, 0) + HDSimulator.cmd_set_dg_heaters_data(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -41,17 +41,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setDGLoadCellReadingsData(i, i + step * 1, i + step * 2, i + step * 3) + HDSimulator.cmd_set_dg_load_cell_readings_data(i, i + step * 1, i + step * 2, i + step * 3) test_values (i, i + step * 1, i + step * 2, i + step * 3) - HDSimulator.setDGLoadCellReadingsData(100, 200, 300, 400) + HDSimulator.cmd_set_dg_load_cell_readings_data(100, 200, 300, 400) test_values (100, 200, 300, 400) - HDSimulator.setDGLoadCellReadingsData(100, 200, 300, 400) + HDSimulator.cmd_set_dg_load_cell_readings_data(100, 200, 300, 400) test_values (100, 200, 300, 400) # Coverage - HDSimulator.setDGLoadCellReadingsData(0, 0, 0, 0) + HDSimulator.cmd_set_dg_load_cell_readings_data(0, 0, 0, 0) test_values (0, 0, 0, 0) utils.tstDone() Index: tst_DGOperationMode/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGOperationMode/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGOperationMode/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -40,9 +40,9 @@ def test_values(vDGOpMode): if (vDGOpMode < len(opModes)): - test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), opModes[vDGOpMode]) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGOperationModeData_DGOpMode, "text", opModes[vDGOpMode])).text), opModes[vDGOpMode]) else: - test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), "UNDEFINED [{}]".format(vDGOpMode)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGOperationModeData_DGOpMode, "text", "UNDEFINED [{}]".format(vDGOpMode))).text), "UNDEFINED [{}]".format(vDGOpMode)) def main(): @@ -56,21 +56,21 @@ step = 1 for i in range ( 0, len(opModes), step): - HDSimulator.setDGOperationMode(i) + HDSimulator.cmd_set_dg_operation_mode(i) test_values (i) - HDSimulator.setDGOperationMode(1) + HDSimulator.cmd_set_dg_operation_mode(1) test_values (1) # Coverage - HDSimulator.setDGOperationMode(1) + HDSimulator.cmd_set_dg_operation_mode(1) test_values (1) - HDSimulator.setDGOperationMode(0) + HDSimulator.cmd_set_dg_operation_mode(0) test_values (0) outOfRangeCheck = len(opModes) + 1 - HDSimulator.setDGOperationMode(outOfRangeCheck) + HDSimulator.cmd_set_dg_operation_mode(outOfRangeCheck) test_values (outOfRangeCheck) utils.tstDone() Index: tst_DGPressureData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGPressureData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGPressureData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -41,17 +41,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setDGPressuresData(i, i + step * 1, i + step * 2, i + step * 3) + HDSimulator.cmd_set_dg_pressures_data(i, i + step * 1, i + step * 2, i + step * 3) test_values (i, i + step * 1, i + step * 2, i + step * 3) - HDSimulator.setDGPressuresData(100, 200, 300, 400) + HDSimulator.cmd_set_dg_pressures_data(100, 200, 300, 400) test_values (100, 200, 300, 400) - HDSimulator.setDGPressuresData(100, 200, 300, 400) + HDSimulator.cmd_set_dg_pressures_data(100, 200, 300, 400) test_values (100, 200, 300, 400) # Coverage - HDSimulator.setDGPressuresData(0, 0, 0, 0) + HDSimulator.cmd_set_dg_pressures_data(0, 0, 0, 0) test_values (0, 0, 0, 0) utils.tstDone() Index: tst_DGROPumpData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGROPumpData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGROPumpData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -40,17 +40,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setDGROPumpData(i, i + step * 1, i + step * 2) + HDSimulator.cmd_set_dg_ro_pump_data(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - HDSimulator.setDGROPumpData(100, 200, 300) + HDSimulator.cmd_set_dg_ro_pump_data(100, 200, 300) test_values (100, 200, 300) - HDSimulator.setDGROPumpData(100, 200, 300) + HDSimulator.cmd_set_dg_ro_pump_data(100, 200, 300) test_values (100, 200, 300) # Coverage - HDSimulator.setDGROPumpData(0, 0, 0) + HDSimulator.cmd_set_dg_ro_pump_data(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGReservoirData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGReservoirData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGReservoirData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -40,17 +40,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setDGReservoirData(i, i + step * 1, i + step * 2) + HDSimulator.cmd_set_dg_reservoir_data(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - HDSimulator.setDGReservoirData(100, 200, 300) + HDSimulator.cmd_set_dg_reservoir_data(100, 200, 300) test_values (100, 200, 300) - HDSimulator.setDGReservoirData(100, 200, 300) + HDSimulator.cmd_set_dg_reservoir_data(100, 200, 300) test_values (100, 200, 300) # Coverage - HDSimulator.setDGReservoirData(0, 0, 0) + HDSimulator.cmd_set_dg_reservoir_data(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGTemperaturesData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -49,17 +49,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.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) + HDSimulator.cmd_set_dg_temperatures_data(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) - HDSimulator.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + HDSimulator.cmd_set_dg_temperatures_data(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) - HDSimulator.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + HDSimulator.cmd_set_dg_temperatures_data(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 - HDSimulator.setDGTemperaturesData(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_dg_temperatures_data(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_DGValvesStatesData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DGValvesStatesData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -37,19 +37,19 @@ gotoScreenNtest_Contains_DGValvesStatesData() utils.waitForGUI(1) - HDSimulator.setDGValvesStates(1) + HDSimulator.cmd_set_dg_valves_states(1) test_values (1) - HDSimulator.setDGValvesStates(2) + HDSimulator.cmd_set_dg_valves_states(2) test_values (2) i = 2 while ( i < 2 ** valvesBitLen ): - HDSimulator.setDGValvesStates(i) + HDSimulator.cmd_set_dg_valves_states(i) test_values (i) i *= 2 - HDSimulator.setDGValvesStates(0) + HDSimulator.cmd_set_dg_valves_states(0) test_values (0) utils.tstDone() Index: tst_HDBloodFlowData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_HDBloodFlowData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_HDBloodFlowData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -24,13 +24,13 @@ def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_FlowSetPoint ).text), "{:.0f}".format( vFlowSetPt )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MeasuredFlow ).text), "{:.2f}".format( vMeasFlow )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_RotorSpeed ).text), "{:.2f}".format( vRotSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorSpeed ).text), "{:.2f}".format( vMotSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMCSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMCCurr )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_PWMDutyCycle ).text), "%" "{:.2f}".format( vPWM )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_FlowSetPoint , "text", "{:.0f}".format( vFlowSetPt ))).text), "{:.0f}".format( vFlowSetPt )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MeasuredFlow , "text", "{:.2f}".format( vMeasFlow ))).text), "{:.2f}".format( vMeasFlow )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_RotorSpeed , "text", "{:.2f}".format( vRotSpd ))).text), "{:.2f}".format( vRotSpd )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorSpeed , "text", "{:.2f}".format( vMotSpd ))).text), "{:.2f}".format( vMotSpd )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlSpeed , "text", "{:.2f}".format( vMCSpd ))).text), "{:.2f}".format( vMCSpd )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlCurrent, "text", "{:.2f}".format( vMCCurr ))).text), "{:.2f}".format( vMCCurr )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_PWMDutyCycle , "text", "%" "{:.2f}".format( vPWM ))).text), "%" "{:.2f}".format( vPWM )) def main(): @@ -44,17 +44,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setTreatmentBloodFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + HDSimulator.cmd_set_treatment_blood_flow_rate(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) - HDSimulator.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) + HDSimulator.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - HDSimulator.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) + HDSimulator.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - HDSimulator.setTreatmentBloodFlowRate(0, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_blood_flow_rate(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_HDInletFlowData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_HDInletFlowData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -24,13 +24,13 @@ def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_FlowSetPoint ).text), "{:.2f}".format( vFlowSetPt )) - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MeasuredFlow ).text), "{:.2f}".format( vMeasFlow )) - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_RotorSpeed ).text), "{:.2f}".format( vRotSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorSpeed ).text), "{:.2f}".format( vMotSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMCSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMCCurr )) - test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_PWMDutyCycle ).text), "%" "{:.2f}".format( vPWM )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_FlowSetPoint , "text", "{:.2f}" .format(vFlowSetPt))).text), "{:.2f}".format(vFlowSetPt)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MeasuredFlow , "text", "{:.2f}" .format(vMeasFlow))) .text), "{:.2f}".format(vMeasFlow)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_RotorSpeed , "text", "{:.2f}" .format(vRotSpd))) .text), "{:.2f}".format(vRotSpd)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MotorSpeed , "text", "{:.2f}" .format(vMotSpd))) .text), "{:.2f}".format(vMotSpd)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MotorCtlSpeed , "text", "{:.2f}" .format(vMCSpd))) .text), "{:.2f}".format(vMCSpd)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MotorCtlCurrent, "text", "{:.2f}" .format(vMCCurr))) .text), "{:.2f}".format(vMCCurr)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_PWMDutyCycle , "text", "%" "{:.2f}".format(vPWM))) .text), "%" "{:.2f}".format(vPWM)) def main(): @@ -44,17 +44,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(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) - HDSimulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - HDSimulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - HDSimulator.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_HDOperationModeData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_HDOperationModeData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -37,9 +37,9 @@ def test_values(vOpMode): if (vOpMode < len(opModes)): - test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), opModes[vOpMode]) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_HDOperationModeData_OpMode, "text", opModes[vOpMode])).text), opModes[vOpMode]) else: - test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), "UNDEFINED [{}]".format(vOpMode)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_HDOperationModeData_OpMode, "text", "UNDEFINED [{}]".format(vOpMode))).text), "UNDEFINED [{}]".format(vOpMode)) def main(): @@ -53,21 +53,21 @@ step = 1 for i in range ( 0, len(opModes), step): - HDSimulator.setHDOperationModeData(i + step * 0) + HDSimulator.cmd_set_hd_operation_mode_data(i + step * 0) test_values (i + step * 0) - HDSimulator.setHDOperationModeData(1) + HDSimulator.cmd_set_hd_operation_mode_data(1) test_values (1) # Coverage - HDSimulator.setHDOperationModeData(1) + HDSimulator.cmd_set_hd_operation_mode_data(1) test_values (1) - HDSimulator.setHDOperationModeData(0) + HDSimulator.cmd_set_hd_operation_mode_data(0) test_values (0) outOfRangeCheck = len(opModes) + 1 - HDSimulator.setHDOperationModeData(outOfRangeCheck) + HDSimulator.cmd_set_hd_operation_mode_data(outOfRangeCheck) test_values (outOfRangeCheck) utils.tstDone() Index: tst_HDOutletFlowData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_HDOutletFlowData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_HDOutletFlowData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -24,13 +24,13 @@ def test_values(vRefUFVol, vMeasUFVol, vRotorSpeed, vMotorSpeed, vMotorCtlSpeed, vMotorCtlCurrent, vPWMDtCycle): - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RefUFVol ).text), "{:.3f}".format(utils.ml2l(vRefUFVol ))) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MeasUFVol ).text), "{:.3f}".format(utils.ml2l(vMeasUFVol ))) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RotorSpeed ).text), "{:.2f}".format( vRotorSpeed )) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorSpeed ).text), "{:.2f}".format( vMotorSpeed )) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMotorCtlSpeed )) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMotorCtlCurrent )) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_PWMDtCycle ).text), "%" "{:.2f}".format( vPWMDtCycle )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_RefUFVol, "text", "{:.3f}".format(utils.ml2l(vRefUFVol)))).text), "{:.3f}".format(utils.ml2l(vRefUFVol))) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MeasUFVol, "text", "{:.3f}".format(utils.ml2l(vMeasUFVol)))).text), "{:.3f}".format(utils.ml2l(vMeasUFVol))) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_RotorSpeed, "text", "{:.2f}".format(vRotorSpeed))).text), "{:.2f}".format(vRotorSpeed)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MotorSpeed, "text", "{:.2f}".format(vMotorSpeed))).text), "{:.2f}".format(vMotorSpeed)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MotorCtlSpeed, "text", "{:.2f}".format(vMotorCtlSpeed))).text), "{:.2f}".format(vMotorCtlSpeed)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MotorCtlCurrent,"text", "{:.2f}".format(vMotorCtlCurrent))).text), "{:.2f}".format(vMotorCtlCurrent)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_PWMDtCycle, "text", "%" "{:.2f}".format(vPWMDtCycle))).text), "%" "{:.2f}".format(vPWMDtCycle)) def main(): @@ -44,17 +44,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setTreatmentUltrafiltration(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(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) - HDSimulator.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - HDSimulator.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - HDSimulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -24,11 +24,11 @@ def test_values(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion): - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_ArterialPressure ).text), "{:.2f}".format(vArterialPressure )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_VenousPressure ).text), "{:.2f}".format(vVenousPressure )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion ).text), "{}" .format(vBloodPumpOcclusion )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion ).text), "{}" .format(vDialysateInletPumpOcclusion )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion).text), "{}" .format(vDialysateOutletPumpOcclusion)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_ArterialPressure, "text", "{:.2f}".format(vArterialPressure))).text), "{:.2f}".format(vArterialPressure)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_VenousPressure, "text", "{:.2f}".format(vVenousPressure))).text), "{:.2f}".format(vVenousPressure)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion, "text", "{}" .format(vBloodPumpOcclusion))).text), "{}".format(vBloodPumpOcclusion)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion, "text", "{}".format(vDialysateInletPumpOcclusion))).text), "{}".format(vDialysateInletPumpOcclusion)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion, "text", "{}".format(vDialysateOutletPumpOcclusion))).text), "{}".format(vDialysateOutletPumpOcclusion)) def main(): @@ -42,17 +42,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.setPressureOcclusionData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) + HDSimulator.cmd_set_pressure_occlusion_data(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) - HDSimulator.setPressureOcclusionData(100, 200, 300, 400, 500) + HDSimulator.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500) test_values (100, 200, 300, 400, 500) # Coverage - HDSimulator.setPressureOcclusionData(100, 200, 300, 400, 500) + HDSimulator.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500) test_values (100, 200, 300, 400, 500) - HDSimulator.setPressureOcclusionData(0, 0, 0, 0, 0) + HDSimulator.cmd_set_pressure_occlusion_data(0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0) utils.tstDone() Index: tst_TreatmentSalineData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_TreatmentSalineData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_TreatmentSalineData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -61,22 +61,22 @@ cumulitive = 0 step = 1 for target in [100, 200, 300]: - HDSimulator.setTreatmentSalineBolusData(target, 0, 0) + HDSimulator.cmd_set_treatment_saline_bolus_data(target, 0, 0) test_target(target) for value in range ( 0, target, step): cumulitive += step - HDSimulator.setTreatmentSalineBolusData(target, cumulitive, value + 1) # 0 is not a step + HDSimulator.cmd_set_treatment_saline_bolus_data(target, cumulitive, value + 1) # 0 is not a step test_values ( cumulitive, value+1) # 0 is not a step - HDSimulator.setTreatmentSalineBolusData(200, 110, 10) + HDSimulator.cmd_set_treatment_saline_bolus_data(200, 110, 10) test_target (200 ) test_values ( 110, 10) - HDSimulator.setTreatmentSalineBolusData(200, 110, 10) + HDSimulator.cmd_set_treatment_saline_bolus_data(200, 110, 10) test_target (200 ) test_values ( 110, 10) - HDSimulator.setTreatmentSalineBolusData(0, 0, 0) + HDSimulator.cmd_set_treatment_saline_bolus_data(0, 0, 0) test_target ( 0 ) test_values ( 0, 0) Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_TreatmentStatesData/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -15,68 +15,68 @@ import names from dialin.ui import utils from dialin import HDSimulator -from dialin.ui.hd_simulator import txStates +from dialin.ui.hd_simulator import TXStates HDSimulator = HDSimulator() def gotoScreenNtest_Contains_TreatmentStatesData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) # default state of the in-treatment - test_values(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) def test_values(vSubMode, vUFState, vSalineState): # these test cases are not always depending on each other - if (vSubMode == txStates.TREATMENT_DIALYSIS_STATE_NOT): + if (vSubMode == TXStates.TREATMENT_DIALYSIS_STATE_NOT): test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage ).visible, False ) test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_second ).visible, False ) test.compare( findObject (names.o_treatmentStart_treatmentTime_notification ).visible, True ) - if (vSubMode == txStates.TREATMENT_DIALYSIS_STATE ): + if (vSubMode == TXStates.TREATMENT_DIALYSIS_STATE): test.compare( findObject (names.o_treatmentStart_treatmentTime_arrowImage ).visible, True ) test.compare( findObject (names.o_treatmentStart_treatmentTime_second ).visible, True ) test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_notification ).visible, False ) test.compare(str(waitForObjectExists(names.o_treatmentStart_treatmentTime_notification ).text ), "Treatment Paused") - if (vUFState == txStates.UF_OFF_STATE ): + if (vUFState == TXStates.UF_OFF_STATE): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).visible , True) test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).text ) , "Ultrafiltration is off" ) - if (vUFState == txStates.UF_PAUSED_STATE ): + if (vUFState == TXStates.UF_PAUSED_STATE): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).visible , True) test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).text ) , "Ultrafiltration is paused" ) - if (vUFState == txStates.UF_COMPLETED_STATE ): + if (vUFState == TXStates.UF_COMPLETED_STATE): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).visible , True) test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).text ) , "Ultrafiltration is completed" ) - if (vSalineState == txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ): + if (vSalineState == TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED): test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection ).isTouchable, False) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineStart ).text.text), "START BOLUS") test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineNotification ).text ), "Maximum cumulative saline bolus volume delivered") test.compare( waitForObjectExists(names.o_treatmentStart_SalineNotification ).visible, True) # in all the other cases it should be enabled test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, - not ( - vSalineState == txStates.SALINE_BOLUS_STATE_MAX_DELIVERED or - vSalineState == txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP + not ( + vSalineState == TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED or + vSalineState == TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ) ) - if (vSalineState == txStates.SALINE_BOLUS_STATE_IDLE ): + if (vSalineState == TXStates.SALINE_BOLUS_STATE_IDLE): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_section ).isTouchable, True ) utils.waitForGUI() mouseClick ( waitForObject (names.o_treatmentStart_ultrafiltration_section)) utils.waitForGUI() - if (vUFState == txStates.UF_RUNNING_STATE ): + if (vUFState == TXStates.UF_RUNNING_STATE): test.compare( findObject (names.o_treatmentAdjustmentUltrafiltrationStart_Screen ).visible , True ) else: test.compare( findObject (names.o_treatmentAdjustmentUltrafiltrationPaused_Screen ).visible , True ) mouseClick ( waitForObject (names.o_closeButton)) - if (vSalineState == txStates.SALINE_BOLUS_STATE_IN_PROGRESS ): + if (vSalineState == TXStates.SALINE_BOLUS_STATE_IN_PROGRESS): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_section ).isTouchable, False ) @@ -90,164 +90,164 @@ utils.waitForGUI(1) # start - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) - HDSimulator.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 ) + HDSimulator.cmd_set_treatment_states_data(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) utils.tstDone() Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -35,13 +35,13 @@ gotoScreenNtest_Contains_FlowsSection() utils.waitForGUI(1) - HDSimulator.setTreatmentBloodFlowRate(175, 0, 0, 0, 0, 0, 0) - HDSimulator.setTreatmentDialysateFlowRate(250, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(175, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(250, 1, 1, 1, 1, 1, 1) gotoScreenNTest_Adjustment() utils.waitForGUI(1) - HDSimulator.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) + HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550) HDSimulator.send_acknowledge_UI() mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) @@ -60,9 +60,9 @@ HDSimulator.waitForMessageToBeSent() HDSimulator.send_acknowledge_HD() - HDSimulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage - HDSimulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage - HDSimulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250) + HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage + HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage + HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 175, 250) utils.waitForGUI(2) mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) @@ -71,12 +71,12 @@ test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225) test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).value, 200) - HDSimulator.sendTreatmentAdjustBloodDialysateResponse(1, 0, - waitForObjectExists(names.o_bloodFlowSlider_Slider).value, - waitForObjectExists(names.o_dialysateFlowSlider_Slider).value - ) - HDSimulator.setTreatmentBloodFlowRate(225, 1, 1, 1, 1, 1, 1) - HDSimulator.setTreatmentDialysateFlowRate(200, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(1, 0, + waitForObjectExists(names.o_bloodFlowSlider_Slider).value, + waitForObjectExists(names.o_dialysateFlowSlider_Slider).value + ) + HDSimulator.cmd_set_treatment_blood_flow_rate(225, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -35,13 +35,13 @@ gotoScreenNtest_Contains_DurationSection() utils.waitForGUI(1) - HDSimulator.setTreatmentStartState() + HDSimulator.cmd_set_treatment_start_state() durationMin = 0 durationMax = 60 * 3 # 3h durationElapsed = 10 # 10m - HDSimulator.setTreatmentTime(durationMax * 60, durationElapsed * 60) + HDSimulator.cmd_set_treatment_time(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") @@ -51,13 +51,13 @@ gotoScreenNTest_Adjustment() utils.waitForGUI(1) - HDSimulator.setTreatmentParamRanges(durationMin, durationMax, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_parameter_ranges(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 - HDSimulator.setTreatmentParamRanges(durationMin, durationMax, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_parameter_ranges(durationMin, durationMax, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_durationSlider_Slider).minimum, durationMin) test.compare(waitForObjectExists(names.o_durationSlider_Slider).maximum, durationMax) @@ -75,20 +75,20 @@ mouseClick(waitForObjectExists(names.o_confirmButton)) # rejected 65, revert to 75 - HDSimulator.sendTreatmentAdjustDurationResponse(0, 4, 75, 0) + HDSimulator.cmd_send_treatment_adjust_duration_response(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 - HDSimulator.sendTreatmentAdjustDurationResponse(0, 4, 75, 0) + HDSimulator.cmd_send_treatment_adjust_duration_response(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 - HDSimulator.sendTreatmentAdjustDurationResponse(1, 0, 45, 1000) + HDSimulator.cmd_send_treatment_adjust_duration_response(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -16,7 +16,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -from dialin.ui.hd_simulator import txStates +from dialin.ui.hd_simulator import TXStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason HDSimulator = HDSimulator() @@ -46,7 +46,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 - HDSimulator.setSalineBolusResponse(vAccept, mReason, target, vState) + HDSimulator.cmd_set_saline_bolus_response(vAccept, mReason, target, vState) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(vText)) test_target(target) @@ -66,39 +66,39 @@ test_ultrafiltration_touchable(True ) # Initial Idle => Running => Rejected -> Idle/START/UF_True - test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_state(False, "START", TXStates.SALINE_BOLUS_STATE_IDLE) test_ultrafiltration_touchable(True ) # retry Idle => Running => Rejected -> Idle/START/UF_True - test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_state(False, "START", TXStates.SALINE_BOLUS_STATE_IDLE) test_ultrafiltration_touchable(True ) # Still Idle => Running => Accepted -> Running/STOP/UF_False - test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + test_state(True, "STOP", TXStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_ultrafiltration_touchable(False) # Now Running => Idle => Rejected -> Running/STOP/UF_False - test_state(False, "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + test_state(False, "STOP", TXStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_ultrafiltration_touchable(False) # Retry Running => Idle => Rejected -> Running/STOP/UF_False - test_state(False, "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + test_state(False, "STOP", TXStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_ultrafiltration_touchable(False) # Still Running => Idle => Accepted -> Idle/START/UF_True - test_state(True , "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_state(True, "START", TXStates.SALINE_BOLUS_STATE_IDLE) test_ultrafiltration_touchable(True ) # Now Idle => Running => Rejected -> Idle/START/UF_True - test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_state(False, "START", TXStates.SALINE_BOLUS_STATE_IDLE) test_ultrafiltration_touchable(True ) # Retry Idle => Running => Rejected -> Idle/START/UF_True - test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_state(False, "START", TXStates.SALINE_BOLUS_STATE_IDLE) test_ultrafiltration_touchable(True ) # Still Idle => Running => Accepted -> Running/STOP/UF_False - test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) + test_state(True, "STOP", TXStates.SALINE_BOLUS_STATE_IN_PROGRESS) test_ultrafiltration_touchable(False) Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -from dialin.ui.hd_simulator import txStates +from dialin.ui.hd_simulator import TXStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason HDSimulator = HDSimulator() @@ -63,7 +63,7 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - HDSimulator.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(vMaxUF, i, 1, 1, 1, 1, 1) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) @@ -107,14 +107,14 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") # [Reject Pause] - HDSimulator.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.value, txStates.UF_RUNNING_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_rejected(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] - HDSimulator.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_PAUSED_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_accepted(TXStates.UF_PAUSED_STATE) # [Accept Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") utils.waitForGUI(1) @@ -141,14 +141,14 @@ # [Normal Notification] test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") # [Reject Resume] - HDSimulator.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.value, txStates.UF_PAUSED_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_rejected(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] - HDSimulator.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_RUNNING_STATE) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_accepted(TXStates.UF_RUNNING_STATE) utils.waitForGUI(1) @@ -179,15 +179,15 @@ def edit_RejectNTest(): - HDSimulator.setTreatmentAdjustUltrafiltrationEditRejected(rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.value) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_edit_rejected(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 - HDSimulator.setTreatmentParamRanges(0, 0, vMinUFVolume, vMaxUFVolume, 0, 0) + HDSimulator.cmd_set_treatment_parameter_ranges(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))) @@ -203,7 +203,7 @@ def adjustmentResponse(): - HDSimulator.setTreatmentAdjustUltrafiltrationEditResponse(_Accepted, _Reason, _Volume, _Duration, _DurationDiff, _Rate, _RateDiff, _RateOld) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(_Accepted, _Reason, _Volume, _Duration, _DurationDiff, _Rate, _RateDiff, _RateOld) def next_Accepted(vVolume, vRateState, vDurationState): @@ -321,19 +321,19 @@ def confirm_RejectNTest(): - HDSimulator.setTreatmentAdjustUltrafiltrationConfirmRejected(rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.value) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(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(): - HDSimulator.setTreatmentAdjustUltrafiltrationConfirmRejected(200) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(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): - HDSimulator.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, vVolume, vDuration, vRate) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(1, 0, vVolume, vDuration, vRate) def main(): @@ -355,7 +355,7 @@ closeScreen() # Back to main # set the ultrafiltration to running state - HDSimulator.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE) + HDSimulator.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE_NOT, TXStates.UF_RUNNING_STATE, TXStates.SALINE_BOLUS_STATE_IDLE) gotoScreen_UltrafiltrationAdjustment() Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -33,49 +33,49 @@ test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "0") - HDSimulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) # coverage - HDSimulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_blood_flow_rate(125, 0, 0, 0, 0, 0, 0) # coverage + HDSimulator.cmd_set_treatment_blood_flow_rate(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") - HDSimulator.setTreatmentBloodFlowRate(175, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(175, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "175") - HDSimulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") - HDSimulator.setTreatmentBloodFlowRate(150, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(150, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "150") - HDSimulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125") - HDSimulator.setTreatmentBloodFlowRate(200, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(200, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "200") - HDSimulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125") - HDSimulator.setTreatmentBloodFlowRate(250, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(250, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "250") - HDSimulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") - HDSimulator.setTreatmentBloodFlowRate(275, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(275, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "275") - HDSimulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") - HDSimulator.setTreatmentBloodFlowRate(300, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(300, 1, 1, 1, 1, 1, 1) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "300") - HDSimulator.setTreatmentDialysateFlowRate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55) + HDSimulator.cmd_set_treatment_dialysate_flow_rate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55) test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "155") - HDSimulator.setTreatmentBloodFlowRate(350, 1, 1, 1, 1, 1, 1) + HDSimulator.cmd_set_treatment_blood_flow_rate(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 -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -47,17 +47,17 @@ minDF = 150 maxDF = 550 - HDSimulator.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) #coverage + HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) #coverage HDSimulator.send_acknowledge_UI() test_Dialysate_Ranges(minDF, maxDF) - HDSimulator.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) + HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) HDSimulator.send_acknowledge_UI() test_Dialysate_Ranges(minDF, maxDF) minDF = 200 maxDF = 500 - HDSimulator.setTreatmentParamRanges(0, 0, 0, 0, minDF, maxDF) + HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) HDSimulator.send_acknowledge_UI() test_Dialysate_Ranges(minDF, maxDF) Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -31,21 +31,21 @@ gotoScreenNtest_Contains_PressureOcclusion() utils.waitForGUI(1) - HDSimulator.setPressureOcclusionData(0, 0, 0, 0, 0) + HDSimulator.cmd_set_pressure_occlusion_data(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) - HDSimulator.setPressureOcclusionData(200, 100, 50, 25, 15) # Coverage + HDSimulator.cmd_set_pressure_occlusion_data(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) - HDSimulator.setPressureOcclusionData(200, 100, 50, 25, 15) + HDSimulator.cmd_set_pressure_occlusion_data(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) - HDSimulator.setPressureOcclusionData(0, 0, 0, 0, 0) + HDSimulator.cmd_set_pressure_occlusion_data(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_Time/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_Time/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_Time/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -24,12 +24,12 @@ def startNTestTreatmentTime(vTotal): for i in range(0,vTotal+1): - HDSimulator.setTreatmentTime(vTotal, i, vTotal - i) + HDSimulator.cmd_set_treatment_time(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): - HDSimulator.setTreatmentTime(vTotal, 0, vTotal) + HDSimulator.cmd_set_treatment_time(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) @@ -42,7 +42,7 @@ gotoScreenNtest_Contains_TimeSection() utils.waitForGUI(1) - HDSimulator.setTreatmentStartState() + HDSimulator.cmd_set_treatment_start_state() total = 60 resetNTestTreatmentTime(total) Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) @@ -24,12 +24,12 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - HDSimulator.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(i, i, 0, 0, 0, 0, 0) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) def resetNTestTreatmentUltrafiltration(): - HDSimulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0) + HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(0, 0, 0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0) @@ -51,7 +51,7 @@ startNTestTreatmentUltrafiltration(minUF, maxUF) maxUF = 300 - HDSimulator.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, maxUF, 30, 5) + HDSimulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(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)