Index: suite.conf =================================================================== diff -u -r01f6e29f2803292662c6b29d867a2fc6c0b1f752 -r653fa5203e3d66003e056f2c3447278bb4a0358c --- suite.conf (.../suite.conf) (revision 01f6e29f2803292662c6b29d867a2fc6c0b1f752) +++ suite.conf (.../suite.conf) (revision 653fa5203e3d66003e056f2c3447278bb4a0358c) @@ -1,6 +1,6 @@ AUT=denaliSquish LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_environment tst_post tst_standbymode tst_case1 tst_main_treatment_ultrafilteration tst_main_treatment_uf_adjustments +TEST_CASES=tst_environment tst_post tst_standbymode tst_case1 tst_main_treatment_uf_adjustments tst_main_treatment_ultrafilteration VERSION=3 WRAPPERS=Qt Index: tst_main_treatment_ultrafilteration/test.py =================================================================== diff -u -r01f6e29f2803292662c6b29d867a2fc6c0b1f752 -r653fa5203e3d66003e056f2c3447278bb4a0358c --- tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision 01f6e29f2803292662c6b29d867a2fc6c0b1f752) +++ tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision 653fa5203e3d66003e056f2c3447278bb4a0358c) @@ -31,7 +31,7 @@ } TREATMENT_ULTRAFILTERATION_TESTING_OPTION = { - "OPTION_1" : {"uf_maximum" : 600, "uf_minimum" : 120}, + "OPTION_1" : {"uf_maximum" : 600, "uf_minimum" : 0}, "OPTION_2" : {"uf_maximum" : 500, "uf_minimum" : 0}, "OPTION_3" : {"uf_maximum" : 550, "uf_minimum" : 0}, "OPTION_4" : {"uf_maximum" : 300, "uf_minimum" : 0}, @@ -66,14 +66,14 @@ """ min_uf = ultrafilteration_range["uf_minimum"] max_uf = ultrafilteration_range["uf_maximum"] + #FIXME : ultrafilteration minimum range from progressbar 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): + 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) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), uf_value, "uf set value should be :" + str(uf_value)) if uf_state == uf_states.UF_PAUSED_STATE or uf_state == uf_states.UF_START_STATE: test.compare(utils.l2ml(waitForObjectExists(names.o_volumeSlider_slider).maximum), max_uf, "maximum uf value should be :" + str(max_uf)) - #FIXME : ultrafilteration minimum range from progressbar should change based on simulator input test.compare(utils.l2ml(waitForObjectExists(names.o_volumeSlider_slider).minimum), min_uf, "minimum uf value should be :" + str(min_uf))