Index: shared/scripts/names.py =================================================================== diff -u -rf334a1c3a2a5ef0d38fc9f2a22622d29d08edc78 -r80a01ddbab62d3b2609810f794e6ef8c77211572 --- shared/scripts/names.py (.../names.py) (revision f334a1c3a2a5ef0d38fc9f2a22622d29d08edc78) +++ shared/scripts/names.py (.../names.py) (revision 80a01ddbab62d3b2609810f794e6ef8c77211572) @@ -200,6 +200,14 @@ o_ultrafiltration_texts ={"container": o_Overlay, "text": "", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_confirm_btn = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_next_btn = {"container": o_Overlay, "text": "NEXT", "type": "Text", "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} +o_ultrafilteration_back_btn = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_texts ={"container": o_Overlay, "text": "", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_confirm_btn = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_next_btn = {"container": o_Overlay, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} +treatmentAdjustmentUltrafiltrationEdit_ContentItem = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit", "type": "ContentItem", "visible": True} +o_progressRect_ProgressRect = {"container": o_Overlay, "gradient": 0, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1, "visible": True} #flows Index: tst_main_treatment_ultrafiltration/test.py =================================================================== diff -u -rd2d5a0c8f7bda77403cc3bbef75edc821515dcd2 -r80a01ddbab62d3b2609810f794e6ef8c77211572 --- tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision d2d5a0c8f7bda77403cc3bbef75edc821515dcd2) +++ tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 80a01ddbab62d3b2609810f794e6ef8c77211572) @@ -42,6 +42,8 @@ MIN_TREATMENT_DURATION = 0 MAX_DIALYSATE_FLOW_RATE = 0 MAX_TREATMENT_DURATION = 100 +SLIDER_RANGE = (0.1, 0.2, 0.3, 0.4, 0.5, 0.6) +SLIDER_PARAMETERS = (0, 0.1, 147) ROT_SPEED = 0 MOT_SPEED = 0 MC_SPEED = 0 @@ -113,7 +115,24 @@ ultrafiltration_flow_parameter[MC_CURRENT_INDEX], ultrafiltration_flow_parameter[PWM_INDEX]) test.log("test to verify ultrafiltration flow parameters.") + +def test_ultrafilteration_volume_slider(slider_object, value, slider_parameter): + """ + Method to set slider handle based on custom values + @param slider_object : (dictionary) object of treatment parameters + @param vale : (int)value to be set on slider + @param slider_parameter : (list) consist combination of slider minimum value, slider buffer and width buffer + """ + minimum_slider_value = slider_parameter[0] + slider_buffer = slider_parameter[1] + width_buffer = slider_parameter[2] + slider_width = ((value - minimum_slider_value)/slider_buffer) * width_buffer + utils.waitForGUI(1) + mouseClick(waitForObjectExists(slider_object), float(slider_width) , 3, Qt.LeftButton) + test.compare(waitForObjectExists(slider_object).value, value, "slider value should set to %s" %value) + + def test_treatment_ultrafiltration(uf_states): """ Test to verify slider movement based on edge condition. @@ -173,9 +192,9 @@ RANDOM_DURATION, RANDOM_DURATION_DIFFERENCE, RANDOM_RATE, RANDOM_RATE_DIFFERENCE, RANDOM_RATE_OLD) verify_edit_response_messages(RANDOM_VOLUME, RANDOM_DURATION, RANDOM_DURATION_DIFFERENCE, - RANDOM_RATE, RANDOM_RATE_DIFFERENCE, RANDOM_RATE_OLD, option="Time Duration") + RANDOM_RATE, RANDOM_RATE_DIFFERENCE, RANDOM_RATE_OLD, option="Rate") - hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(config.ACCEPTED, 0, RANDOM_VOLUME, + hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(config.ACCEPTED, 1, RANDOM_VOLUME, RANDOM_DURATION, RANDOM_DURATION_DIFFERENCE, RANDOM_RATE, RANDOM_RATE_DIFFERENCE, RANDOM_RATE_OLD) verify_edit_response_messages(RANDOM_VOLUME, RANDOM_DURATION, RANDOM_DURATION_DIFFERENCE, @@ -268,6 +287,8 @@ uf_rate_title_and_val = "UF Rate : {} mL/min".format(rate) uf_rate_title_and_val_text = waitForObjectExists(expected_uf_texts(uf_rate_title_and_val)) test.compare(uf_rate_title_and_val_text.text, uf_rate_title_and_val, "UF Rate title and value should be {}".format(uf_rate_title_and_val)) + test.log(str(rate)) + test.log(str(duration)) if option == "Rate": test.log("Selecting Increase UF Rate") mouseClick(increase_uf_rate_text) @@ -295,6 +316,11 @@ reset_treatment_ultrafiltration() verify_ultrafiltration_paused_state(uf_states.UF_PAUSED_STATE) + + hd_simulator.cmd_set_treatment_parameter_ranges(MIN_TREATMENT_DURATION, MAX_TREATMENT_DURATION, 0, 600, MIN_DIALYSATE_FLOW_RATE, MAX_DIALYSATE_FLOW_RATE) + for value in SLIDER_RANGE: + test_ultrafilteration_volume_slider(names.o_volumeSlider_slider, value, SLIDER_PARAMETERS) + test_treatment_ultrafiltration(uf_states.UF_PAUSED_STATE) test.startSection("verification of ultrafiltration flow parameters based on uf values")