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()