Index: shared/scripts/names.py =================================================================== diff -u -r08e394d6afe01356f9ab4da613180112ff86f32d -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- shared/scripts/names.py (.../names.py) (revision 08e394d6afe01356f9ab4da613180112ff86f32d) +++ shared/scripts/names.py (.../names.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -12,8 +12,6 @@ # author Behrouz NematiPour # - -DIALIN_LINK = True AUT_NAME = "denaliSquish" # Squish AlarmPriority = [ 0, 1, 2, 3, 4 ] # 4 is out of range check Index: simulator/SalineBolusSimulator.ui =================================================================== diff -u -rc5a7028efbf4a343a6ce3d92d3d534a5e15d784c -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- simulator/SalineBolusSimulator.ui (.../SalineBolusSimulator.ui) (revision c5a7028efbf4a343a6ce3d92d3d534a5e15d784c) +++ simulator/SalineBolusSimulator.ui (.../SalineBolusSimulator.ui) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -6,7 +6,7 @@ 0 0 - 759 + 919 617 @@ -397,12 +397,12 @@ - 200 + 360 0 - 180 + 350 @@ -419,29 +419,39 @@ 2 + + + 3 + + Saline States - SALINE_STOP_STATE + SALINE_BOLUS_STATE_IDLE ItemIsSelectable|ItemIsEnabled - SALINE_START_STATE + SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP - SALINE_DISABLE_STATE + SALINE_BOLUS_STATE_IN_PROGRESS + + + SALINE_BOLUS_STATE_MAX_DELIVERED + + Index: simulator/run.py =================================================================== diff -u -r87a1d3676f718f9f6328ac7c2b5da5aa1a0271c2 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- simulator/run.py (.../run.py) (revision 87a1d3676f718f9f6328ac7c2b5da5aa1a0271c2) +++ simulator/run.py (.../run.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -1,3 +1,5 @@ + +# import system modules import sys # import project classes @@ -7,183 +9,251 @@ # Import PySide2 classes from PySide2.QtUiTools import QUiLoader from PySide2 import QtCore, QtWidgets -from PySide2.QtCore import QFile, SIGNAL, Slot -import PySide2.QtWidgets +from PySide2.QtCore import QFile, Slot +from PySide2.QtGui import qApp -# global variables declarations -ui_file_name = "SalineBolusSimulator.ui" -# application -app: QtWidgets.QApplication -# main widget -window: QtWidgets.QWidget -# pushbutton -btnSalineAccept: QtWidgets.QPushButton -btnSalineReject: QtWidgets.QPushButton -# label -lblSalineAction: QtWidgets.QLabel -# spinbox -spnSalineRejectReason: QtWidgets.QSpinBox -# combobox -cmbSalineAcceptTarget: QtWidgets.QComboBox -# sliders -sldSalineTarget: QtWidgets.QSlider -sldSalineCumulative: QtWidgets.QSlider -sldSalineVolume: QtWidgets.QSlider -# tables -tblSalineSubMode: QtWidgets.QTableWidget -tblSalineUFStates: QtWidgets.QTableWidget -tblSalineSalineStates: QtWidgets.QTableWidget - - -def init_app(): +class RunTimeWidget: """ - initializing the QApplication app - and the main container QWidget window. - :return: none + the parent class of all the run time loadable widgets """ - global app, window - app = QtWidgets.QApplication(sys.argv) - window = QtWidgets.QWidget() - window.resize(320, 240) + loader: QUiLoader + window: QtWidgets.QWidget -def start_app(): - """ - shows the main container window - :return: none - """ - global app, window - window.show() - sys.exit(app.exec_()) + def __init__(self, ui_name: str): + self.ui_name = ui_name + self.loader = QUiLoader() + self.__load_ui() + def __load_ui(self): + """ + loads the ui file of the GUI at run time + :return: none + """ + ui_file = QFile(self.ui_name) + ui_file.open(QFile.ReadOnly) + self.window = self.loader.load(ui_file) + # assert if the ui file can't be loaded + error = self.loader.errorString() + assert len(error) == 0, error + ui_file.close() -def load_ui(): - """ - loads the ui file of the GUI - :return: none - """ - global app, window - ui_file = QFile(ui_file_name) - ui_file.open(QFile.ReadOnly) - loader = QUiLoader() - window = loader.load(ui_file) - ui_file.close() - window.setWindowTitle('Saline Bolus Simulator ' + QtCore.__version__) + def show(self): + """ + shows the main container window + :return: none + """ + self.window.show() + def __find_child(self, child_type, child_name: str) -> QtWidgets.QWidget: + """ + finds a child in the loaded ui and returns the reference to it if found + otherwise quits the application + :param child_type: (var) type of the child + :param child_name: (str) name of the child + :return: (QtWidgets.QWidget) reference to the child + """ + child: QtWidgets.QWidget = self.window.findChild(child_type, child_name) + assert child != 0, "child name '{}' with type '{}' can't be found.".format(child_name, child_type) + return child -def setup_saline_adjustment(): - """ - sets up the treatment saline bolus adjustment GUI section - :return: none - """ - global app, window - global btnSalineAccept, btnSalineReject - global lblSalineAction, spnSalineRejectReason, cmbSalineAcceptTarget - btnSalineAccept = window.findChild(QtWidgets.QPushButton, 'btnSalineAccept') - btnSalineReject = window.findChild(QtWidgets.QPushButton, 'btnSalineReject') - lblSalineAction = window.findChild(QtWidgets.QLabel, 'lblSalineAction') - spnSalineRejectReason = window.findChild(QtWidgets.QSpinBox, 'spnSalineRejectReason') - cmbSalineAcceptTarget = window.findChild(QtWidgets.QComboBox, 'cmbSalineAcceptTarget') - btnSalineAccept.clicked.connect(do_accept) - btnSalineReject.clicked.connect(do_reject) + def find_label(self, name: str) -> QtWidgets.QLabel: + """ + convenient method of find_child for QLabel + :param name: (str) name of the QLabel Object + :return: (QLabel) reference to the QLabel + """ + child = self.__find_child(QtWidgets.QLabel, name) + return child + def find_button(self, name: str) -> QtWidgets.QPushButton: + """ + convenient method of find_child for QPushButton + :param name: (str) name of the QPushButton Object + :return: (QPushButton) reference to the QPushButton + """ + child = self.__find_child(QtWidgets.QPushButton, name) + return child -def setup_saline_data(): - """ - sets up the treatment saline bolus data sender GUI section - :return: none - """ - global app, window - global sldSalineTarget, sldSalineCumulative, sldSalineVolume - sldSalineTarget = window.findChild(QtWidgets.QSlider, 'sldSalineTarget') - sldSalineCumulative = window.findChild(QtWidgets.QSlider, 'sldSalineCumulative') - sldSalineVolume = window.findChild(QtWidgets.QSlider, 'sldSalineVolume') - sldSalineTarget.valueChanged.connect(do_saline_data) - sldSalineCumulative.valueChanged.connect(do_saline_data) - sldSalineVolume.valueChanged.connect(do_saline_data) + def find_combobox(self, name: str) -> QtWidgets.QComboBox: + """ + convenient method of find_child for QComboBox + :param name: (str) name of the QComboBox Object + :return: (QPushButton) reference to the QComboBox + """ + child = self.__find_child(QtWidgets.QComboBox, name) + return child + def find_spinbox(self, name: str) -> QtWidgets.QSpinBox: + """ + convenient method of find_child for QSpinBox + :param name: (str) name of the QSpinBox Object + :return: (QSpinBox) reference to the QSpinBox + """ + child = self.__find_child(QtWidgets.QSpinBox, name) + return child -def setup_treatment_states(): - """ - sets up the treatment saline bolus states GUI section - :return: none - """ - global app, window - global tblSalineSubMode, tblSalineUFStates, tblSalineSalineStates - tblSalineSubMode = window.findChild(QtWidgets.QTableWidget, 'tblSalineSubMode') - tblSalineUFStates = window.findChild(QtWidgets.QTableWidget, 'tblSalineUFStates') - tblSalineSalineStates = window.findChild(QtWidgets.QTableWidget, 'tblSalineSalineStates') - tblSalineSubMode.setCurrentCell(0, 0) - tblSalineUFStates.setCurrentCell(0, 0) - tblSalineSalineStates.setCurrentCell(0, 0) - tblSalineSubMode.cellClicked.connect(do_saline_saline_state) - tblSalineUFStates.cellClicked.connect(do_saline_saline_state) - tblSalineSalineStates.cellClicked.connect(do_saline_saline_state) + def find_slider(self, name: str) -> QtWidgets.QSlider: + """ + convenient method of find_child for QSlider + :param name: (str) name of the QSlider Object + :return: (QSlider) reference to the QSlider + """ + child = self.__find_child(QtWidgets.QSlider, name) + return child + def find_table_widget(self, name: str) -> QtWidgets.QTableWidget: + """ + convenient method of find_child for QTableWidget + :param name: (str) name of the QTableWidget Object + :return: (QTableWidget) reference to the QTableWidget + """ + child: QtWidgets.QTableWidget = self.__find_child(QtWidgets.QTableWidget, name) + return child -@Slot() -def do_accept(): + +class Simulator(RunTimeWidget): """ - the slot for accept saline bolus button - :return: none + The simulator class which loads the ui file dynamically and initializes the objects + and can be eventually shown. """ - target = cmbSalineAcceptTarget.currentText() - denaliMessages.setSalineBolusResponse(True, 0, target) - lblSalineAction.setText('Accepted ' + target) + # global variables declarations + ui_file_name = "SalineBolusSimulator.ui" + # pushbutton + btnSalineAccept: QtWidgets.QPushButton + btnSalineReject: QtWidgets.QPushButton + # label + lblSalineAction: QtWidgets.QLabel + # spinbox + spnSalineRejectReason: QtWidgets.QSpinBox + # combobox + cmbSalineAcceptTarget: QtWidgets.QComboBox + # sliders + sldSalineTarget: QtWidgets.QSlider + sldSalineCumulative: QtWidgets.QSlider + sldSalineVolume: QtWidgets.QSlider + # tables + tblSalineSubMode: QtWidgets.QTableWidget + tblSalineUFStates: QtWidgets.QTableWidget + tblSalineSalineStates: QtWidgets.QTableWidget -@Slot() -def do_reject(): - """ - the slot for accept saline bolus button - :return: none - """ - reason = spnSalineRejectReason.value() - denaliMessages.setSalineBolusResponse(False, reason, 0) - lblSalineAction.setText('Rejected ' + reason) + def __init__(self): + super().__init__(Simulator.ui_file_name) + self.initialize() + def setup_saline_adjustment(self): + """ + sets up the treatment saline bolus adjustment GUI section + :return: none + """ + self.btnSalineAccept = self.find_button('btnSalineAccept') + self.btnSalineReject = self.find_button('btnSalineReject') + self.lblSalineAction = self.find_label('lblSalineAction') + self.spnSalineRejectReason = self.find_spinbox('spnSalineRejectReason') + self.cmbSalineAcceptTarget = self.find_combobox('cmbSalineAcceptTarget') + self.btnSalineAccept.clicked.connect(self.do_accept) + self.btnSalineReject.clicked.connect(self.do_reject) -@Slot() -def do_saline_saline_state(row, column): - """ - the slot for saline bolus state change - :param row : row of the selected item in the list of saline bolus states - :param column: column of the selected item in the list of saline bolus states - :return: none - """ - sub_mode = tblSalineSubMode.verticalHeaderItem(tblSalineSubMode.currentRow()).text() - uf_state = tblSalineUFStates.verticalHeaderItem(tblSalineUFStates.currentRow()).text() - saline = tblSalineSalineStates.verticalHeaderItem(tblSalineSalineStates.currentRow()).text() - denaliMessages.setTreatmentStatesData(sub_mode, uf_state, saline) + def setup_saline_data(self): + """ + sets up the treatment saline bolus data sender GUI section + :return: none + """ + self.sldSalineTarget = self.find_slider('sldSalineTarget') + self.sldSalineCumulative = self.find_slider('sldSalineCumulative') + self.sldSalineVolume = self.find_slider('sldSalineVolume') + self.sldSalineTarget.valueChanged.connect(self.do_saline_data) + self.sldSalineCumulative.valueChanged.connect(self.do_saline_data) + self.sldSalineVolume.valueChanged.connect(self.do_saline_data) + def setup_treatment_states(self): + """ + sets up the treatment saline bolus states GUI section + :return: none + """ + self.tblSalineSubMode = self.find_table_widget('tblSalineSubMode') + self.tblSalineUFStates = self.find_table_widget('tblSalineUFStates') + self.tblSalineSalineStates = self.find_table_widget('tblSalineSalineStates') + self.tblSalineSubMode.setCurrentCell(0, 0) + self.tblSalineUFStates.setCurrentCell(0, 0) + self.tblSalineSalineStates.setCurrentCell(0, 0) + self.tblSalineSubMode.cellClicked.connect(self.do_saline_saline_state) + self.tblSalineUFStates.cellClicked.connect(self.do_saline_saline_state) + self.tblSalineSalineStates.cellClicked.connect(self.do_saline_saline_state) -@Slot() -def do_saline_data(): - """ - the slot which is called to send the saline bolus data - by calling the denaliMessage API setTreatmentSalineBolusData - :return: none - """ - denaliMessages.setTreatmentSalineBolusData(sldSalineTarget.value(), sldSalineCumulative.value(), - sldSalineVolume.value()) + @Slot() + def do_accept(self): + """ + the slot for accept saline bolus button + :return: none + """ + target = self.cmbSalineAcceptTarget.currentText() + denaliMessages.setSalineBolusResponse(True, 0, target) + self.lblSalineAction.setText('Accepted ' + target) + @Slot() + def do_reject(self): + """ + the slot for accept saline bolus button + :return: none + """ + reason = self.spnSalineRejectReason.value() + denaliMessages.setSalineBolusResponse(False, reason, 0) + self.lblSalineAction.setText('Rejected ' + "{}".format(reason)) + @Slot() + def do_saline_saline_state(self): + """ + the slot for saline bolus state change + :return: none + """ + sub_mode = self.tblSalineSubMode.verticalHeaderItem(self.tblSalineSubMode.currentRow()).text() + uf_state = self.tblSalineUFStates.verticalHeaderItem(self.tblSalineUFStates.currentRow()).text() + saline = self.tblSalineSalineStates.verticalHeaderItem(self.tblSalineSalineStates.currentRow()).text() + denaliMessages.setTreatmentStatesData(sub_mode, uf_state, saline) + + @Slot() + def do_saline_data(self): + """ + the slot which is called to send the saline bolus data + by calling the denaliMessage API setTreatmentSalineBolusData + :return: none + """ + denaliMessages.setTreatmentSalineBolusData(self.sldSalineTarget.value(), + self.sldSalineCumulative.value(), + self.sldSalineVolume.value()) + + def initialize(self): + """ + initializes the class by calling it's initializer methods to make objects ready + :return: none + """ + self.setup_saline_adjustment() + self.setup_saline_data() + self.setup_treatment_states() + + def main(): """ the main function which initializes the Simulator and starts it. :return: none """ utils.tstStart(__file__) - init_app() - load_ui() - setup_saline_adjustment() - setup_saline_data() - setup_treatment_states() - start_app() + + # create qt application + QtWidgets.QApplication(sys.argv) + + simulator = Simulator() + simulator.show() + utils.tstDone() + # start qt application main loop + sys.exit(qApp.exec_()) + if __name__ == "__main__": + QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts) main() - Index: suite.conf =================================================================== diff -u -r08e394d6afe01356f9ab4da613180112ff86f32d -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- suite.conf (.../suite.conf) (revision 08e394d6afe01356f9ab4da613180112ff86f32d) +++ suite.conf (.../suite.conf) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -5,6 +5,6 @@ IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_Internals tst_HomeScreen tst_ServiceShutdown tst_TreatmentScreen tst_Treatment_Section_BloodDialysate tst_Treatment_BloodDialysateFlowRate tst_Treatment_Time tst_Treatment_Ultrafiltration tst_Treatment_PressureOcclusion tst_Treatment_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Treatment_Adjustment_Duration tst_Treatment_Adjustment_Ultrafiltration tst_Treatment_Adjustment_Saline tst_TreatmentSalineData tst_TreatmentStatesData tst_DGROPumpData tst_DGDrainPumpData tst_DGPressureData tst_DGReservoirData tst_DGHeatersData tst_DGLoadCellReadingsData tst_DGTemperaturesData tst_case2 tst_DGValvesStatesData tst_DGOperationMode tst_HDOperationModeData tst_HDBloodFlowData tst_HDInletFlowData tst_HDOutletFlowData tst_HDPressureOcclusionData tst_CANBusFaultCount tst_CreateTreatment tst_DebugText tst_Alarm_Colors tst_AlarmStatusData tst_AlarmTriggered tst_AlarmCleared +TEST_CASES=tst_Internals tst_HomeScreen tst_ServiceShutdown tst_TreatmentScreen tst_Treatment_Section_BloodDialysate tst_Treatment_BloodDialysateFlowRate tst_Treatment_Time tst_Treatment_Ultrafiltration tst_Treatment_PressureOcclusion tst_Treatment_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Treatment_Adjustment_Duration tst_Treatment_Adjustment_Ultrafiltration tst_Treatment_Adjustment_Saline tst_TreatmentSalineData tst_TreatmentStatesData tst_DGROPumpData tst_DGDrainPumpData tst_DGPressureData tst_DGReservoirData tst_DGHeatersData tst_DGLoadCellReadingsData tst_DGTemperaturesData tst_case2 tst_DGValvesStatesData tst_DGOperationMode tst_HDOperationModeData tst_HDBloodFlowData tst_HDInletFlowData tst_HDOutletFlowData tst_HDPressureOcclusionData tst_CANBusFaultCount tst_DebugText tst_CreateTreatment tst_Alarm_Colors tst_AlarmStatusData tst_AlarmTriggered tst_AlarmCleared VERSION=3 WRAPPERS=Qt Index: tst_AlarmCleared/test.py =================================================================== diff -u -rf32e3b65bfcf747b049f76b3b5d2384ab37f4c4b -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_AlarmCleared/test.py (.../test.py) (revision f32e3b65bfcf747b049f76b3b5d2384ab37f4c4b) +++ tst_AlarmCleared/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -14,12 +14,9 @@ import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages + # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) def test_values(vAlarmID): test.compare(True, True, "No component has been implemented yet") Index: tst_AlarmStatusData/test.py =================================================================== diff -u -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_AlarmStatusData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4) +++ tst_AlarmStatusData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -14,12 +14,9 @@ import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages + def isNotificationBar(): if object.exists(names.o_alarm_bar): alarmBar = findObject(names.o_alarm_bar) Index: tst_AlarmTriggered/test.py =================================================================== diff -u -rf32e3b65bfcf747b049f76b3b5d2384ab37f4c4b -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_AlarmTriggered/test.py (.../test.py) (revision f32e3b65bfcf747b049f76b3b5d2384ab37f4c4b) +++ tst_AlarmTriggered/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -14,12 +14,9 @@ import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages + # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) def test_values(vAlarmID): test.compare(True, True, "No component has been implemented yet") Index: tst_Alarm_Colors/test.py =================================================================== diff -u -rf32e3b65bfcf747b049f76b3b5d2384ab37f4c4b -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Alarm_Colors/test.py (.../test.py) (revision f32e3b65bfcf747b049f76b3b5d2384ab37f4c4b) +++ tst_Alarm_Colors/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -16,11 +16,7 @@ from time import sleep import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages HIGH = 3 Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -r211e5b6d52df1fb7af4b50ed652afdd373a64231 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_CANBusFaultCount/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_CANBusFaultCount(): Index: tst_DGDrainPumpData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGDrainPumpData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGDrainPumpData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGDrainPumpData(): Index: tst_DGHeatersData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGHeatersData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGHeatersData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGHeatersData(): Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGLoadCellReadingsData(): Index: tst_DGOperationMode/test.py =================================================================== diff -u -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGOperationMode/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4) +++ tst_DGOperationMode/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages opModes = [ Index: tst_DGPressureData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGPressureData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGPressureData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGPressuresData(): Index: tst_DGROPumpData/test.py =================================================================== diff -u -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGROPumpData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4) +++ tst_DGROPumpData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGROPumpData(): Index: tst_DGReservoirData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGReservoirData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGReservoirData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGReservoirData(): Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGTemperaturesData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGTemperaturesData(): Index: tst_DGValvesStatesData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DGValvesStatesData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_DGValvesStatesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages valvesBitLen = 12 Index: tst_DebugText/test.py =================================================================== diff -u -rbda09492392a1e1a1dbbb9beac976a641b967f86 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_DebugText/test.py (.../test.py) (revision bda09492392a1e1a1dbbb9beac976a641b967f86) +++ tst_DebugText/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def main(): Index: tst_HDBloodFlowData/test.py =================================================================== diff -u -r211e5b6d52df1fb7af4b50ed652afdd373a64231 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_HDBloodFlowData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) +++ tst_HDBloodFlowData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_BloodFlowData(): Index: tst_HDInletFlowData/test.py =================================================================== diff -u -r211e5b6d52df1fb7af4b50ed652afdd373a64231 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_HDInletFlowData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) +++ tst_HDInletFlowData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_InletFlowData(): Index: tst_HDOperationModeData/test.py =================================================================== diff -u -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_HDOperationModeData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4) +++ tst_HDOperationModeData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages opModes = [ Index: tst_HDOutletFlowData/test.py =================================================================== diff -u -r211e5b6d52df1fb7af4b50ed652afdd373a64231 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_HDOutletFlowData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) +++ tst_HDOutletFlowData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_OutletFlowData(): @@ -26,8 +22,8 @@ def test_values(vRefUFVol, vMeasUFVol, vRotorSpeed, vMotorSpeed, vMotorCtlSpeed, vMotorCtlCurrent, vPWMDtCycle): - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RefUFVol ).text), "{:.2f}".format(utils.ml2l(vRefUFVol ))) - test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MeasUFVol ).text), "{:.2f}".format(utils.ml2l(vMeasUFVol ))) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RefUFVol ).text), "{:.3f}".format(utils.ml2l(vRefUFVol ))) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MeasUFVol ).text), "{:.3f}".format(utils.ml2l(vMeasUFVol ))) test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RotorSpeed ).text), "{:.2f}".format( vRotorSpeed )) test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorSpeed ).text), "{:.2f}".format( vMotorSpeed )) test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMotorCtlSpeed )) Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u -r211e5b6d52df1fb7af4b50ed652afdd373a64231 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_PressureOcclusionData(): Index: tst_HomeScreen/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_HomeScreen/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_HomeScreen/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,10 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils -else: - import utils +from dialin.squish import utils def main(): Index: tst_ServiceShutdown/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_ServiceShutdown/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_ServiceShutdown/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,12 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, globals, denaliMessages -else: - import utils - import globals - import denaliMessages +from dialin.squish import utils, globals, denaliMessages ################################################################################ Index: tst_TreatmentScreen/test.py =================================================================== diff -u -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_TreatmentScreen/test.py (.../test.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) +++ tst_TreatmentScreen/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,10 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils -else: - import utils +from dialin.squish import utils def main(): Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -rd8ec01a7bb4d530339ded2f8034995604db04612 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_TreatmentStatesData/test.py (.../test.py) (revision d8ec01a7bb4d530339ded2f8034995604db04612) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -14,24 +14,8 @@ import names from dialin.squish import utils, denaliMessages +from dialin.squish.denaliMessages import txStates -class txStates: - # Saline states - SALINE_STOP_STATE = 0 - SALINE_START_STATE = 1 - SALINE_DISABLE_STATE = 2 - - # UF states - # UI only cares about the actual state and _NOT could be any other state - UF_PAUSED_STATE_NOT = 0 - UF_PAUSED_STATE = 1 - - # Sub Mode - # UI only cares about the actual state and _NOT could be any other state - TREATMENT_DIALYSIS_STATE_NOT = 0 - TREATMENT_DIALYSIS_STATE = 1 - - def gotoScreenNtest_Contains_TreatmentStatesData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test_values(0, 0, 0) @@ -40,14 +24,14 @@ def test_values(vSubMode, vUFState, vSalineState): # these test cases are not always depending on each other if (vSubMode == txStates.TREATMENT_DIALYSIS_STATE_NOT): - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage ).visible, True ) - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_second ).visible, True ) - test.compare( findObject (names.o_treatmentStart_treatmentTime_notification ).visible, False) + test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage ).visible, False ) + test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_second ).visible, False ) + test.compare( findObject (names.o_treatmentStart_treatmentTime_notification ).visible, True ) if (vSubMode == txStates.TREATMENT_DIALYSIS_STATE ): - test.compare( findObject (names.o_treatmentStart_treatmentTime_arrowImage ).visible, False) - test.compare( findObject (names.o_treatmentStart_treatmentTime_second ).visible, False) - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_notification ).visible, True ) + test.compare( findObject (names.o_treatmentStart_treatmentTime_arrowImage ).visible, True ) + test.compare( findObject (names.o_treatmentStart_treatmentTime_second ).visible, True ) + test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_notification ).visible, False ) test.compare(str(waitForObjectExists(names.o_treatmentStart_treatmentTime_notification ).text ), "Treatment Paused") if (vUFState == txStates.UF_PAUSED_STATE_NOT ): @@ -58,16 +42,16 @@ test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).visible , True) test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).text ) , "Ultrafiltration Paused" ) - if (vSalineState == txStates.SALINE_DISABLE_STATE ): + if (vSalineState == txStates.SALINE_BOLUS_STATE_MAX_DELIVERED ): test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection ).isTouchable, False) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineStart ).text.text), "START BOLUS") test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineNotification ).text ), "Maximum cumulative saline bolus volume delivered") test.compare( waitForObjectExists(names.o_treatmentStart_SalineNotification ).visible, True) # in all the other cases it should be enabled - test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, vSalineState != txStates.SALINE_DISABLE_STATE) + test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, vSalineState != txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) - if (vSalineState == txStates.SALINE_STOP_STATE ): + if (vSalineState == txStates.SALINE_BOLUS_STATE_IDLE ): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_section ).isTouchable, True ) utils.waitForGUI() mouseClick ( waitForObject (names.o_treatmentStart_ultrafiltration_section)) @@ -79,7 +63,7 @@ mouseClick ( waitForObject (names.o_closeButton)) - if (vSalineState == txStates.SALINE_START_STATE ): + if (vSalineState == txStates.SALINE_BOLUS_STATE_IN_PROGRESS ): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_section ).isTouchable, False ) @@ -93,60 +77,60 @@ utils.waitForGUI(1) # start - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 0 1 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 0 1 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 0 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 0 1 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 0 2 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 0 2 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 0 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 0 2 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 0 1 0 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 0 1 0 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 0 1 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 0 1 0 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 1 1 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 1 1 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 1 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 1 1 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 1 2 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 1 2 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 1 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 1 2 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 1 0 0 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 1 0 0 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE ) # 1 0 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE ) # 1 0 0 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 1 0 1 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 1 0 1 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 1 0 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 1 0 1 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 1 0 2 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 1 0 2 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 0 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 0 2 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 1 1 0 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 1 1 0 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 1 1 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 1 1 0 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_START_STATE ) # 1 1 1 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_START_STATE ) # 1 1 1 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 1 1 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 1 1 1 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_DISABLE_STATE) # 1 1 2 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_DISABLE_STATE) # 1 1 2 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_DISABLE_STATE) # 1 1 2 - test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_DISABLE_STATE) # 1 1 2 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2 utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 - test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 utils.waitForGUI(secPause) utils.tstDone() Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_FlowsSection(): Index: tst_Treatment_Adjustment_Duration/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DurationSection(): @@ -37,6 +33,8 @@ gotoScreenNtest_Contains_DurationSection() utils.waitForGUI(1) + denaliMessages.setTreatmentStartState() + durationMin = 0 durationMax = 60 * 3 # 3h durationElapsed = 10 # 10m Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -rc5a7028efbf4a343a6ce3d92d3d534a5e15d784c -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision c5a7028efbf4a343a6ce3d92d3d534a5e15d784c) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -15,9 +15,11 @@ import names from dialin.squish import utils, denaliMessages - + + REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16 + def gotoScreenNtest_Contains_TreatmentSalineBolusData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "START BOLUS") Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages eInvalid = 0 Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_FlowsSection(): Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_FlowsSection(): Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_PressureOcclusion(): Index: tst_Treatment_Section_BloodDialysate/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,10 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils -else: - import utils +from dialin.squish import utils def main(): Index: tst_Treatment_Time/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Time/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_Treatment_Time/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_TimeSection(): @@ -44,6 +40,8 @@ gotoScreenNtest_Contains_TimeSection() utils.waitForGUI(1) + denaliMessages.setTreatmentStartState() + total = 60 resetNTestTreatmentTime(total) startNTestTreatmentTime(total) Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) @@ -13,11 +13,7 @@ # import names -if names.DIALIN_LINK: - from dialin.squish import utils, denaliMessages -else: - import utils - import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_Ultrafiltration():