Index: tst_In_treatment/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r4760d50a107c5d3f09df9eb9d7585d8d0af9a723 --- tst_In_treatment/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_In_treatment/test.py (.../test.py) (revision 4760d50a107c5d3f09df9eb9d7585d8d0af9a723) @@ -31,6 +31,9 @@ SALINE_BOLUS_TARGET = [0, 25, 30, 50, 100, 70, 220, 300] SALINE_BOLUS_CUMULATIVE = [0, 150, 180, 25, 35, 88, 180, 280] SALINE_BOLUS_DELIVERED = [0, 220, 852, 98, 758, 862, 752, 564] +SALINE_BOLUS_DPI2BLDVolML = [0, 10.1, 15.5, 20.2, 16.5, 12.4, 21.3, 24.0] +SALINE_BOLUS_RSRVR2DPIVolML = [0, 10,1, 20.2, 30.3, 40.4, 50.5, 60.6, 70.7] +SALINE_BOLUS_zeroingRqstStatus = [0, 1, 2, 1, 0, 1, 2, 1] def verification_of_blood_prime_from_dialysis_state(): @@ -154,7 +157,8 @@ #navigate to dialysis state hd.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state=0, heparin_state= 0, rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, - treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0) + treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0, + bloodLeakZeoringState=0) verification_of_uf_from_dialysis_state() verification_of_uf_pop_up() @@ -165,9 +169,16 @@ target_value = SALINE_BOLUS_TARGET[index] cumulative_value = SALINE_BOLUS_CUMULATIVE[index] delivered_value = SALINE_BOLUS_DELIVERED[index] - hd.cmd_set_treatment_saline_bolus_data(target = target_value, - cumulative = cumulative_value, - delivered = delivered_value) + DPI2BLDVolML_value = SALINE_BOLUS_DPI2BLDVolML[index] + RSRVR2DPIVolML_value = SALINE_BOLUS_RSRVR2DPIVolML[index] + zeroingRqstStatus_value = SALINE_BOLUS_zeroingRqstStatus[index] + hd.cmd_set_treatment_saline_bolus_data(target = target_value, + cumulative = cumulative_value, + delivered = delivered_value, + DPI2BLDVolML = DPI2BLDVolML_value, + RSRVR2DPIVolML = RSRVR2DPIVolML_value, + zeroingRqstStatus = zeroingRqstStatus_value ) + 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)) verification_of_target_value(expected_target_value = target_value) Index: tst_treatment_monitoring/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r4760d50a107c5d3f09df9eb9d7585d8d0af9a723 --- tst_treatment_monitoring/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_treatment_monitoring/test.py (.../test.py) (revision 4760d50a107c5d3f09df9eb9d7585d8d0af9a723) @@ -32,7 +32,7 @@ @param: expected_blood_prime_value - expected blood prime value. @return: N/A """ - utils.waitForGUI(0.5) + # utils.waitForGUI(0.5) expected_blood_prime_value = str(expected_blood_prime_value) +" "+config.LIQUID_UNIT test.compare(expected_blood_prime_value, waitForObject(names.o_target_value).text) @@ -52,7 +52,7 @@ for current_range in range(0, config.BLOOD_PRIMING_RANGE): hd_simulator.cmd_send_treatment_blood_prime_data(target = target_range,current = current_range) test_blood_prime_value(expected_blood_prime_value = current_range) - utils.waitForGUI(0.3) #For fetching the effect in UI + utils.waitForGUI(0.1) #For fetching the effect in UI test.endSection() @@ -66,7 +66,8 @@ test.startSection("verification of treatment parameters") 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) + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState=0) test.log("Test for verifying components of Flows in Main Treatment ") test.compare(str(waitForObject(names.o_Flows).text), config.FLOWS_TEXT)