Index: tst_main_treatment_pressure/test.py =================================================================== diff -u -r9cb75f8b54e08f5f0ca42befd3c35ae5aea84c68 -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 --- tst_main_treatment_pressure/test.py (.../test.py) (revision 9cb75f8b54e08f5f0ca42befd3c35ae5aea84c68) +++ tst_main_treatment_pressure/test.py (.../test.py) (revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25) @@ -580,7 +580,7 @@ """ test.startSection("Set arterial pressure and verify value and color") open_pressure_pop_up() - for arterial_prs in range(ARTERIAL_PRESSURE_MINIMUM , ARTERIAL_PRESSURE_MAXIMUM + PRESSURE_STEPS, PRESSURE_STEPS * 10): + for arterial_prs in range(ARTERIAL_PRESSURE_MINIMUM , ARTERIAL_PRESSURE_MAXIMUM + PRESSURE_STEPS, PRESSURE_STEPS*10): test.log("Setting arterial pressure {}".format(arterial_prs)) hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=arterial_prs, venous_prs=0, blood_pump_occlusion=0, @@ -589,20 +589,21 @@ art_min_limit=0, ven_max_limit=0, ven_min_limit=0) - + #arterial_current_value = waitForObjectExists(names.o_arterial_marker).value arterial_limit_min = waitForObjectExists(names.o_arterial_limitbar).minimum arterial_limit_max = waitForObjectExists(names.o_arterial_limitbar).maximum arterial_slider_value = waitForObjectExists(names.o_arterial_range_slider).value test.compare(arterial_slider_value, arterial_prs, "Actual arterial pressure: {} should be equal to expected arterial pressure: {}".format(arterial_slider_value, arterial_prs)) - # arterial_progress_value = waitForObjectExists(names.o_arterial_progress_text_value) - # test.compare(arterial_progress_value.text.toInt(), arterial_prs, - # "Actual arterial pressure: {} should be equal to expected arterial pressure: {}".format(arterial_progress_value.text.toInt(), arterial_prs)) - # if arterial_limit_min <= arterial_slider_value <= arterial_limit_max: - # test.compare(arterial_progress_value.color.name, in_range_color, - # "Arterial progress value {} is in range".format(arterial_slider_value)) - # else: - # test.compare(arterial_progress_value.color.name, out_of_range_color, - # "Arterial progress value {} is out of range".format(arterial_slider_value)) + names.o_arterial_progress_text_value["text"] = arterial_prs + arterial_progress_value = waitForObjectExists(names.o_arterial_progress_text_value) + test.compare(arterial_progress_value.text.toInt(), arterial_prs, + "Actual arterial pressure: {} should be equal to expected arterial pressure: {}".format(arterial_progress_value.text.toInt(), arterial_prs)) + if arterial_limit_min <= arterial_slider_value <= arterial_limit_max: + test.compare(arterial_progress_value.color.name, in_range_color, + "Arterial progress value {} is in range".format(arterial_slider_value)) + else: + test.compare(arterial_progress_value.color.name, out_of_range_color, + "Arterial progress value {} is out of range".format(arterial_slider_value)) close_the_pop_up() test.endSection() @@ -623,20 +624,23 @@ art_min_limit=0, ven_max_limit=0, ven_min_limit=0) - # venous_current_value = waitForObjectExists(names.o_venous_marker).value venous_limit_min = waitForObjectExists(names.o_venous_limitbar).minimum venous_limit_max = waitForObjectExists(names.o_venous_limitbar).maximum venous_slider_value = waitForObjectExists(names.o_venous_range_slider).value test.compare(venous_slider_value, venous_prs, "Actual venous pressure: {} should be equal to expected venous pressure: {}".format(venous_slider_value, venous_prs)) - # venous_progress_value = waitForObjectExists(names.o_venous_progress_text_value) - # test.compare(venous_progress_value.text.toInt(), venous_prs, - # "Actual venous pressure: {} should be equal to expected venous pressure: {}".format(venous_progress_value.text.toInt(), venous_prs)) - # if venous_limit_min <= venous_current_value <= venous_limit_max: - # test.compare(venous_progress_value.color.name, in_range_color, - # "Venous progress value {} is in range".format(venous_current_value)) - # else: - # test.compare(venous_progress_value.color.name, out_of_range_color, - # "Venous progress value {} is out of range".format(venous_current_value)) + names.o_venous_progress_text_value["text"] = venous_prs + venous_progress_value = waitForObjectExists(names.o_venous_progress_text_value) + test.compare(venous_progress_value.text.toInt(), venous_prs, + "Actual venous pressure: {} should be equal to expected venous pressure: {}".format(venous_progress_value.text.toInt(), venous_prs)) + + names.o_venous_marker["text"] = venous_prs + venous_current_value = waitForObjectExists(names.o_venous_marker).text + if venous_limit_min <= venous_current_value.toInt() <= venous_limit_max: + test.compare(venous_progress_value.color.name, in_range_color, + "Venous progress value {} is in range {} {}".format(venous_current_value, venous_limit_min, venous_limit_max)) + else: + test.compare(venous_progress_value.color.name, out_of_range_color, + "Venous progress value {} is out of range {} {}".format(venous_current_value, venous_limit_min, venous_limit_max)) close_the_pop_up() test.endSection()