Index: requirements.txt =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- requirements.txt (.../requirements.txt) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ requirements.txt (.../requirements.txt) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -1,7 +1,6 @@ aenum==2.2.4 certifi==2020.11.8 cycler==0.10.0 -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 Index: simulator/run.py =================================================================== diff -u -r69b2aacf31c5fdc28e078f87dbdee5c3ab672dd1 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- simulator/run.py (.../run.py) (revision 69b2aacf31c5fdc28e078f87dbdee5c3ab672dd1) +++ simulator/run.py (.../run.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -3,7 +3,7 @@ to load the main simulator loader widget """ import sys -from dialin.squish import utils +from dialin.ui import utils from PySide2 import QtCore, QtWidgets from simulator.loader import Simulator Index: simulator/simulator/loader.py =================================================================== diff -u -rf921975179b1c1ad61d841b9db5976c00432fdcc -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- simulator/simulator/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) +++ simulator/simulator/loader.py (.../loader.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -3,8 +3,8 @@ """ import os -from dialin.squish.denaliMessages import txStates -from dialin.squish.utils import check_can0 +from dialin.ui.hd_simulator import TXStates +from dialin.ui.utils import check_can0 from PySide2 import QtWidgets from PySide2.QtCore import Qt @@ -32,7 +32,7 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) - self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE if self.__check_can_bus(): self.__hd_simulator = HDSimulator() self.__init_plugins() Index: tst_AlarmStatusData/test.py =================================================================== diff -u -r4becb22543b290e42c8663e4d9ad59323bdec355 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_AlarmStatusData/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) +++ tst_AlarmStatusData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -16,7 +16,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() # buttons position/definition in alarm flags @@ -201,29 +201,29 @@ alarm_buttons_Resume_End , alarm_buttons_RinseBack_End , alarm_buttons_Resume_RinseBack_End ): - HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, 1, 0, 0, buttons) + hd_sim.alarms_simulator.cmd_activate_alarm_id(1, 1, 0, 0, buttons) test_buttons ( buttons) ## -------------------- Alarm Dialog/Bar: test silence # --------------------- Alarm Dialog/Bar: not muted for mute_timeout in (0, 40, 40, 60, 75, 75): - HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, 1 ,0, mute_timeout, alarm_flag_unmute) + hd_sim.alarms_simulator.cmd_activate_alarm_id(1, 1 ,0, mute_timeout, alarm_flag_unmute) test_silence ( mute_timeout, alarm_flag_unmute) # --------------------- Alarm Dialog/Bar: muted mouseClick(waitForObject(names.o_alarm_button_mute)) for mute_timeout in (0, 10, 20, 30, 30, 100): - HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, 2 ,0, mute_timeout, alarm_flag_mute) + hd_sim.alarms_simulator.cmd_activate_alarm_id(1, 2 ,0, mute_timeout, alarm_flag_mute) test_silence ( mute_timeout, alarm_flag_mute) ## -------------------- Alarm Dialog/Bar: test alarm messages mouseClick(waitForObject(names.o_alarm_button_mute)) for alarm_id in (5, 5 , 6, 7, 8, 9, 10, 10, alarm_id_outofrange, alarm_id_outofrange, alarm_id_noalarm, alarm_id_noalarm): # not all of alarms are required to be tested. - HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, alarm_id, 0, 0, 0) + hd_sim.alarms_simulator.cmd_activate_alarm_id(1, alarm_id, 0, 0, 0) test_messages ( alarm_id ) Index: tst_AlarmTriggered/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_AlarmTriggered/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_AlarmTriggered/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -16,7 +16,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) def test_values(vAlarmID): @@ -29,17 +29,17 @@ utils.waitForGUI(1) for i in range(len(names.AlarmTextMap)): - HDSimulator.alarms_simulator.cmd_set_alarm_triggered(i) + hd_sim.alarms_simulator.cmd_set_alarm_triggered(i) test_values(i) - HDSimulator.alarms_simulator.cmd_set_alarm_triggered(1) + hd_sim.alarms_simulator.cmd_set_alarm_triggered(1) test_values(1) # Coverage - HDSimulator.alarms_simulator.cmd_set_alarm_triggered(1) + hd_sim.alarms_simulator.cmd_set_alarm_triggered(1) test_values(1) - HDSimulator.alarms_simulator.cmd_set_alarm_triggered(0) + hd_sim.alarms_simulator.cmd_set_alarm_triggered(0) test_values(0) utils.tstDone() Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_CANBusFaultCount/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_CANBusFaultCount(): @@ -36,16 +36,16 @@ gotoScreenNtest_Contains_CANBusFaultCount() utils.waitForGUI(1) - HDSimulator.cmd_set_canbus_fault_count(10) + hd_sim.cmd_set_canbus_fault_count(10) test_values (10) - HDSimulator.cmd_set_canbus_fault_count(100) + hd_sim.cmd_set_canbus_fault_count(100) test_values (100) - HDSimulator.cmd_set_canbus_fault_count(100) # Coverage + hd_sim.cmd_set_canbus_fault_count(100) # Coverage test_values (100) - HDSimulator.cmd_set_canbus_fault_count(0) + hd_sim.cmd_set_canbus_fault_count(0) test_values (0) utils.tstDone() Index: tst_DGDrainPumpData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGDrainPumpData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGDrainPumpData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGDrainPumpData(): @@ -39,17 +39,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_dg_drain_pump_data(i, i + step * 1) + hd_sim.cmd_set_dg_drain_pump_data(i, i + step * 1) test_values (i, i + step * 1) - HDSimulator.cmd_set_dg_drain_pump_data(100, 200) + hd_sim.cmd_set_dg_drain_pump_data(100, 200) test_values (100, 200) - HDSimulator.cmd_set_dg_drain_pump_data(100, 200) + hd_sim.cmd_set_dg_drain_pump_data(100, 200) test_values (100, 200) # Coverage - HDSimulator.cmd_set_dg_drain_pump_data(0, 0) + hd_sim.cmd_set_dg_drain_pump_data(0, 0) test_values (0, 0) utils.tstDone() Index: tst_DGHeatersData/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGHeatersData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DGHeatersData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGHeatersData(): @@ -40,17 +40,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_dg_heaters_data(i, i + step * 1, i + step * 2) + hd_sim.cmd_set_dg_heaters_data(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - HDSimulator.cmd_set_dg_heaters_data(100, 200, 300) + hd_sim.cmd_set_dg_heaters_data(100, 200, 300) test_values (100, 200, 300) - HDSimulator.cmd_set_dg_heaters_data(100, 200, 300) + hd_sim.cmd_set_dg_heaters_data(100, 200, 300) test_values (100, 200, 300) # Coverage - HDSimulator.cmd_set_dg_heaters_data(0, 0, 0) + hd_sim.cmd_set_dg_heaters_data(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DGLoadCellReadingsData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGLoadCellReadingsData(): @@ -41,17 +41,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_dg_load_cell_readings_data(i, i + step * 1, i + step * 2, i + step * 3) + hd_sim.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.cmd_set_dg_load_cell_readings_data(100, 200, 300, 400) + hd_sim.cmd_set_dg_load_cell_readings_data(100, 200, 300, 400) test_values (100, 200, 300, 400) - HDSimulator.cmd_set_dg_load_cell_readings_data(100, 200, 300, 400) + hd_sim.cmd_set_dg_load_cell_readings_data(100, 200, 300, 400) test_values (100, 200, 300, 400) # Coverage - HDSimulator.cmd_set_dg_load_cell_readings_data(0, 0, 0, 0) + hd_sim.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 -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGOperationMode/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGOperationMode/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() opModes = [ @@ -56,21 +56,21 @@ step = 1 for i in range ( 0, len(opModes), step): - HDSimulator.cmd_set_dg_operation_mode(i) + hd_sim.cmd_set_dg_operation_mode(i) test_values (i) - HDSimulator.cmd_set_dg_operation_mode(1) + hd_sim.cmd_set_dg_operation_mode(1) test_values (1) # Coverage - HDSimulator.cmd_set_dg_operation_mode(1) + hd_sim.cmd_set_dg_operation_mode(1) test_values (1) - HDSimulator.cmd_set_dg_operation_mode(0) + hd_sim.cmd_set_dg_operation_mode(0) test_values (0) outOfRangeCheck = len(opModes) + 1 - HDSimulator.cmd_set_dg_operation_mode(outOfRangeCheck) + hd_sim.cmd_set_dg_operation_mode(outOfRangeCheck) test_values (outOfRangeCheck) utils.tstDone() Index: tst_DGPressureData/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGPressureData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DGPressureData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGPressuresData(): @@ -41,17 +41,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_dg_pressures_data(i, i + step * 1, i + step * 2, i + step * 3) + hd_sim.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.cmd_set_dg_pressures_data(100, 200, 300, 400) + hd_sim.cmd_set_dg_pressures_data(100, 200, 300, 400) test_values (100, 200, 300, 400) - HDSimulator.cmd_set_dg_pressures_data(100, 200, 300, 400) + hd_sim.cmd_set_dg_pressures_data(100, 200, 300, 400) test_values (100, 200, 300, 400) # Coverage - HDSimulator.cmd_set_dg_pressures_data(0, 0, 0, 0) + hd_sim.cmd_set_dg_pressures_data(0, 0, 0, 0) test_values (0, 0, 0, 0) utils.tstDone() Index: tst_DGROPumpData/test.py =================================================================== diff -u -rca79dc7f50fc912b05da91321d8652934aee0764 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGROPumpData/test.py (.../test.py) (revision ca79dc7f50fc912b05da91321d8652934aee0764) +++ tst_DGROPumpData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGROPumpData(): @@ -46,17 +46,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_dg_ro_pump_data(i, i + step * 1, i + step * 2) + hd_sim.cmd_set_dg_ro_pump_data(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - HDSimulator.cmd_set_dg_ro_pump_data(100, 200, 300) + hd_sim.cmd_set_dg_ro_pump_data(100, 200, 300) test_values (100, 200, 300) - HDSimulator.cmd_set_dg_ro_pump_data(100, 200, 300) + hd_sim.cmd_set_dg_ro_pump_data(100, 200, 300) test_values (100, 200, 300) # Coverage - HDSimulator.cmd_set_dg_ro_pump_data(0, 0, 0) + hd_sim.cmd_set_dg_ro_pump_data(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGReservoirData/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGReservoirData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DGReservoirData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGReservoirData(): @@ -40,17 +40,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_dg_reservoir_data(i, i + step * 1, i + step * 2) + hd_sim.cmd_set_dg_reservoir_data(i, i + step * 1, i + step * 2) test_values (i, i + step * 1, i + step * 2) - HDSimulator.cmd_set_dg_reservoir_data(100, 200, 300) + hd_sim.cmd_set_dg_reservoir_data(100, 200, 300) test_values (100, 200, 300) - HDSimulator.cmd_set_dg_reservoir_data(100, 200, 300) + hd_sim.cmd_set_dg_reservoir_data(100, 200, 300) test_values (100, 200, 300) # Coverage - HDSimulator.cmd_set_dg_reservoir_data(0, 0, 0) + hd_sim.cmd_set_dg_reservoir_data(0, 0, 0) test_values (0, 0, 0) utils.tstDone() Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGTemperaturesData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DGTemperaturesData(): @@ -49,17 +49,17 @@ step = 10 for i in range ( 10, 500, step): - 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) + hd_sim.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.cmd_set_dg_temperatures_data(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + hd_sim.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.cmd_set_dg_temperatures_data(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + hd_sim.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.cmd_set_dg_temperatures_data(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + hd_sim.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 -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DGValvesStatesData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DGValvesStatesData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() valvesBitLen = 12 @@ -37,19 +37,19 @@ gotoScreenNtest_Contains_DGValvesStatesData() utils.waitForGUI(1) - HDSimulator.cmd_set_dg_valves_states(1) + hd_sim.cmd_set_dg_valves_states(1) test_values (1) - HDSimulator.cmd_set_dg_valves_states(2) + hd_sim.cmd_set_dg_valves_states(2) test_values (2) i = 2 while ( i < 2 ** valvesBitLen ): - HDSimulator.cmd_set_dg_valves_states(i) + hd_sim.cmd_set_dg_valves_states(i) test_values (i) i *= 2 - HDSimulator.cmd_set_dg_valves_states(0) + hd_sim.cmd_set_dg_valves_states(0) test_values (0) utils.tstDone() Index: tst_DebugText/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_DebugText/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_DebugText/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def main(): @@ -25,8 +25,8 @@ utils.waitForGUI(1) # these tests are used for debugging and are placeholder for later use cases. - HDSimulator.cmd_send_checkin_dg() - HDSimulator.cmd_set_dg_debug_text("01234567890123456789012345678901234567820123456789") - HDSimulator.cmd_set_hd_debug_text("01234567890123456789012345678901234567810123456789") + hd_sim.cmd_send_checkin_dg() + hd_sim.cmd_set_dg_debug_text("01234567890123456789012345678901234567820123456789") + hd_sim.cmd_set_hd_debug_text("01234567890123456789012345678901234567810123456789") utils.tstDone() Index: tst_HDBloodFlowData/test.py =================================================================== diff -u -r4becb22543b290e42c8663e4d9ad59323bdec355 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_HDBloodFlowData/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) +++ tst_HDBloodFlowData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_BloodFlowData(): @@ -47,17 +47,17 @@ step = 10 for i in range ( 10, 500, step): - 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) + hd_sim.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.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700) + hd_sim.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - HDSimulator.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700) + hd_sim.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - HDSimulator.cmd_set_treatment_blood_flow_rate(0, 0, 0, 0, 0, 0, 0) + hd_sim.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 -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_HDInletFlowData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_HDInletFlowData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_InletFlowData(): @@ -44,17 +44,17 @@ step = 10 for i in range ( 10, 500, step): - 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) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700) + hd_sim.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) # Coverage - HDSimulator.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700) + hd_sim.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - HDSimulator.cmd_set_treatment_dialysate_flow_rate(0, 0, 0, 0, 0, 0, 0) + hd_sim.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 -r310f51a5ed4921f184572f90d07b350ec41c0bae -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_HDOperationModeData/test.py (.../test.py) (revision 310f51a5ed4921f184572f90d07b350ec41c0bae) +++ tst_HDOperationModeData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() opModes = [ @@ -52,21 +52,21 @@ step = 1 for i in range ( 0, len(opModes), step): - HDSimulator.cmd_set_hd_operation_mode_data(i + step * 0) + hd_sim.cmd_set_hd_operation_mode_data(i + step * 0) test_values (i + step * 0) - HDSimulator.cmd_set_hd_operation_mode_data(1) + hd_sim.cmd_set_hd_operation_mode_data(1) test_values (1) # Coverage - HDSimulator.cmd_set_hd_operation_mode_data(1) + hd_sim.cmd_set_hd_operation_mode_data(1) test_values (1) - HDSimulator.cmd_set_hd_operation_mode_data(0) + hd_sim.cmd_set_hd_operation_mode_data(0) test_values (0) outOfRangeCheck = len(opModes) + 1 - HDSimulator.cmd_set_hd_operation_mode_data(outOfRangeCheck) + hd_sim.cmd_set_hd_operation_mode_data(outOfRangeCheck) test_values (outOfRangeCheck) utils.tstDone() Index: tst_HDOutletFlowData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_HDOutletFlowData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_HDOutletFlowData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_OutletFlowData(): @@ -44,17 +44,17 @@ step = 10 for i in range ( 10, 500, step): - 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) + hd_sim.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.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700) + hd_sim.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.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700) + hd_sim.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700) test_values (100, 200, 300, 400, 500, 600, 700) - HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(0, 0, 0, 0, 0, 0, 0) + hd_sim.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 -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_PressureOcclusionData(): @@ -42,17 +42,17 @@ step = 10 for i in range ( 10, 500, step): - HDSimulator.cmd_set_pressure_occlusion_data(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) + hd_sim.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.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500) + hd_sim.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500) test_values (100, 200, 300, 400, 500) # Coverage - HDSimulator.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500) + hd_sim.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500) test_values (100, 200, 300, 400, 500) - HDSimulator.cmd_set_pressure_occlusion_data(0, 0, 0, 0, 0) + hd_sim.cmd_set_pressure_occlusion_data(0, 0, 0, 0, 0) test_values (0, 0, 0, 0, 0) utils.tstDone() Index: tst_ServiceShutdown/test.py =================================================================== diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_ServiceShutdown/test.py (.../test.py) (revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7) +++ tst_ServiceShutdown/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import globals, HDSimulator from dialin.ui import utils -HDSimulator = HDSimulator() +hd_sim = HDSimulator() ################################################################################ # This test need to be changed when the Service screen has been implemented # @@ -39,16 +39,16 @@ test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, utils.SRSUI(vSRSUI)) def showNtest_PowerOffDialog(vSRSUI=""): - HDSimulator.cmd_show_poweroff_dialog() + hd_sim.cmd_show_poweroff_dialog() test_PowerOffDialog(vSRSUI) def hideNtest_PowerOffDialog(vSRSUI=""): - HDSimulator.cmd_hide_poweroff_dialog() + hd_sim.cmd_hide_poweroff_dialog() test_PowerOffButton(vSRSUI) def showNtest_PowerOffNotificationDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) - HDSimulator.cmd_show_poweroff_notification_dialog() + hd_sim.cmd_show_poweroff_notification_dialog() 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") @@ -57,7 +57,7 @@ def showNtest_PowerOffRejectionDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) - HDSimulator.cmd_show_poweroff_rejection_dialog() + hd_sim.cmd_show_poweroff_rejection_dialog() 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_TreatmentHeparineData/test.py =================================================================== diff -u -r4becb22543b290e42c8663e4d9ad59323bdec355 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_TreatmentHeparineData/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) +++ tst_TreatmentHeparineData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import HDSimulator, utils -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def getUnit(): @@ -53,16 +53,16 @@ getUnit() for value in range(0, 101): - HDSimulator.cmd_set_treatment_heparin_data(value * 0.1) + hd_sim.cmd_set_treatment_heparin_data(value * 0.1) test_values (value * 0.1) - HDSimulator.cmd_set_treatment_heparin_data(10.0) + hd_sim.cmd_set_treatment_heparin_data(10.0) test_values (10.0) - HDSimulator.cmd_set_treatment_heparin_data(10.0) + hd_sim.cmd_set_treatment_heparin_data(10.0) test_values (10.0) - HDSimulator.cmd_set_treatment_heparin_data(0) + hd_sim.cmd_set_treatment_heparin_data(0) test_values ( 0) Index: tst_TreatmentSalineData/test.py =================================================================== diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_TreatmentSalineData/test.py (.../test.py) (revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7) +++ tst_TreatmentSalineData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -16,7 +16,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def getUnit(): global saline_unit @@ -25,21 +25,21 @@ def gotoScreenNtest_Contains_TreatmentSalineBolusData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) - test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "START BOLUS") - test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).title ), "SALINE BOLUS") - test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection).visible , True) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineSection, "buttonText", "START BOLUS")).buttonText), "START BOLUS") + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineSection, "title", "SALINE BOLUS")).title), "SALINE BOLUS") + test.compare( waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineSection, "visible", True)).visible , True) def test_values(vCumulative, vDelivered): - test.compare(waitForObjectExists(names.o_treatmentStart_SalineSection).valueCumulative, vCumulative) - test.compare(waitForObjectExists(names.o_treatmentStart_SalineSection).valueDelivered , vDelivered ) + test.compare(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineSection, "valueCumulative", vCumulative)).valueCumulative, vCumulative) + test.compare(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineSection, "valueDelivered", vDelivered)).valueDelivered , vDelivered ) - test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineCumulative).text), "{:.0f}".format(vCumulative)) - test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineDelivered ).text), "{:.0f}".format(vDelivered )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineCumulative, "text", "{:.0f}".format(vCumulative))).text), "{:.0f}".format(vCumulative)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineDelivered, "text", "{:.0f}".format(vDelivered ))).text), "{:.0f}".format(vDelivered )) def test_target(vTarget): - test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection).valueTarget , vTarget ) - test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineTarget ).text) , "({:.0f} {})".format(vTarget, saline_unit)) + test.compare( waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineSection, "valueTarget", vTarget)).valueTarget, vTarget) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_SalineTarget, "text", "({:.0f} {})".format(vTarget, saline_unit))).text), "({:.0f} {})".format(vTarget, saline_unit)) def main(): @@ -56,22 +56,22 @@ cumulitive = 0 step = 1 for target in [100, 200, 300]: - HDSimulator.cmd_set_treatment_saline_bolus_data(target, 0, 0) + hd_sim.cmd_set_treatment_saline_bolus_data(target, 0, 0) test_target(target) for value in range ( 0, target, step): cumulitive += step - HDSimulator.cmd_set_treatment_saline_bolus_data(target, cumulitive, value + 1) # 0 is not a step + hd_sim.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.cmd_set_treatment_saline_bolus_data(200, 110, 10) + hd_sim.cmd_set_treatment_saline_bolus_data(200, 110, 10) test_target (200 ) test_values ( 110, 10) - HDSimulator.cmd_set_treatment_saline_bolus_data(200, 110, 10) + hd_sim.cmd_set_treatment_saline_bolus_data(200, 110, 10) test_target (200 ) test_values ( 110, 10) - HDSimulator.cmd_set_treatment_saline_bolus_data(0, 0, 0) + hd_sim.cmd_set_treatment_saline_bolus_data(0, 0, 0) test_target ( 0 ) test_values ( 0, 0) Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r80181d382e841f6e66c8f0ad85d1c78e6856cfde -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_TreatmentStatesData/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -16,19 +16,19 @@ from dialin.ui import utils from dialin import HDSimulator from dialin.ui.hd_simulator import TXStates -HDSimulator = HDSimulator() +hd_sim = 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, TXStates.HEPARIN_STATE_OFF) + test_values(TXStates.TREATMENT_START_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) def test_values(vSubMode, vUFState, vSalineState, vHeparinState): - HDSimulator.cmd_set_treatment_states_data(vSubMode, vUFState, vSalineState, vHeparinState) + hd_sim.cmd_set_treatment_states_data(vSubMode, vUFState, vSalineState, vHeparinState) # these test cases are not always depending on each other - if (vSubMode == TXStates.TREATMENT_DIALYSIS_STATE_NOT): + if (vSubMode == TXStates.TREATMENT_START_STATE): 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 ) @@ -121,145 +121,145 @@ utils.waitForGUI(1) # start - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_PAUSED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_RUNNING_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_OFF_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_IN_PROGRESS , TXStates.HEPARIN_STATE_EMPTY ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) - test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_OFF ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_PAUSED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_DISPENSING ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_COMPLETED ) + test_values(TXStates.TREATMENT_START_STATE , TXStates.UF_COMPLETED_STATE , TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED , TXStates.HEPARIN_STATE_EMPTY ) test_values(TXStates.TREATMENT_DIALYSIS_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_OFF ) test_values(TXStates.TREATMENT_DIALYSIS_STATE , TXStates.UF_START_STATE , TXStates.SALINE_BOLUS_STATE_IDLE , TXStates.HEPARIN_STATE_PAUSED ) Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_FlowsSection(): @@ -35,14 +35,14 @@ gotoScreenNtest_Contains_FlowsSection() utils.waitForGUI(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) + hd_sim.cmd_set_treatment_blood_flow_rate(175, 0, 0, 0, 0, 0, 0) + hd_sim.cmd_set_treatment_dialysate_flow_rate(250, 1, 1, 1, 1, 1, 1) gotoScreenNTest_Adjustment() utils.waitForGUI(1) - HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550) - HDSimulator.cmd_send_acknowledge_ui() + hd_sim.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550) + hd_sim.cmd_send_acknowledge_ui() mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) @@ -52,17 +52,17 @@ # sendTreatmentAdjustBloodDialysateRequest mouseClick(waitForObject(names.o_confirmButton)) - HDSimulator.wait_for_message_to_be_sent() + hd_sim.wait_for_message_to_be_sent() utils.waitForGUI(7) # wait for ack timeout 5 is the timeout added +2 Sec for safe range. # sendTreatmentAdjustBloodDialysateRequest again mouseClick(waitForObject(names.o_confirmButton)) - HDSimulator.wait_for_message_to_be_sent() - HDSimulator.cmd_send_acknowledge_hd() + hd_sim.wait_for_message_to_be_sent() + hd_sim.cmd_send_acknowledge_hd() - 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) + hd_sim.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage + hd_sim.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage + hd_sim.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.cmd_send_treatment_adjust_blood_dialysate_response(1, 0, + hd_sim.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) + hd_sim.cmd_set_treatment_blood_flow_rate(225, 1, 1, 1, 1, 1, 1) + hd_sim.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 -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_DurationSection(): @@ -35,13 +35,13 @@ gotoScreenNtest_Contains_DurationSection() utils.waitForGUI(1) - HDSimulator.cmd_set_treatment_start_state() + hd_sim.cmd_set_treatment_start_state() durationMin = 0 durationMax = 60 * 3 # 3h durationElapsed = 10 # 10m - HDSimulator.cmd_set_treatment_time(durationMax * 60, durationElapsed * 60) + hd_sim.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.cmd_set_treatment_parameter_ranges(durationMin, durationMax, 0, 0, 0, 0) + hd_sim.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.cmd_set_treatment_parameter_ranges(durationMin, durationMax, 0, 0, 0, 0) + hd_sim.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.cmd_send_treatment_adjust_duration_response(0, 4, 75, 0) + hd_sim.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.cmd_send_treatment_adjust_duration_response(0, 4, 75, 0) + hd_sim.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.cmd_send_treatment_adjust_duration_response(1, 0, 45, 1000) + hd_sim.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_Heparin/test.py =================================================================== diff -u -rca79dc7f50fc912b05da91321d8652934aee0764 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_Heparin/test.py (.../test.py) (revision ca79dc7f50fc912b05da91321d8652934aee0764) +++ tst_Treatment_Adjustment_Heparin/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -16,7 +16,7 @@ import names from dialin.ui import HDSimulator, utils, TXStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_TreatmentHeparinData(): @@ -34,7 +34,7 @@ def test_state(vAccept, vText, vState): mReason = 0 if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION.value - HDSimulator.cmd_set_heparin_pause_resume_response(vAccept, mReason, vState) + hd_sim.cmd_set_heparin_pause_resume_response(vAccept, mReason, vState) utils.waitForGUI(0.2) heparin_button = findObject(names.o_treatmentStart_HeparinPause) # heparin button is not always enable for click @@ -57,9 +57,14 @@ # Initial OFF -> Idle/START/UF_True gotoScreenNtest_Contains_TreatmentHeparinData() +# hd_sim.cmd_set_hd_operation_mode_data(HDDefs.MODE_TREA.value) + hd_sim.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE, + TXStates.UF_OFF_STATE, + TXStates.SALINE_BOLUS_STATE_IDLE, + TXStates.HEPARIN_STATE_OFF) # set the Treatment to running state, otherwise the heparin section will be disabled. - HDSimulator.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) + hd_sim.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) # it is not working upon user request so there is not rejection # Initial OFF => BOLUS -> Bolus/HEPARIN Index: tst_Treatment_Adjustment_Pressures/test.py =================================================================== diff -u -r80181d382e841f6e66c8f0ad85d1c78e6856cfde -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_Pressures/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) +++ tst_Treatment_Adjustment_Pressures/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -16,7 +16,7 @@ from dialin.ui import utils, HDSimulator import names -HDSimulator = HDSimulator() +hd_sim = HDSimulator() inrangeColor = "#ffffff" @@ -63,7 +63,7 @@ """ Checks the Pressures Values on each parameter change passed to the function """ - HDSimulator.cmd_set_pressure_occlusion_data(vArterial, vVenous, 0, 0, 0) + hd_sim.cmd_set_pressure_occlusion_data(vArterial, vVenous, 0, 0, 0) arterial_value = waitForObjectExists(names.o_arterial_marker ).value venous_value = waitForObjectExists(names.o_venous_marker ).value @@ -119,7 +119,7 @@ # arterial constants shall never change regarding the PRS # it has to be set to reject otherwise the dialog is closed. # the accept and dialog close has been tested somewhere else. - HDSimulator.cmd_send_treatment_adjust_pressures_limit_response(False, 0, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) + hd_sim.cmd_send_treatment_adjust_pressures_limit_response(False, 0, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) test_pressure_limits(vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) @@ -132,7 +132,7 @@ venousLow = Ranges.VENOUS_PRESSURE_LOW_DEF venousHigh = Ranges.VENOUS_PRESSURE_HIGH_DEF test.compare(waitForObjectExists(names.o_treatmentAdjustmentPressures_Screen).visible, True) - HDSimulator.cmd_send_treatment_adjust_pressures_limit_response( + hd_sim.cmd_send_treatment_adjust_pressures_limit_response( True, 0, arterialLow , arterialHigh , Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -18,7 +18,7 @@ from dialin import HDSimulator from dialin.ui.hd_simulator import TXStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason -HDSimulator = HDSimulator() +hd_sim = 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.cmd_set_saline_bolus_response(vAccept, mReason, target, vState) + hd_sim.cmd_set_saline_bolus_response(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 -rca79dc7f50fc912b05da91321d8652934aee0764 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision ca79dc7f50fc912b05da91321d8652934aee0764) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -121,14 +121,14 @@ # [Accept Pause] hd_simulator.cmd_set_treatment_adjust_ultrafiltration_accepted(TXStates.UF_PAUSED_STATE) # [Accept Notification] - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar, "text", "")).text), "") # --------------- Paused Screen def testScreen_Paused_Ultrafiltration(): # [Paused Screen] - test.compare(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen).visible, True) + test.compare(waitForObjectExists(utils.dict_update(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen, "visible", True)).visible, True) ## Edit Button test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_EditButton).text.text), "EDIT ULTRAFILTRATION VOLUME") ## Resume Button @@ -344,7 +344,7 @@ def confirm_Accept(vVolume, vDuration, vRate): hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(1, 0, vVolume, vDuration, vRate) - utils.waitForGUI() + utils.waitForGUI(3) test.compare(utils.l2ml(waitForObject(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), 1200) @@ -366,7 +366,7 @@ closeScreen() # Back to main # set the ultrafiltration to running state - hd_simulator.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE_NOT, TXStates.UF_RUNNING_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) + hd_simulator.cmd_set_treatment_states_data(TXStates.TREATMENT_START_STATE, TXStates.UF_RUNNING_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) closeScreen() gotoScreen_UltrafiltrationAdjustment() Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_FlowsSection(): @@ -33,49 +33,49 @@ test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "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) + hd_sim.cmd_set_treatment_blood_flow_rate(125, 0, 0, 0, 0, 0, 0) # coverage + hd_sim.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.cmd_set_treatment_blood_flow_rate(175, 1, 1, 1, 1, 1, 1) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + hd_sim.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.cmd_set_treatment_blood_flow_rate(150, 1, 1, 1, 1, 1, 1) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + hd_sim.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.cmd_set_treatment_blood_flow_rate(200, 1, 1, 1, 1, 1, 1) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + hd_sim.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.cmd_set_treatment_blood_flow_rate(250, 1, 1, 1, 1, 1, 1) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + hd_sim.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.cmd_set_treatment_blood_flow_rate(275, 1, 1, 1, 1, 1, 1) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + hd_sim.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.cmd_set_treatment_blood_flow_rate(300, 1, 1, 1, 1, 1, 1) + hd_sim.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.cmd_set_treatment_dialysate_flow_rate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55) + hd_sim.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.cmd_set_treatment_blood_flow_rate(350, 1, 1, 1, 1, 1, 1) + hd_sim.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 -rb4a285d31b57c278de779b2081eeffc74f256807 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_FlowsSection(): @@ -47,18 +47,18 @@ minDF = 150 maxDF = 550 - HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) #coverage - HDSimulator.cmd_send_acknowledge_ui() + hd_sim.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) #coverage + hd_sim.cmd_send_acknowledge_ui() test_Dialysate_Ranges(minDF, maxDF) - HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) - HDSimulator.cmd_send_acknowledge_ui() + hd_sim.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) + hd_sim.cmd_send_acknowledge_ui() test_Dialysate_Ranges(minDF, maxDF) minDF = 200 maxDF = 500 - HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) - HDSimulator.cmd_send_acknowledge_ui() + hd_sim.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) + hd_sim.cmd_send_acknowledge_ui() test_Dialysate_Ranges(minDF, maxDF) utils.tstDone() \ No newline at end of file Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_PressureOcclusion(): @@ -31,21 +31,21 @@ gotoScreenNtest_Contains_PressureOcclusion() utils.waitForGUI(1) - HDSimulator.cmd_set_pressure_occlusion_data(0, 0, 0, 0, 0) + hd_sim.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).venousPressure , 0) - HDSimulator.cmd_set_pressure_occlusion_data(200, 100, 50, 25, 15) # Coverage + hd_sim.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).venousPressure , 100) - HDSimulator.cmd_set_pressure_occlusion_data(200, 100, 50, 25, 15) + hd_sim.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).venousPressure , 100) - HDSimulator.cmd_set_pressure_occlusion_data(0, 0, 0, 0, 0) + hd_sim.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).venousPressure , 0) Index: tst_Treatment_Time/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Time/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_Time/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_TimeSection(): @@ -24,12 +24,12 @@ def startNTestTreatmentTime(vTotal): for i in range(0,vTotal+1): - HDSimulator.cmd_set_treatment_time(vTotal, i, vTotal - i) + hd_sim.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.cmd_set_treatment_time(vTotal, 0, vTotal) + hd_sim.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.cmd_set_treatment_start_state() + hd_sim.cmd_set_treatment_start_state() total = 60 resetNTestTreatmentTime(total) Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rcea6eac6a05f57e3317b45762a470eb18b314ab3 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision cea6eac6a05f57e3317b45762a470eb18b314ab3) @@ -15,7 +15,7 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +hd_sim = HDSimulator() def gotoScreenNtest_Contains_Ultrafiltration(): @@ -24,12 +24,12 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(i, i, 0, 0, 0, 0, 0) + hd_sim.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.cmd_set_treatment_ultrafiltration_outlet_flow_data(0, 0, 0, 0, 0, 0, 0) + hd_sim.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.cmd_set_treatment_adjust_ultrafiltration_confirm_response(1, 0, maxUF, 30, 5) + hd_sim.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)