Index: shared/scripts/configuration/config.py =================================================================== diff -u -r63cac10e2deafc48f480d71773a4d67539c57738 -r0ff2495314b777995d520fa8a73ae49ed617418f --- shared/scripts/configuration/config.py (.../config.py) (revision 63cac10e2deafc48f480d71773a4d67539c57738) +++ shared/scripts/configuration/config.py (.../config.py) (revision 0ff2495314b777995d520fa8a73ae49ed617418f) @@ -54,14 +54,10 @@ TREATMENT_ULTRAFILTRATION_TESTING_OPTION = { 0 : {"uf_maximum" : 600, "uf_minimum" : 0}, 1 : {"uf_maximum" : 500, "uf_minimum" : 0}, - 2 : {"uf_maximum" : 550, "uf_minimum" : 0}, - 3 : {"uf_maximum" : 300, "uf_minimum" : 0}, - 4 : {"uf_maximum" : 280, "uf_minimum" : 0}, - 5 : {"uf_maximum" : 765, "uf_minimum" : 500}, - 6 : {"uf_maximum" : 680, "uf_minimum" : 450}, - 7 : {"uf_maximum" : 480, "uf_minimum" : 380}, - 8 : {"uf_maximum" : 390, "uf_minimum" : 675}, - 9 : {"uf_maximum" : 290, "uf_minimum" : 125}, + 2 : {"uf_maximum" : 280, "uf_minimum" : 0}, + 3 : {"uf_maximum" : 765, "uf_minimum" : 500}, + 4 : {"uf_maximum" : 680, "uf_minimum" : 450}, + 5 : {"uf_maximum" : 480, "uf_minimum" : 380}, } Index: tst_main_treatment_ultrafilteration/test.py =================================================================== diff -u -rf13de43f74b969498ae3983112a139634d71d68f -r0ff2495314b777995d520fa8a73ae49ed617418f --- tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision f13de43f74b969498ae3983112a139634d71d68f) +++ tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision 0ff2495314b777995d520fa8a73ae49ed617418f) @@ -44,14 +44,16 @@ @param uf_state: (int) ultrafiltration state to be set. @return: N/A """ - utils.waitForGUI(1) min_uf = ultrafiltration_range["uf_minimum"] max_uf = ultrafiltration_range["uf_maximum"] - #FIXME : ultrafiltration minimum range from progressbar is not changing based on simulator input + #FIXME : ultrafiltration minimum range from progress bar is not changing based on simulator input hd_simulator.cmd_set_treatment_parameter_ranges(0, 100, min_uf, max_uf, 0, 0) + for uf_value in range(min_uf, (max_uf)+1, 1): hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(uf_value, uf_value, 0, 0, 0, 0, 0) + utils.waitForGUI(0.1) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), uf_value, "uf set value should be :" + str(uf_value)) + hd_simulator.cmd_send_uf_treatment_response(accepted = True, reason = 0, volume = 500) if uf_state == uf_states.UF_RUNNING_STATE: mouseClick(waitForObjectExists(names.o_ultrafilteration_pause_btn)) if uf_state == uf_states.UF_PAUSED_STATE or uf_state == uf_states.UF_START_STATE: @@ -107,7 +109,6 @@ if object.exists(names.o_ultrafilteration_next_btn): mouseClick(waitForObjectExists(names.o_ultrafilteration_next_btn)) start_test_treatment_ultrafiltration(config.TREATMENT_ULTRAFILTRATION_TESTING_OPTION[option], uf_states) - test.endSection() @@ -282,9 +283,10 @@ mouseClick(waitForObjectExists(names.o_ultrafilteration_back_btn)) verify_edit_volume_and_duration() + test.log("Clicking on 'Resume Ultrafilteration' button") mouseClick(waitForObjectExists(names.o_ultrafilteration_resume_btn)) - mouseClick(names.o_editButton_TouchRect) + mouseClick(waitForObjectExists(names.o_editButton_TouchRect)) test_treatment_ultrafiltration(uf_states.UF_PAUSED_STATE) verify_ultrafiltration_start_state(uf_states.UF_START_STATE)