Index: shared/scripts/names.py =================================================================== diff -u -r9fc49dcb5999a8def502d0a0984b35b9e67a8092 -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 --- shared/scripts/names.py (.../names.py) (revision 9fc49dcb5999a8def502d0a0984b35b9e67a8092) +++ shared/scripts/names.py (.../names.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) @@ -26,6 +26,7 @@ o_treatmentHome_startTreatment = {"container": o_treatmentHome, "id": "_startTreatmentRect" , "type": "TouchRect" , "unnamed": 1, "visible": True} o_treatmentHome_createTreatment = {"container": o_treatmentHome, "id": "_createTreatmentRect", "type": "TouchRect" , "unnamed": 1, "visible": True} + # Main Menu o_mainMenu = {"container": o_QQuickView, "id": "_mainMenu" , "type": "MainMenu" , "unnamed": 1 , "visible": True} o_mainMenu_treatment = {"container": o_mainMenu , "id": "_touchRect", "type": "TouchRect", "objectName": "_touchRect0", "visible": True} Index: tst_Internals/test.py =================================================================== diff -u -r2ef15fa5a3d4c92513a2b99733adfa2fff11478e -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 --- tst_Internals/test.py (.../test.py) (revision 2ef15fa5a3d4c92513a2b99733adfa2fff11478e) +++ tst_Internals/test.py (.../test.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) @@ -28,5 +28,6 @@ unittests.test_python_version() unittests.test_crc8() - + unittests.test_can0() + utils.tstDone() \ No newline at end of file Index: tst_TreatmentSalineData/test.py =================================================================== diff -u -r9fc49dcb5999a8def502d0a0984b35b9e67a8092 -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 --- tst_TreatmentSalineData/test.py (.../test.py) (revision 9fc49dcb5999a8def502d0a0984b35b9e67a8092) +++ tst_TreatmentSalineData/test.py (.../test.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) @@ -29,6 +29,7 @@ def getUnit(): global saline_unit saline_unit = str(waitForObjectExists(names.o_treatmentStart_SalineSection).unit) + def gotoScreenNtest_Contains_TreatmentSalineBolusData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) @@ -37,16 +38,18 @@ test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection).visible , True) -def test_values(vTarget, vCumulative, vDelivered): - test.compare(waitForObjectExists(names.o_treatmentStart_SalineSection).valueTarget , vTarget ) +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(str(waitForObjectExists(names.o_treatmentStart_SalineTarget ).text), "({:.0f} {})".format(vTarget, saline_unit)) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineCumulative).text), "{:.0f}".format(vCumulative)) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineDelivered ).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)) + def main(): utils.tstStart(__file__) @@ -61,9 +64,24 @@ cumulitive = 0 step = 1 for target in [100, 200, 300]: + denaliMessages.setTreatmentSalineBolusData(target, 0, 0) + test_target(target) for value in range ( 0, target, step): cumulitive += step denaliMessages.setTreatmentSalineBolusData(target, cumulitive, value+1) # 0 is not a step - test_values (target, cumulitive, value+1) # 0 is not a step + test_values ( cumulitive, value+1) # 0 is not a step + + denaliMessages.setTreatmentSalineBolusData(200, 110, 10) + test_target (200 ) + test_values ( 110, 10) + denaliMessages.setTreatmentSalineBolusData(200, 110, 10) + test_target (200 ) + test_values ( 110, 10) + + denaliMessages.setTreatmentSalineBolusData( 0, 0, 0) + test_target ( 0 ) + test_values ( 0, 0) + + utils.tstDone() Index: tst_TreatmentScreen/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 --- tst_TreatmentScreen/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_TreatmentScreen/test.py (.../test.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) @@ -36,7 +36,7 @@ test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).visible, True) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True) - test.compare(waitForObjectExists(names.o_treatmentStart_SalineTouchArea_TreatmentFluid).visible, True) + test.compare(waitForObjectExists(names.o_treatmentStart_SalineSection).visible, True) test.compare(waitForObjectExists(names.o_treatmentStart_heparinTouchArea_TreatmentFluid).visible, True) utils.tstDone() Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 --- tst_TreatmentStatesData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) @@ -19,45 +19,82 @@ import utils import denaliMessages - +class txStates: + # Saline states + SALINE_STOP_STATE = 0 + SALINE_START_STATE = 1 + + # 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_STOP_STATE_NOT = 0 + TREATMENT_STOP_STATE = 2 + + def gotoScreenNtest_Contains_TreatmentStatesData(): - mouseClick(waitForObject(names.o_mainMenu_manager)) + mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test_values(0, 0, 0) def test_values(vSubMode, vUFState, vSalineState): - # there have been no UI object associated with these values yet. - # enable it when needed. - return None #test.compare(str(waitForObjectExists(names.o_settingsHome_TreatmentStatesData_SubMode ).text), "{:.0f}".format(vSubMode )) #test.compare(str(waitForObjectExists(names.o_settingsHome_TreatmentStatesData_UFState ).text), "{:.0f}".format(vUFState )) #test.compare(str(waitForObjectExists(names.o_settingsHome_TreatmentStatesData_SalineState ).text), "{:.0f}".format(vSalineState)) - + pass - def main(): utils.tstStart(__file__) - + secPause = 1 startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_TreatmentStatesData() utils.waitForGUI(1) - step = 10 - for i in range ( 10, 500, step): - denaliMessages.setTreatmentStatesData(i, i + step * 1, i + step * 2) - test_values (i, i + step * 1, i + step * 2) + # start + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 + test_values (txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 0 1 + test_values (txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 0 1 + utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(100, 200, 300) - test_values (100, 200, 300) + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 0 1 0 + test_values (txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 0 1 0 + utils.waitForGUI(secPause) - # Coverage - denaliMessages.setTreatmentStatesData(100, 200, 300) - test_values (100, 200, 300) + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 1 1 + test_values (txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 0 1 1 + utils.waitForGUI(secPause) - denaliMessages.setTreatmentStatesData(0, 0, 0) - test_values (0, 0, 0) + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 1 0 0 + test_values (txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 1 0 0 + utils.waitForGUI(secPause) + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 1 0 1 + test_values (txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE ) # 1 0 1 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 1 1 0 + test_values (txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_STOP_STATE ) # 1 1 0 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_START_STATE ) # 1 1 1 + test_values (txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_START_STATE ) # 1 1 1 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_START_STATE ) # 1 1 1 + test_values (txStates.TREATMENT_STOP_STATE , txStates.UF_PAUSED_STATE , txStates.SALINE_START_STATE ) # 1 1 1 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 + test_values (txStates.TREATMENT_STOP_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE ) # 0 0 0 + utils.waitForGUI(secPause) + utils.tstDone() Index: tst_Treatment_Adjustment_Saline/test.py =================================================================== diff -u -r9fc49dcb5999a8def502d0a0984b35b9e67a8092 -r2dc140932c71c9b21e2c60410ec0ca58e04d9771 --- tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 9fc49dcb5999a8def502d0a0984b35b9e67a8092) +++ tst_Treatment_Adjustment_Saline/test.py (.../test.py) (revision 2dc140932c71c9b21e2c60410ec0ca58e04d9771) @@ -19,6 +19,9 @@ else: import utils import denaliMessages + + +REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16 def gotoScreenNtest_Contains_TreatmentSalineBolusData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) @@ -27,18 +30,33 @@ test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection).visible , True) +def getUnit(): + global saline_unit + saline_unit = str(waitForObjectExists(names.o_treatmentStart_SalineSection).unit) + + +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)) + + def test_state(vAccept, vText): mReason = 0 - if (not vAccept): - mReason = 16 + if (not vAccept): mReason = REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS mouseClick(waitForObject(names.o_treatmentStart_SalineStart)) - denaliMessages.setSalineBolusResponse(vAccept, mReason, 50) + # when rejected reason set 16 + # although rejected value has been sent to check UI only looks for Accept field + # value and reason are not related by added those two to have a different value in case of rejection + target = 50 + mReason + denaliMessages.setSalineBolusResponse(vAccept, mReason, target) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(vText)) + test_target(target) - -def test_Ultrafiltration(): - pass - + +def test_ultrafiltration(vEnabled): + test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).isTouchable, vEnabled) + + def main(): utils.tstStart(__file__) @@ -49,22 +67,35 @@ gotoScreenNtest_Contains_TreatmentSalineBolusData() utils.waitForGUI(1) + getUnit() + # Init stopped, stopped =(accepted)=> running (Text => STOP ) test_state(True , "STOP" ) - + test_ultrafiltration(False) + # Now running, running =(rejected)== running (Text == STOP ) test_state(False, "STOP" ) - + test_ultrafiltration(False) + + # multiple same request should not affect if rejected + # Now running, running =(rejected)== running (Text == STOP ) + test_state(False, "STOP" ) + test_ultrafiltration(False) + # Still running, running =(accepted)=> stopped (Text == START) test_state(True , "START") - + test_ultrafiltration(True) + # Now stopped, stopped =(rejected)== stopped (Text == START) test_state(False, "START") - + test_ultrafiltration(True) + # Now stopped, stopped =(accepted)=> running (Text == STOP ) test_state(True , "STOP" ) - + test_ultrafiltration(False) + # Still running, running =(accepted)=> stopped (Text == START) test_state(True, "START") - + test_ultrafiltration(True) + utils.tstDone()