Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rb76168fc569d728ca477cda73be916f58a6295ae -re9d97fc0bfd110d3f15396cb78108b2b3d590f5a --- shared/scripts/configuration/utility.py (.../utility.py) (revision b76168fc569d728ca477cda73be916f58a6295ae) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision e9d97fc0bfd110d3f15396cb78108b2b3d590f5a) @@ -86,8 +86,7 @@ ScreenObj = squish.waitForObject(screen_object) screenHeight = pyInt(ScreenObj.height) screenWidth = pyInt(ScreenObj.width) - squish.mouseWheel(ScreenObj, screenWidth//2, - screenHeight//2, 0, -50, squish.Qt.NoModifier) + squish.mouseWheel(ScreenObj, screenWidth//2, screenHeight//2, 0, -50, squish.Qt.NoModifier) raise LookupError("value object is not in view to the user after trying 100 times") @@ -165,11 +164,9 @@ screenHeight = pyInt(ScreenObj.height) screenWidth = pyInt(ScreenObj.width) if direction is None: - squish.mouseWheel(ScreenObj, (screenWidth-100), - 107, 0, -(screenHeight-460), squish.Qt.NoModifier) + squish.mouseWheel(ScreenObj, (screenWidth-100), 107, 0, -(screenHeight-460), squish.Qt.NoModifier) else: - squish.mouseWheel(ScreenObj, (screenWidth-100), - -(screenHeight-700), 0, 200, squish.Qt.NoModifier) + squish.mouseWheel(ScreenObj, (screenWidth-100), -(screenHeight-700), 0, 200, squish.Qt.NoModifier) raise LookupError("zone object is not in view to the user after trying 100 times") @@ -248,11 +245,9 @@ screenHeight = pyInt(ScreenObj.height) screenWidth = pyInt(ScreenObj.width) if direction is None: - squish.mouseWheel(ScreenObj, (screenWidth-100), - 107, 0, -(screenHeight-460), squish.Qt.NoModifier) + squish.mouseWheel(ScreenObj, (screenWidth-100), 107, 0, -(screenHeight-460), squish.Qt.NoModifier) else: - squish.mouseWheel(ScreenObj, (screenWidth-100), - -(screenHeight-700), 0, 200, squish.Qt.NoModifier) + squish.mouseWheel(ScreenObj, (screenWidth-100), -(screenHeight-700), 0, 200, squish.Qt.NoModifier) raise LookupError("zone object is not in view to the user after trying 100 times") @@ -343,8 +338,7 @@ arterial_min -= 10 # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg if arterial_min == arterial_max - config.BUFFER_LOW_AND_HIGH_LIMITS: - squish.mouseDrag(low_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + squish.mouseDrag(low_handler, width, height, -1, 0, squish.Qt.NoModifier, squish.Qt.LeftButton) test.log("Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) break else: @@ -532,11 +526,8 @@ ScreenObj = squish.waitForObject(container) screenHeight = pyInt(ScreenObj.height) screenWidth = pyInt(ScreenObj.width) - squish.mouseWheel(ScreenObj, screenWidth//2, - screenHeight//2, 0, -50, squish.Qt.NoModifier) - - raise LookupError("value object is not in view to the user after " + \ - "trying 100 times") + squish.mouseWheel(ScreenObj, screenWidth//2, screenHeight//2, 0, -50, squish.Qt.NoModifier) + raise LookupError("value object is not in view to the user after trying 100 times") def expected_heparin_value(val): Index: tst_ui_alarms_list/test.py =================================================================== diff -u -rca5133526b45d32cd4638ff5a67a39f7d11b1b1d -re9d97fc0bfd110d3f15396cb78108b2b3d590f5a --- tst_ui_alarms_list/test.py (.../test.py) (revision ca5133526b45d32cd4638ff5a67a39f7d11b1b1d) +++ tst_ui_alarms_list/test.py (.../test.py) (revision e9d97fc0bfd110d3f15396cb78108b2b3d590f5a) @@ -17,6 +17,7 @@ from configuration.utility import * from dialin.ui import utils from builtins import int as pyInt +from dialin.common.alarm_priorities import AlarmPriorities from dialin.ui.hd_simulator import HDSimulator from dialin.protocols.CAN import DenaliCanMessenger from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator @@ -104,9 +105,7 @@ test.startSection("Settings Alarms") for index, alarm_id in enumerate(alarm_id_list): test.log("Setting alarm priority '{}' for Alarm ID '{}' and its respective message '{}'".format(ALARM_PRIORITIES[state_list[index]], alarm_id, ALARM_ID_AND_MESSAGES[alarm_id])) - alarm.cmd_activate_alarm_id(state=state_list[index], - alarm=alarm_id, - flags=flags) + alarm.cmd_activate_alarm_id(state=state_list[index], alarm=alarm_id, flags=flags) test.endSection() @@ -224,8 +223,7 @@ utils.waitForGUI(1) maximize_alarm_list() utils.waitForGUI(1) - verify_alarm_list(arranged_alarm_list=arranged_alarm_list, - accept=accept,reason_id=reason_id ) + verify_alarm_list(arranged_alarm_list=arranged_alarm_list, accept=accept,reason_id=reason_id ) test.endSection() @@ -242,13 +240,8 @@ for index, alarm_id in enumerate(ALARM_IDS): test.log("Setting alarm ID {}".format(alarm_id)) - alarm.cmd_activate_alarm_id(state=2, - alarm=alarm_id, - flags=set_only_alarm_list_btn(no_minimize=1)) - alarm.cmd_send_active_list_response(accept=ACCEPTED, - reason=0, - a0=ALARM_IDS[0], a1=ALARM_IDS[1], - a2=ALARM_IDS[2]) + alarm.cmd_activate_alarm_id(state=2, alarm=alarm_id, flags=set_only_alarm_list_btn(no_minimize=1)) + alarm.cmd_send_active_list_response(accept=ACCEPTED, reason=0, a0=ALARM_IDS[0], a1=ALARM_IDS[1], a2=ALARM_IDS[2]) utils.waitForGUI(1) open_alarm_list_when_only_alarm_list_btn_is_available() utils.waitForGUI(1) @@ -314,25 +307,21 @@ utils.tstStart(__file__) startApplication(AUT_NAME) - verify_alarm_list_when_minimize_button_is_available(accept=ACCEPTED, - reason_id=0) + verify_alarm_list_when_minimize_button_is_available(accept=ACCEPTED, reason_id=0) utils.waitForGUI(1) - verify_alarm_list_when_minimize_button_is_available(accept=REJECTED, - reason_id=20) + verify_alarm_list_when_minimize_button_is_available(accept=REJECTED, reason_id=20) utils.waitForGUI(1) - verify_alarm_list_when_only_alarm_list_button_is_available(accept=ACCEPTED, - reason_id=0) + verify_alarm_list_when_only_alarm_list_button_is_available(accept=ACCEPTED, reason_id=0) utils.waitForGUI(1) - verify_alarm_list_when_only_alarm_list_button_is_available(accept=REJECTED, - reason_id=7) + verify_alarm_list_when_only_alarm_list_button_is_available(accept=REJECTED, reason_id=7) utils.waitForGUI(1) verify_alarm_msg_for_undefined_alarm_id() utils.waitForGUI(1) - verify_alarm_dialogue_is_displayed(id=1000, state=2) + verify_alarm_dialogue_is_displayed(id=1000, state=AlarmPriorities.ALARM_PRIORITY_MEDIUM.value) utils.tstDone() \ No newline at end of file