Index: simulator/run.py =================================================================== diff -u -r63183a23c930b861a2f59b8dc62ea520d597ee96 -rbefca1db0402e031a5b692aa93dc74bfb314eb9e --- simulator/run.py (.../run.py) (revision 63183a23c930b861a2f59b8dc62ea520d597ee96) +++ simulator/run.py (.../run.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) @@ -160,8 +160,12 @@ tblSalineUFStates: QtWidgets.QTableWidget tblSalineSalineStates: QtWidgets.QTableWidget + # static class variables + saline_requested_state: txStates + def __init__(self): super().__init__(Simulator.ui_file_name) + self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE self.initialize() def setup_ranges(self): @@ -251,8 +255,14 @@ the slot for accept saline bolus button :return: none """ + # toggle the saline requested state + if self.saline_requested_state == txStates.SALINE_BOLUS_STATE_IN_PROGRESS: + self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + else: + self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS + target = self.cmbSalineAcceptTarget.currentText() - denaliMessages.setSalineBolusResponse(True, 0, target, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) + denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state) self.lblSalineAction.setText('Accepted ' + target) @Slot() @@ -262,7 +272,7 @@ :return: none """ reason = self.spnSalineRejectReason.value() - denaliMessages.setSalineBolusResponse(False, reason, 0, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) + denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state) self.lblSalineAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -315,8 +325,7 @@ """ denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10) - self.lblUfAction.setText('Accepted ') - print("do_uf_edit_accept") + self.lblUfEditAction.setText('Accepted ') @Slot() def do_uf_edit_reject(self): @@ -328,7 +337,6 @@ denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Rejected ' + "{}".format(reason)) - print("do_uf_edit_reject") @Slot() def do_saline_saline_state(self): Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -rbefca1db0402e031a5b692aa93dc74bfb314eb9e --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) @@ -24,9 +24,9 @@ def test_values(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion): test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_ArterialPressure ).text), "{:.2f}".format(vArterialPressure )) test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_VenousPressure ).text), "{:.2f}".format(vVenousPressure )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion ).text), "{:.2f}".format(vBloodPumpOcclusion )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion ).text), "{:.2f}".format(vDialysateInletPumpOcclusion )) - test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion).text), "{:.2f}".format(vDialysateOutletPumpOcclusion)) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion ).text), "{}" .format(vBloodPumpOcclusion )) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion ).text), "{}" .format(vDialysateInletPumpOcclusion )) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion).text), "{}" .format(vDialysateOutletPumpOcclusion)) def main(): Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -re2b1198b35a5e13749755e0839255d13f746a7c9 -rbefca1db0402e031a5b692aa93dc74bfb314eb9e --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision e2b1198b35a5e13749755e0839255d13f746a7c9) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) @@ -24,8 +24,8 @@ 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) + utils.waitForGUI(1) - def getUnit(): return str(waitForObjectExists(names.o_treatmentStart_SalineSection).unit) @@ -48,7 +48,7 @@ test_target(target) -def test_ultrafiltration(vEnabled): +def test_ultrafiltration_touchable(vEnabled): test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).isTouchable, vEnabled) @@ -58,37 +58,45 @@ startApplication(names.AUT_NAME) utils.waitForGUI(1) - #initially is stopped (Text => START) + # Initial Idle -> Idle/START/UF_True gotoScreenNtest_Contains_TreatmentSalineBolusData() - utils.waitForGUI(1) - - # Init stopped, stopped =(accepted)=> running (Text => STOP ) + test_ultrafiltration_touchable(True ) + + # Initial Idle => Running => Rejected -> Idle/START/UF_True + test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_ultrafiltration_touchable(True ) + + # retry Idle => Running => Rejected -> Idle/START/UF_True + test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_ultrafiltration_touchable(True ) + + # Still Idle => Running => Accepted -> Running/STOP/UF_False test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) - test_ultrafiltration(False) + test_ultrafiltration_touchable(False) - # Now running, running =(rejected)== running (Text == STOP ) + # Now Running => Idle => Rejected -> Running/STOP/UF_False test_state(False, "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) - test_ultrafiltration(False) + test_ultrafiltration_touchable(False) - # multiple same request should not affect if rejected - # Now running, running =(rejected)== running (Text == STOP ) + # Retry Running => Idle => Rejected -> Running/STOP/UF_False test_state(False, "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) - test_ultrafiltration(False) + test_ultrafiltration_touchable(False) - # Still running, running =(accepted)=> stopped (Text == START) + # Still Running => Idle => Accepted -> Idle/START/UF_True test_state(True , "START" , txStates.SALINE_BOLUS_STATE_IDLE ) - test_ultrafiltration(True) + test_ultrafiltration_touchable(True ) - # Now stopped, stopped =(rejected)== stopped (Text == START) + # Now Idle => Running => Rejected -> Idle/START/UF_True test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) - test_ultrafiltration(True) + test_ultrafiltration_touchable(True ) - # Now stopped, stopped =(accepted)=> running (Text == STOP ) + # Retry Idle => Running => Rejected -> Idle/START/UF_True + test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE ) + test_ultrafiltration_touchable(True ) + + # Still Idle => Running => Accepted -> Running/STOP/UF_False test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) - test_ultrafiltration(False) + test_ultrafiltration_touchable(False) - # Still running, running =(accepted)=> stopped (Text == START) - test_state(True, "START", txStates.SALINE_BOLUS_STATE_IDLE ) - test_ultrafiltration(True) - + utils.tstDone()