Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r63cac10e2deafc48f480d71773a4d67539c57738 -r6888c20cc22610e31e139e7b94e2f53d12df57c0 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 63cac10e2deafc48f480d71773a4d67539c57738) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 6888c20cc22610e31e139e7b94e2f53d12df57c0) @@ -19,45 +19,6 @@ from configuration import config from builtins import int as pyInt - -def start_application(app_name): - """ - Function to start application and verify application status [running] - If application does not start or running status is false, test stops - Argument: - @param app_name : (str) - Name of the application - @param app_executable : (str) - Actual application - @return: handle for the application if the application is in running state, - or error (exist the application) - """ - counter = 0 - while True: - try: - counter += 1 - test.log("Starting {}".format(app_name)) - squish.startApplication(app_name) - if counter == 1: - test.log("Application launched at the "+str(counter)+" st try.") - elif counter == 2: - test.log("Application launched at the "+str(counter)+" nd try.") - elif counter == 3: - test.log("Application launched at the "+str(counter)+" rd try.") - else: - test.log("Application launched at the "+str(counter)+" th try.") - break - except RuntimeError: - if counter == 1: - test.log("Application failed to launch after "+str(counter)+" try - Please refer logs") - elif counter == 20: - test.log("Exiting after "+str(counter)+ " tries..") - sys.exit(1) - else: - test.log("Application failed to launch after "+str(counter)+ " tries - Please refer logs") - except: - logErrorDetails("Failed to start the application") - sys.exit(1) - - def check_if_object_is_within_the_container(obj=None, container=None): """ check if an object is inside a container @@ -103,10 +64,8 @@ ScreenObj = squish.waitForObject(screen_object) screenHeight = pyInt(ScreenObj.height) screenWidth = pyInt(ScreenObj.width) - squish.mouseWheel(ScreenObj, screenWidth-1000, - screenHeight-10, 0, -50, squish.Qt.NoModifier) + squish.mouseWheel(ScreenObj, screenWidth-1000, screenHeight-10, 0, -50, squish.Qt.NoModifier) - raise LookupError("zone object is not in view to the user after " + \ - "trying 100 times") + raise LookupError("zone object is not in view to the user after trying 100 times") Index: shared/scripts/names.py =================================================================== diff -u -r63cac10e2deafc48f480d71773a4d67539c57738 -r6888c20cc22610e31e139e7b94e2f53d12df57c0 --- shared/scripts/names.py (.../names.py) (revision 63cac10e2deafc48f480d71773a4d67539c57738) +++ shared/scripts/names.py (.../names.py) (revision 6888c20cc22610e31e139e7b94e2f53d12df57c0) @@ -74,3 +74,7 @@ o_ultrafilteration_back_btn = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} o_ultrafilteration_texts ={"container": o_Overlay, "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} + + + Index: tst_main_treatment_ultrafilteration/test.py =================================================================== diff -u -rba54dceda4464dc82068893d7df344d8ecfbb189 -r6888c20cc22610e31e139e7b94e2f53d12df57c0 --- tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision ba54dceda4464dc82068893d7df344d8ecfbb189) +++ tst_main_treatment_ultrafilteration/test.py (.../test.py) (revision 6888c20cc22610e31e139e7b94e2f53d12df57c0) @@ -47,6 +47,10 @@ 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 + count = 0 + while count != 0: + mouseClick(waitForObjectExists(names.o_ultrafilteration_next_btn)) + count += 1 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) @@ -104,6 +108,7 @@ #FIXME: Slider shows some unexpected behaviour during its movement. for option in range(len(config.TREATMENT_ULTRAFILTRATION_TESTING_OPTION)): start_test_treatment_ultrafiltration(config.TREATMENT_ULTRAFILTRATION_TESTING_OPTION[option], uf_states) + test.endSection() @@ -116,7 +121,6 @@ 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") @@ -134,10 +138,9 @@ test.endSection() -def verify_edit_volume(): +def verify_edit_volume_and_duration(): """ Test to verify ultrafiltration paused state. - @param uf_state: (int) ultrafiltration state to be set - pause set. @return: N/A """ test.startSection("verification of ultrafiltration paused state") @@ -149,8 +152,6 @@ test.compare(waitForObjectExists(names.o_treatmentHome_Ultrafiltration_Paused_Text).text, config.ULTRAFILTRATION_PAUSED_TEXT, "paused text verified") mouseClick(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration) - test.log("Clicking on 'Resume Ultrafilteration' button") - mouseClick(waitForObjectExists(names.o_ultrafilteration_resume_btn)) hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(accepted=config.ACCEPTED, reason=0, volume=200, duration=300, duration_diff=10, rate=10, rate_diff=1, rate_old=1) @@ -164,9 +165,6 @@ rate=1, rate_diff=1, rate_old=1, option="Rate") test.compare(waitForObjectExists(names.o_treatmentHome_Ultrafiltration_Paused_Text).text, config.ULTRAFILTRATION_PAUSED_TEXT, "paused text should be "+str(config.ULTRAFILTRATION_PAUSED_TEXT)) - test.log("Clicking on 'Resume Ultrafilteration' button") - mouseClick(waitForObjectExists(names.o_ultrafilteration_resume_btn)) - mouseClick(names.o_editButton_TouchRect) test.endSection() @@ -276,21 +274,25 @@ reset_treatment_ultrafiltration() verify_ultrafiltration_paused_state(uf_states.UF_PAUSED_STATE) - verify_edit_volume() test_treatment_ultrafiltration(uf_states.UF_PAUSED_STATE) test.startSection("verification of ultrafiltration flow parameters based on uf values") for options in range(len(config.TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS)): treatment_ultrafiltration_based_on_flow_parameter(config.TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS[options]) test.endSection() + 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) + test_treatment_ultrafiltration(uf_states.UF_PAUSED_STATE) + verify_ultrafiltration_start_state(uf_states.UF_START_STATE) test_treatment_ultrafiltration(uf_states.UF_START_STATE) verify_ultrafiltration_running_state(uf_states.UF_RUNNING_STATE) test_treatment_ultrafiltration(uf_states.UF_RUNNING_STATE) - - utils.tstDone()