Index: shared/scripts/names.py =================================================================== diff -u -r320648592ac052c00dddb152f5567bf21709c6ff -rdd4aa7ac57cbf17bcf07f84af1c9efcae7afd718 --- shared/scripts/names.py (.../names.py) (revision 320648592ac052c00dddb152f5567bf21709c6ff) +++ shared/scripts/names.py (.../names.py) (revision dd4aa7ac57cbf17bcf07f84af1c9efcae7afd718) @@ -69,4 +69,5 @@ o_headerRect_Rectangle = {"container": o_Overlay, "id": "_headerRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_resumeButton_TouchRect = {"container": o_Overlay, "id": "_resumeButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_editButton_TouchRect = {"container": o_Overlay, "id": "_editButton", "type": "TouchRect", "unnamed": 1, "visible": True} - +o_ultrafilteration_pause_btn = {"container": o_Overlay, "text": "PAUSE ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_resume_btn = {"container": o_Overlay, "text": "RESUME ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} \ No newline at end of file Index: tst_main_treatment_ultrafilteration/test.py =================================================================== diff -u -raccfc58de6811004a4464410a93c5a225bd0bc0c -rdd4aa7ac57cbf17bcf07f84af1c9efcae7afd718 --- tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision accfc58de6811004a4464410a93c5a225bd0bc0c) +++ tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision dd4aa7ac57cbf17bcf07f84af1c9efcae7afd718) @@ -49,7 +49,8 @@ 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_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: test.compare(utils.l2ml(waitForObjectExists(names.o_volumeSlider_slider).maximum), max_uf, "maximum uf value should be :" + str(max_uf)) test.compare(utils.l2ml(waitForObjectExists(names.o_volumeSlider_slider).minimum), min_uf, "minimum uf value should be :" + str(min_uf)) @@ -113,6 +114,7 @@ test.startSection("verification of ultrafiltration paused state") hd_simulator.cmd_set_treatment_adjust_ultrafiltration_accepted(uf_states) + mouseClick(waitForObject(names.o_ultrafiltration_closeButton)) utils.waitForGUI(0.2) test.compare(waitForObjectExists(names.o_treatmentHome_Ultrafiltration_Paused_Text).text, config.ULTRAFILTRATION_PAUSED_TEXT, "paused text verified") @@ -123,6 +125,9 @@ test.compare(waitForObjectExists(names.o_editButton_TouchRect).text.text, config.EDIT_TEXT, "edit text should be "+str(config.EDIT_TEXT)) test.compare(waitForObjectExists(names.o_ultrafiltration_volume_text).text, config.TITLE_TEXT, "title text should be "+str(config.TITLE_TEXT)) + test.log("Clicking on 'Resume Ultrafilteration' button") + mouseClick(waitForObjectExists(names.o_ultrafilteration_resume_btn)) + mouseClick(names.o_editButton_TouchRect) test.compare(waitForObjectExists(names.o_treatmentHome_Ultrafiltration_Paused_Text).text, config.ULTRAFILTRATION_PAUSED_TEXT, "paused text should be "+str(config.ULTRAFILTRATION_PAUSED_TEXT))