Index: tst_end_treatment/test.py =================================================================== diff -u -r7509f73c732db5baebb989bd9e9bd6a3faeec0bc -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_end_treatment/test.py (.../test.py) (revision 7509f73c732db5baebb989bd9e9bd6a3faeec0bc) +++ tst_end_treatment/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -21,7 +21,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import TreatmentStates, TreatmentEndStates +from dialin.common.hd_defs import TreatmentStates, TreatmentEndStates, BloodLeakZeroingStates hd_simulator = HDSimulator() @@ -30,9 +30,17 @@ Method to verify End treatment Treatment Complete state screens """ test.startSection("Verifying End treatment Treatment Complete state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_END_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value,rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_END_STATE.value, + uf_state = TreatmentStates.TREATMENT_START_STATE.value, + saline_state = TreatmentStates.TREATMENT_START_STATE.value, + heparin_state = TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state = TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObject(names.o_end_treatment_complete_state).text),config.END_TREATMENT_COMPLETE_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_STATE_TEXT)) test.compare(str(waitForObjectExists(names.o_start_rinseback_button_text).text), config.RINSEBACK_BUTTON_TEXT, "Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT)) @@ -46,9 +54,17 @@ Method to verify End treatment Treatment Paused state screens """ test.startSection("Verifying End treatment Treatment Paused state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_END_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_END_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObject(names.o_end_treatment_complete_paused_state).text), config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT)) test.endSection() Index: tst_instructions_poc/test.py =================================================================== diff -u -r4800083679383c87221a7e55ad35f84b40ffb386 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_instructions_poc/test.py (.../test.py) (revision 4800083679383c87221a7e55ad35f84b40ffb386) +++ tst_instructions_poc/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -19,7 +19,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,TreatmentRinsebackStates,PreTreatmentRecircStates,TreatmentBloodPrimeStates,TreatmentEndStates,TreatmentStopStates,TreatmentDialysisStates,HDInitStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,TreatmentRinsebackStates,PreTreatmentRecircStates,TreatmentBloodPrimeStates,TreatmentEndStates,TreatmentStopStates,TreatmentDialysisStates,HDInitStates, BloodLeakZeroingStates from dialin.hd.reservoirs import HDReservoirStates from dialin.ui.utils import waitForGUI @@ -517,19 +517,35 @@ instructionRightArrow = rightarrow_obj_names.pop(first_index) test.startSection("Navigating to End Treatment Rinseback Setup screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state = UFStates.UF_PAUSED_STATE.value, saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state = UFStates.UF_PAUSED_STATE.value, + saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_instruction_and_image("Rinseback Setup", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow) test.endSection() # advance the title and arrow name instructionScreenObject = text_obj_names.pop(first_index) instructionRightArrow = rightarrow_obj_names.pop(first_index) test.startSection("Navigating to End Treatment Rinseback Complete screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state = UFStates.UF_PAUSED_STATE.value, saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state = UFStates.UF_PAUSED_STATE.value, + saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, + recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_instruction_and_image("Rinseback Complete", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow) @@ -559,9 +575,17 @@ instructionScreenObject = text_obj_names.pop(first_index) instructionRightArrow = rightarrow_obj_names.pop(first_index) test.startSection("Navigating to End Treatment Recirculate screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value, uf_state = UFStates.UF_PAUSED_STATE.value, saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value, + uf_state = UFStates.UF_PAUSED_STATE.value, + saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, + recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_instruction_and_image("Recirculate Disconnect", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow) test.endSection() #TODO :- Disinfect verification Index: tst_main_treatment_heparin/test.py =================================================================== diff -u -r24c54e0efb0d604eb70dd1ac1c7f1bd4580cd192 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_main_treatment_heparin/test.py (.../test.py) (revision 24c54e0efb0d604eb70dd1ac1c7f1bd4580cd192) +++ tst_main_treatment_heparin/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -11,7 +11,7 @@ from configuration import config, utility from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import TreatmentStates, HeparinStates +from dialin.common.hd_defs import TreatmentStates, HeparinStates, BloodLeakZeroingStates HEPARIN_BUTTON_STATES = {0: "OFF", 1: "HEPARIN DELIVERY", 2: "RESUME DELIVERY", @@ -34,9 +34,17 @@ """ test.startSection("Verifying Heparin State 3 HEPARIN_INITIAL_BOLUS values") test.log("Verifying Heparin State 3 -> Heparin bolus is active") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_INITIAL_BOLUS.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_INITIAL_BOLUS.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) test.compare(str(waitForObjectExists(names.o_treatment_text).text), config.TREATMENT_TEXT, utility.msg("Treatment title Text should be {}".format(config.TREATMENT_TEXT))) @@ -69,9 +77,17 @@ HEPARIN STATE 4 -> HEPARIN_STATE_DISPENSING """ test.startSection("Verifying Heparin State ->2 HEPARIN_STATE_PAUSED") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_PAUSED.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_PAUSED.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) hd_simulator.cmd_set_heparin_pause_resume_response(accepted=1, reason=0) test.compare(str(waitForObjectExists(names.o_state2_heparin_state_paused_text).text),config.HEPARIN_RESUME_DELIVERY_TEXT, utility.msg("Heparin Resume Delivery Text should be {}".format(config.HEPARIN_RESUME_DELIVERY_TEXT))) test.compare( waitForObjectExists(names.o_state2_heparin_state_paused_text).enabled, True, utility.msg("Resume Delivery Button is enabled")) @@ -83,9 +99,17 @@ test.endSection() test.startSection("Verifying Heparin State ->4 HEPARIN_STATE_DISPENSING") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_DISPENSING.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_DISPENSING.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state4_heparin_state_dispensing_text).text), config.HEPARIN_PAUSE_DELIVERY_TEXT, utility.msg("Heparin Pause Delivery Text should be {}".format(config.HEPARIN_PAUSE_DELIVERY_TEXT))) test.compare( waitForObjectExists(names.o_state4_heparin_state_dispensing_text).enabled , True, utility.msg("Pause Delivery Button is enabled")) mouseClick(waitForObject(names.o_state4_heparin_state_dispensing_text)) @@ -104,19 +128,35 @@ HEPARIN STATE 6 -> HEPARIN_STATE_EMPTY """ test.log("Verifying Heparin State 0 - HEPARIN_STATE_OFF") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_Off_text).text), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state0_heparin_delivery_Off_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(findObject(names.o_state0_heparin_delivery_Off_text).text ), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_DELIVERY_OFF_TEXT))) utils.waitForGUI(1) test.log("Verifying Heparin State 1 - HEPARIN_STATE_STOPPED") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_STOPPED.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_STOPPED.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state1_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state1_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") @@ -127,19 +167,35 @@ heparin_pause_resume_states() test.log("Verifying Heparin State 5 - HEPARIN_STATE_COMPLETED") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_COMPLETED.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_COMPLETED.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_Off_text).text), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state0_heparin_delivery_Off_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(waitForObjectExists(names.o_state5_heparin_state_completed_text).text), config.HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT))) utils.waitForGUI(1) test.log("Verifying Heparin State 6 - HEPARIN_STATE_EMPTY") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_EMPTY.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_EMPTY.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state6_heparin_state_empty_text).text), config.HEPARIN_SYRINGE_EMPTY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state6_heparin_state_empty_text)).enabled, True, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") @@ -165,9 +221,17 @@ test.startSection("Verifying test case scenario for rejection and acceptance in current state") for reason_id in range(1, (config.NUM_OF_REQUEST_REJECT_REASONS)): for state_id, state in HEPARIN_BUTTON_STATES.items(): - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=state_id, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=state_id, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(utility.expected_heparin_value(state)).text), state, utility.msg("{} text should be displayed".format(state))) hd_simulator.cmd_set_heparin_pause_resume_response(accepted=0, reason=reason_id) verify_the_rejection_msg(reason_id) @@ -180,9 +244,17 @@ hd_simulator.cmd_set_heparin_pause_resume_response(accepted=0, reason=reason_id+1) verify_the_rejection_msg(reason_id=reason_id+1) #changing the state - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=state_id+1, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=state_id+1, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) if state_id == 6: break else: Index: tst_main_treatment_ultrafiltration/test.py =================================================================== diff -u -r15f6a1fa16cd68526a407bc4c99b775e37030e3c -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 15f6a1fa16cd68526a407bc4c99b775e37030e3c) +++ tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -20,7 +20,7 @@ from dialin.ui import utils from dialin.common.ui_defs import TXStates as uf_states from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDStandbyStates, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates, BloodLeakZeroingStates from configuration import config hd_simulator = HDSimulator() @@ -302,9 +302,17 @@ startApplication(config.AUT_NAME) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verification_of_uf_from_main_treatment() Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r2650a9f3f8ca6571294f6ce322327b62fc832ab9 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_main_treatment_vitals/test.py (.../test.py) (revision 2650a9f3f8ca6571294f6ce322327b62fc832ab9) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -18,7 +18,7 @@ from configuration import application_init as application_init from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates, BloodLeakZeroingStates from time import strftime # from dialin.ui.utils import waitForGUI @@ -669,13 +669,30 @@ """ hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value) utils.waitForGUI(1) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, - treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, - treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, + blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, + treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, + dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, + blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, + treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, + dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + def set_parameter_type(text): """ Method to set object property based on text @@ -783,9 +800,17 @@ startApplication(config.AUT_NAME) hd_simulator.cmd_send_power_on_self_test_version_request() - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration=0, max_treatment_duration=480, min_uf_volume=0.01, max_uf_volume=8.00, Index: tst_recirculate/test.py =================================================================== diff -u -r06fda637e04ce27ea414ba8ad06af92c4b76d788 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_recirculate/test.py (.../test.py) (revision 06fda637e04ce27ea414ba8ad06af92c4b76d788) +++ tst_recirculate/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -21,7 +21,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import TreatmentStates, TreatmentRinsebackStates, TreatmentRecircStates +from dialin.common.hd_defs import TreatmentStates, TreatmentRinsebackStates, TreatmentRecircStates, BloodLeakZeroingStates hd_simulator = HDSimulator() SCREEN_OBJ = names.o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase @@ -36,11 +36,17 @@ """ test.startSection("verifying Treatment Recirculate Recirculate state screens") hd_simulator.cmd_set_treatment_time(sec_total = 120, sec_elapsed = 20, sec_remain = 100) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value , + uf_state = TreatmentStates.TREATMENT_START_STATE.value, + saline_state = TreatmentStates.TREATMENT_START_STATE.value, + heparin_state = TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, + blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state = TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying Timer count down timer " + config.RECIRCULATE_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE): hd_simulator.cmd_send_treatment_recirculate_data(timeout_total=num, timeout_count_down=num) @@ -67,11 +73,17 @@ Method to verify Treatment Recirculate stopped state screens """ test.startSection("verifying Treatment Recirculate stopped state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RECIRC_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state=TreatmentRecircStates.TREATMENT_RECIRC_STOPPED_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RECIRC_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state=TreatmentRecircStates.TREATMENT_RECIRC_STOPPED_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying Timer count down timer on Recirculate Stopped state") for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE): hd_simulator.cmd_send_treatment_recirculate_data(timeout_total=num, timeout_count_down=num) Index: tst_rinseback_setup/test.py =================================================================== diff -u -r6b85a46cebe626c28a1accd4ea0019d3388abef4 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_rinseback_setup/test.py (.../test.py) (revision 6b85a46cebe626c28a1accd4ea0019d3388abef4) +++ tst_rinseback_setup/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -21,7 +21,7 @@ from configuration import config from dialin.ui.hd_simulator import HDSimulator from configuration import utility -from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates, BloodLeakZeroingStates hd_simulator = HDSimulator() SCREEN_OBJ = names.o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit @@ -50,12 +50,19 @@ test.startSection("verifying Rinseback Stop INIT state screens") hd_simulator.cmd_set_treatment_time(sec_total = COUNT_DOWN_VALUE, sec_elapsed = SEC_ELAPSED, sec_remain = SEC_REMAINING) hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + test.startSection("Verifying count down value of timer in " + config.RINSE_BACK_SETUP_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_DEFAULT_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed= 0) @@ -82,9 +89,17 @@ Method to navigate and verify to Rinseback RUN state screens """ test.startSection("Verifying Rinseback RUN state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,rinseback_state=TreatmentRinsebackStates.RINSEBACK_RUN_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_RUN_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying count down value of timer in RUN state screen") for num in range(COUNT_DOWN_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): @@ -121,9 +136,18 @@ Method to navigate and verify to Rinseback Paused state screens """ test.startSection("verifying Rinseback Paused state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentRinsebackStates.RINSEBACK_PAUSED_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_PAUSED_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + test.compare(str(waitForObject(names.o_EndTreatmentRinseback_Rinseback_Text).text), config.RINSEBACK_TEXT, "Rinseback text must be {}".format(config.RINSEBACK_TEXT)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageEnd_ImageText).text), config.END_IMAGE_BUTTON_TEXT, "END button text must be {}".format(config.END_IMAGE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageEnd_ImageText).enabled, " END button must be active") @@ -144,9 +168,17 @@ Method to navigate and verify to Rinseback Stop state screens """ test.startSection("verifying Rinseback Stop state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying count down value of timer in " + config.RINSEBACK_COMPLETE_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed=True) @@ -175,9 +207,17 @@ Method to navigate and verify to Rinseback Run Additional State screens """ test.startSection("verifying Rinseback Run Additional State screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value,rinseback_state= TreatmentRinsebackStates.RINSEBACK_RUN_ADDITIONAL_STATE.value, recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value , + uf_state = TreatmentStates.TREATMENT_START_STATE.value, + saline_state = TreatmentStates.TREATMENT_START_STATE.value, + heparin_state = TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state= TreatmentRinsebackStates.RINSEBACK_RUN_ADDITIONAL_STATE.value, + recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state = TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("verifying count down value of timer in" + config.ADDITIONAL_RINSEBACK_TEXT) for num in range(COUNT_DOWN_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=num, flow_rate=num, timeout=COUNT_DOWN_DEFAULT_VALUE, timeout_countdown=COUNT_DOWN_DEFAULT_VALUE, is_completed= 0) Index: tst_settings_date_and_time/test.py =================================================================== diff -u -r6f1e1819d6605964e7ba8366d0408cc26890be99 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_settings_date_and_time/test.py (.../test.py) (revision 6f1e1819d6605964e7ba8366d0408cc26890be99) +++ tst_settings_date_and_time/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -23,7 +23,7 @@ hd_simulator = HDSimulator() -SET_DATE_AND_TIME_TEXT = "Set Date And Time" +SET_DATE_AND_TIME_TEXT = "Set Date and Time" TIME_TITLE = "Time (HH:MM)" DATE_TITLE_TEXT = "Date (MM/DD/YYYY)" HOUR_TEXT = "Hour" @@ -105,7 +105,7 @@ Method to navigate to set date and time screen and verify its title 'Set Date And Time' """ - test.startSection("Navigating 'Set Date And Time' screen") + test.startSection("Navigating 'Set Date and Time' screen") utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_mouseArea_MouseArea_2_set_date_time)) set_date_and_time_title = waitForObjectExists(settings_text_obj(SET_DATE_AND_TIME_TEXT)) Index: tst_time_duration/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_time_duration/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_time_duration/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -17,7 +17,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config, utility from dialin.ui.utils import waitForGUI -from dialin.common.hd_defs import TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, TreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates +from dialin.common.hd_defs import TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, TreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates, BloodLeakZeroingStates MIN_TIME_RANGE = 60 MAX_TIME_RANGE = 480 @@ -129,9 +129,17 @@ startApplication(config.AUT_NAME) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, + blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) utils.waitForGUI(1) verify_pop_up() @@ -141,9 +149,17 @@ treatment_time_verification(value) #Give treatment stop response to pause remain time - hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_START_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_NO_RECIRC_STATE.value, dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_START_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, + blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_NO_RECIRC_STATE.value, + dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) #verify treatment pause state verify_pause_treatment_text() Index: tst_treatment_blood_dialysateflow_rate/test.py =================================================================== diff -u -r52bc8f634fc08f78afc721468c23106dff15fe5a -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 52bc8f634fc08f78afc721468c23106dff15fe5a) +++ tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -14,6 +14,7 @@ import names from dialin.ui import utils +from dialin.common.hd_defs import BloodLeakZeroingStates from dialin.ui.hd_simulator import HDSimulator from configuration import config @@ -237,9 +238,17 @@ utils.waitForGUI(1) #navigate to In-treatment section - hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state=1, heparin_state= 0, - rinseback_state= 0, recirculate_state= 0, blood_prime_state= 2, - treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0) + hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, + uf_state= 0, + saline_state=1, + heparin_state= 0, + rinseback_state= 0, + recirculate_state= 0, + blood_prime_state= 2, + treatment_end_state=0, + treatment_stop_state= 0, + dialysis_state=0, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) utils.waitForGUI(1) #delay for fetching effect test_blood_flow_rate_and_dialysate(BLOOD_DIALYSATE_FLOW_TESTING_OPTION["OPTION_1"]) Index: tst_treatment_saline_data/test.py =================================================================== diff -u -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_treatment_saline_data/test.py (.../test.py) (revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -18,7 +18,7 @@ import names from configuration import config, utility from dialin.ui import utils -from dialin.common.hd_defs import HDStandbyStates, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates, BloodLeakZeroingStates from dialin.ui.hd_simulator import HDSimulator from dialin.common.ui_defs import TXStates as txStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason @@ -101,9 +101,17 @@ if (not accept_status): test.compare(waitForObjectExists(saline_rejection_text_object(config.REJECTION_REASON[rejection_reason])).text, config.REJECTION_REASON[rejection_reason], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection_reason])) #set saline transition state. - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=saline_states, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(button_text)) verify_target_value(expected_target_value = target) @@ -140,8 +148,11 @@ for delivered_value, cumulative_value in config.SALINE_BOLUS_VALUES.items(): hd_simulator.cmd_set_treatment_saline_bolus_data(target=target_value, - cumulative=cumulative_value, - delivered=delivered_value) + cumulative=cumulative_value, + delivered=delivered_value, + DPI2BLDVolML=0.0, + RSRVR2DPIVolML=0.0, + zeroingRqstStatus=1) test.log("verification of saline values from dialysis state for target value :" + str(target_value)+ " cumulative value :" +str(cumulative_value)+" and delivered value :"+ str(delivered_value)) @@ -217,36 +228,68 @@ test.startSection("verification of saline parameter states on main treatment screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) mouseClick(waitForObject(names.o_treatmentHome_startFluidButton_TouchRect)) test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), True, "START BOLUS button is enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), True, "Start Bolus text is enable") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), False, "START BOLUS button is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible") test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) mouseClick(waitForObjectExists(names.o_treatmentHome_stop_bolus_Text)) mouseClick(waitForObject(names.o_treatmentHome_Treatment_Paused_Text)) test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible") test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), False, "START BOLUS button is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") @@ -261,9 +304,17 @@ utils.waitForGUI(1) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode= HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) #verification of target, cumulative and delivered value test_saline_values() Index: tst_ui_logs/test.py =================================================================== diff -u -r4800083679383c87221a7e55ad35f84b40ffb386 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_ui_logs/test.py (.../test.py) (revision 4800083679383c87221a7e55ad35f84b40ffb386) +++ tst_ui_logs/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -30,7 +30,7 @@ from configuration import config from configuration import application_init as application_init from dialin.common.msg_ids import MsgIds -from dialin.common.hd_defs import HDStandbyStates, HDOpModes +from dialin.common.hd_defs import HDStandbyStates, HDOpModes, BloodLeakZeroingStates from dialin.common import msg_defs from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array, unsigned_short_to_bytearray, unsigned_byte_to_bytearray @@ -179,7 +179,12 @@ verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA.value), msg = "TreatmentRanges", param = [60,470,22.600,34.200,100,600]) #0x2F00 - hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, cumulative = 100.0, delivered = 300.0) + hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, + cumulative = 100.0, + delivered = 300.0, + DPI2BLDVolML = 50.5, + RSRVR2DPIVolML = 23.3, + zeroingRqstStatus = 1) verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,100.0,300.0]) #0x4D00 @@ -248,8 +253,16 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.value, msg = "~FLD_LEAK") #0x6C00 - hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, blood_leak_state = 1, - blood_leak_zero_status_counter = 4, blood_leak_serial_state = 2) + hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, + blood_leak_state = 1, + blood_leak_error_persistent_ctr = 4, + blood_leak_serial_comm_state = 2, + blood_leak_intensity = 3, + blood_leak_blood_detect = 3, + blood_leak_intensity_moving_average =15.26, + blood_leak_time_since_last_zero_ms = 125, + blood_leak_in_range_drift_status = 1, + blood_leak_upper_range_drift_status = 0) verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,2]) #0x9300 @@ -341,9 +354,17 @@ #0x0F00 for s_mode in range(NUMBER_OF_TREATMENTMODES): - hd_simulator.cmd_set_treatment_states_data(sub_mode = s_mode, uf_state = 1, saline_state = 2, heparin_state = 3, - rinseback_state = 4, recirculate_state = 5, blood_prime_state = 6, - treatment_end_state = 7, treatment_stop_state = 8, dialysis_state = 9) + hd_simulator.cmd_set_treatment_states_data(sub_mode = s_mode, + uf_state = 1, + saline_state = 2, + heparin_state = 3, + rinseback_state = 4, + recirculate_state = 5, + blood_prime_state = 6, + treatment_end_state = 7, + treatment_stop_state = 8, + dialysis_state = 9, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE_DATA.value, msg = "TreatmentStates", param = [s_mode,1,2,3,4,5,6,7,8,9]) #0x7700