Index: shared/scripts/names.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -rdb6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e --- shared/scripts/names.py (.../names.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ shared/scripts/names.py (.../names.py) (revision db6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e) @@ -12,7 +12,7 @@ # author Behrouz NematiPour # -AUT_NAME = "denaliSquish" # Squish +AUT_NAME = "denali" # Squish AlarmPriority = [ 0, 1, 2, 3, 4 ] # 4 is out of range check AlarmTextMap = [ @@ -202,21 +202,21 @@ o_treatmentAdjustmentUltrafiltrationPaused_EditButton = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_editButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_resumeButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_notification" , "type": "NotificationBar" } -o_treatmentAdjustmentUltrafiltrationPaused_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_pausedNotification", "type": "NotificationBarSmall" } +o_treatmentAdjustmentUltrafiltrationPaused_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_information" , "type": "NotificationBarSmall" } ## Edit Screen o_treatmentAdjustmentUltrafiltrationEdit_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit" , "type": "ContentItem" } o_treatmentAdjustmentUltrafiltrationEdit_NextButton = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_nextButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_notification" , "type": "NotificationBar" } -o_treatmentAdjustmentUltrafiltrationEdit_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_pausedNotification", "type": "NotificationBarSmall" } +o_treatmentAdjustmentUltrafiltrationEdit_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_information" , "type": "NotificationBarSmall" } o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_volumeSlider" , "type": "Slider" } ## Confirm Screen o_treatmentAdjustmentUltrafiltrationConfirm_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationConfirm" , "type": "ContentItem" } o_treatmentAdjustmentUltrafiltrationConfirm_Title = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_titleText" , "type": "Text" } o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_confirmButton" , "type": "TouchRect" } o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_notification" , "type": "NotificationBar" } -o_treatmentAdjustmentUltrafiltrationConfirm_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_pausedNotification" , "type": "NotificationBarSmall" } +o_treatmentAdjustmentUltrafiltrationConfirm_PausedText = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_information" , "type": "NotificationBarSmall" } o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_rateAdjustmentButton" , "type": "UltrafiltrationButton"} o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_durationAdjustmentButton", "type": "UltrafiltrationButton"} ### Rate Option Index: simulator/Simulator.ui =================================================================== diff -u --- simulator/Simulator.ui (revision 0) +++ simulator/Simulator.ui (revision db6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e) @@ -0,0 +1,897 @@ + + + Form + + + + 0 + 0 + 919 + 745 + + + + Form + + + + + + + + + + + 0 + 0 + + + + + + + + + 50 + 0 + + + + mL + + + + + + + + + + + + + + Ultrafiltration Adjustment + + + Qt::AlignCenter + + + + + + + + 50 + 0 + + + + reason + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Accept + + + + + + + Reject + + + + + + + + 0 + 0 + + + + 8000 + + + + + + + + + Qt::Horizontal + + + + + + + + + 8000 + + + Qt::Horizontal + + + + + + + + 50 + 0 + + + + 8000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Max + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 8000 + + + Qt::Horizontal + + + + + + + + 75 + 0 + + + + Target + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + 0 + + + + + + + 0 + + + + + + + Ultrafiltration Data + + + Qt::AlignCenter + + + + + + + Volume + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + 8000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Qt::Vertical + + + + + + + + + + + + 0 + 0 + + + + + + + + + 50 + 0 + + + + mL + + + + + + + + 0 + 0 + + + + + 100 + + + + + 200 + + + + + 300 + + + + + + + + + + + + + + + Saline Bolus Adjustment + + + Qt::AlignCenter + + + + + + + + 50 + 0 + + + + reason + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Accept + + + + + + + Reject + + + + + + + + + Qt::Horizontal + + + + + + + + + + 50 + 0 + + + + 1000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 300 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 1000 + + + Qt::Horizontal + + + + + + + + 75 + 0 + + + + Target + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + 0 + + + + + + + 300 + + + Qt::Horizontal + + + + + + + 300 + + + Qt::Horizontal + + + + + + + Volume + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Saline Bolus Data + + + Qt::AlignCenter + + + + + + + Max + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 75 + 0 + + + + Cumulative + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + 50 + 0 + + + + 300 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0 + + + + + + + 0 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + + + + + + Treatment States + + + Qt::AlignCenter + + + + + + + + + + 325 + 400 + + + + true + + + 300 + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + Treatment States (subMode) + + + + + TREATMENT_START_STATE + + + + + TREATMENT_DIALYSIS_STATE + + + + + TREATMENT_STOP_STATE + + + + + TREATMENT_RINSEBACK_STATE + + + + + TREATMENT_RINSEBACK_PAUSE_STATE + + + + + TREATMENT_RECIRC_SETUP_STATE + + + + + TREATMENT_RECIRC_STATE + + + + + TREATMENT_RECIRC_PAUSE_STATE + + + + + TREATMENT_RECIRC_STOP_STATE + + + + + TREATMENT_DIALYSIS_END_STATE + + + + + TREATMENT_END_STATE + + + + + + + + + 200 + 225 + + + + 180 + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + UF States + + + + + UF_START_STATE + + + + + UF_PAUSED_STATE + + + + + UF_RUNNING_STATE + + + + + UF_OFF_STATE + + + + + UF_COMPLETED_STATE + + + + + + + + + 360 + 0 + + + + 350 + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + Saline States + + + + + SALINE_BOLUS_STATE_IDLE + + + ItemIsSelectable|ItemIsEnabled + + + + + SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP + + + + + SALINE_BOLUS_STATE_IN_PROGRESS + + + + + SALINE_BOLUS_STATE_MAX_DELIVERED + + + + + + + + + + + + + + sldSalineTarget + valueChanged(int) + lblSalineTarget + setNum(int) + + + 851 + 192 + + + 851 + 170 + + + + + sldSalineCumulative + valueChanged(int) + lblSalineCumulative + setNum(int) + + + 851 + 284 + + + 851 + 262 + + + + + sldSalineVolume + valueChanged(int) + lblSalineVolume + setNum(int) + + + 851 + 238 + + + 851 + 216 + + + + + sldUFTarget + valueChanged(int) + lblUFTarget + setNum(int) + + + 176 + 188 + + + 172 + 167 + + + + + sldUFVolume + valueChanged(int) + lblUFVolume + setNum(int) + + + 263 + 235 + + + 263 + 212 + + + + + Index: tst_Internals/test.py =================================================================== diff -u -r08e394d6afe01356f9ab4da613180112ff86f32d -rdb6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e --- tst_Internals/test.py (.../test.py) (revision 08e394d6afe01356f9ab4da613180112ff86f32d) +++ tst_Internals/test.py (.../test.py) (revision db6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e) @@ -17,7 +17,10 @@ from dialin.squish import unittests from dialin.utils.base import is_interface_present, is_interface_up +from dialin.squish import utils, denaliMessages +from dialin.squish.denaliMessages import txStates + def main(): utils.tstStart(__file__) @@ -27,4 +30,6 @@ test.compare(is_interface_up("can0"), True, "CAN interface is up") unittests.test_can0() + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE, txStates.SALINE_BOLUS_STATE_IDLE ) + utils.tstDone() Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -rdb6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e --- tst_TreatmentStatesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision db6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e) @@ -34,7 +34,7 @@ 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 ): + if (vUFState == txStates.UF_OFF_STATE ): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).visible , False) test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification ).text ) , "" ) @@ -77,46 +77,46 @@ utils.waitForGUI(1) # start - 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_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_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 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 0 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 0 1 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 0 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , 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_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 + 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_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 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 1 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 0 1 1 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 1 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 1 2 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 1 0 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 1 0 0 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 1 0 1 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IN_PROGRESS ) # 1 0 1 + utils.waitForGUI(secPause) + + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 0 2 + test_values (txStates.TREATMENT_DIALYSIS_STATE , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 0 2 utils.waitForGUI(secPause) - 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 + 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_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_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_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_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_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) @@ -129,8 +129,8 @@ 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_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 + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 + test_values (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE ) # 0 0 0 utils.waitForGUI(secPause) utils.tstDone() Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -rdb6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision db6844f9c8bf44c39b1e6eb6f3a55a84aacebd4e) @@ -14,6 +14,8 @@ import names from dialin.squish import utils, denaliMessages +# from dialin.squish.denaliMessages import setTreatmentStartState +from dialin.squish.denaliMessages import txStates eInvalid = 0 @@ -69,6 +71,23 @@ utils.waitForGUI(1) +# --------------- Off Screen --- the default state is off for ultrafiltration +def testScreen_Off_Ultrafiltration(): + # [Stop Screen] which is actually paused screen without resume button since the uf is in stop mode and user need to adjust/edit uf volume to start. + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen ).visible, True) + ## Edit Button + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_EditButton ).text.text), "EDIT ULTRAFILTRATION VOLUME") + ## Resume Buttons + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton).visible, False) + ## Paused Notification + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is off") + + +def testScreen_Off_Notification(): + # [Section Paused Notification] + test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration is off") + + # --------------- Start Screen def testScreen_Start_Ultrafiltration(): # [Start Screen] @@ -108,7 +127,7 @@ ## Resume Button test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton).text.text), "RESUME ULTRAFILTRATION") ## Paused Notification - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is paused.") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is paused") def resume_Request(): @@ -139,7 +158,7 @@ def testScreen_Paused_Notification(): # [Section Paused Notification] - test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration Paused") + test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration is paused") def edit_Clicked(): @@ -149,7 +168,7 @@ def testScreen_Edit_Ultrafiltration(): test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NextButton).text.text), "NEXT") - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_PausedText).text), "Ultrafiltration is paused.") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_PausedText).text), "Ultrafiltration is paused") test.compare(str(waitForObjectExists(names.o_backButton).text.text), "BACK") @@ -224,7 +243,7 @@ def testScreen_Confirm_Ultrafiltration(): #[Confrim Screen] test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_Screen).visible, True) - test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_PausedText).text), "Ultrafiltration is paused.") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_PausedText).text), "Ultrafiltration is paused") test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).text.text), "CONFIRM") test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, True) test.compare(str(waitForObjectExists(names.o_backButton).text.text), "BACK") @@ -324,9 +343,21 @@ gotoScreenNtest_Contains_Ultrafiltration() utils.waitForGUI(1) + # Main Treatment Off Notification while ultrafiltration is off (default state) + testScreen_Off_Notification() + gotoScreen_UltrafiltrationAdjustment() - # Start Screen upon User touch while IS NOT PAUSED + # Off screen upon user touch while IN OFF (default state) + testScreen_Off_Ultrafiltration() + closeScreen() # Back to main + + # set the ultrafiltration to running state + denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE ) + + gotoScreen_UltrafiltrationAdjustment() + + # Start Screen upon User touch while IS RUNNING testScreen_Start_Ultrafiltration() closeScreen() # Back to main