Index: shared/scripts/names.py =================================================================== diff -u -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 -r932d63fb26cda19a65375d592e454836f8b2522e --- shared/scripts/names.py (.../names.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) +++ shared/scripts/names.py (.../names.py) (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -117,6 +117,7 @@ o_poweroff_notification = {"container": o_Overlay , "id": "_titleText" , "type": "TitleText" , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"} o_poweroff_rejection = {"container": o_Overlay , "id": "_titleText" , "type": "TitleText" , "unnamed": 1, "visible": True, "type": "Text"} o_settings_end_treatment = {"container": o_QQuickView , "objectName": "_endTreatmentButton", "type": "TouchRect"} +o_settings_clear_alarm_condition = {"container": o_QQuickView , "objectName": "_clearAlarmCondition", "type": "TouchRect"} # Main Treatment Screen o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True} @@ -161,7 +162,12 @@ o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True} o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_okay_alarm = {"container": o_Overlay, "objectName": "_alarmOK", "type": "TouchRect"} +o_alarm_resume = {"container": o_Overlay, "objectName": "_alarmResume", "type": "TouchRect"} +o_alarm_rinseback = {"container": o_Overlay, "objectName": "_alarmRinseback", "type": "TouchRect"} +o_alarm_end = {"container": o_Overlay, "objectName": "_alarmEnd", "type": "TouchRect"} o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"} +o_alarm_mute_button = {"container": o_Overlay, "objectName": "_alarmMuteButton", "type": "MuteButton"} +o_alarm_silence_expires = {"container": o_Overlay, "objectName": "_TimeText", "type": "TimeText"} o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True} o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True} o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True} Index: suite.conf =================================================================== diff -u -r0a4b4e4653203852eae6d9edb24116f2147a7c3e -r932d63fb26cda19a65375d592e454836f8b2522e --- suite.conf (.../suite.conf) (revision 0a4b4e4653203852eae6d9edb24116f2147a7c3e) +++ suite.conf (.../suite.conf) (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -1,10 +1,10 @@ -AUT=denali +AUT=denaliSquish CWD= ENVVARS=envvars HOOK_SUB_PROCESSES=false IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_Internals tst_HomeScreen tst_ServiceShutdown tst_TreatmentScreen tst_Treatment_Section_BloodDialysate tst_Treatment_BloodDialysateFlowRate tst_Treatment_Time tst_Treatment_Ultrafiltration tst_Treatment_PressureOcclusion tst_Treatment_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Treatment_Adjustment_Duration tst_Treatment_Adjustment_Ultrafiltration tst_Treatment_Adjustment_Pressures tst_Treatment_Adjustment_Saline tst_Treatment_Adjustment_Heparin tst_TreatmentSalineData tst_TreatmentStatesData tst_TreatmentHeparineData tst_DGROPumpData tst_DGDrainPumpData tst_DGPressureData tst_DGReservoirData tst_DGHeatersData tst_DGLoadCellReadingsData tst_DGTemperaturesData tst_case2 tst_DGValvesStatesData tst_DGOperationMode tst_HDOperationModeData tst_HDBloodFlowData tst_HDInletFlowData tst_HDOutletFlowData tst_HDPressureOcclusionData tst_CANBusFaultCount tst_DebugText tst_CreateTreatment tst_ConfirmPrimingBegin tst_Alarm_Colors tst_AlarmStatusData tst_AlarmTriggered tst_AlarmCleared +TEST_CASES=tst_Internals tst_HomeScreen tst_ServiceShutdown tst_TreatmentScreen tst_Treatment_Section_BloodDialysate tst_Treatment_BloodDialysateFlowRate tst_Treatment_Time tst_Treatment_Ultrafiltration tst_Treatment_PressureOcclusion tst_Treatment_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Treatment_Adjustment_Duration tst_Treatment_Adjustment_Ultrafiltration tst_Treatment_Adjustment_Pressures tst_Treatment_Adjustment_Saline tst_Treatment_Adjustment_Heparin tst_TreatmentSalineData tst_TreatmentStatesData tst_TreatmentHeparineData tst_DGROPumpData tst_DGDrainPumpData tst_DGPressureData tst_DGReservoirData tst_DGHeatersData tst_DGLoadCellReadingsData tst_DGTemperaturesData tst_case2 tst_DGValvesStatesData tst_DGOperationMode tst_HDOperationModeData tst_HDBloodFlowData tst_HDInletFlowData tst_HDOutletFlowData tst_HDPressureOcclusionData tst_CANBusFaultCount tst_DebugText tst_CreateTreatment tst_ConfirmPrimingBegin tst_Alarm_Colors tst_AlarmStatusData tst_AlarmTriggered tst_AlarmCleared tst_AlarmFlags tst_AlarmSilence VERSION=3 WRAPPERS=Qt Index: tools/run_tests.sh =================================================================== diff -u -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 -r932d63fb26cda19a65375d592e454836f8b2522e --- tools/run_tests.sh (.../run_tests.sh) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) +++ tools/run_tests.sh (.../run_tests.sh) (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -15,7 +15,7 @@ # and can run tests with the specified tags # ############################################################################ -TAGS=ConfirmPrimingBegin +TAGS=AlarmSilence TIMEOUT=200 rm -rf /tmp/UnitTest Index: tst_AlarmCleared/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r932d63fb26cda19a65375d592e454836f8b2522e --- tst_AlarmCleared/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_AlarmCleared/test.py (.../test.py) (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -16,31 +16,45 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) -def test_values(vAlarmID): +def test_values(hd_simulator: HDSimulator, alarm_id): + """ + Once the component(s) have been implemented, this will test the alarm cleared functionality + + @param hd_simulator: (HDSimulator) the HD Simulator object + @param alarm_id: (int) the alarm id + @returns: None + """ + hd_simulator.alarms_simulator.cmd_alarm_condition_cleared(alarm_id) test.compare(True, True, "No component has been implemented yet") def main(): utils.tstStart(__file__) startApplication(names.AUT_NAME) + + hd_simulator = HDSimulator() utils.waitForGUI(1) for i in range(len(names.AlarmTextMap)): - HDSimulator.alarms_simulator.cmd_set_alarm_cleared(i) - test_values (i) + hd_simulator.alarms_simulator.cmd_set_alarm_cleared(i) + test_values(hd_simulator, i) - HDSimulator.alarms_simulator.cmd_set_alarm_cleared(1) - test_values (1) + hd_simulator.alarms_simulator.cmd_set_alarm_cleared(1) + test_values(hd_simulator, 1) # Coverage - HDSimulator.alarms_simulator.cmd_set_alarm_cleared(1) - test_values (1) + hd_simulator.alarms_simulator.cmd_set_alarm_cleared(1) + test_values(hd_simulator, 1) - HDSimulator.alarms_simulator.cmd_set_alarm_cleared(0) - test_values (0) - + hd_simulator.alarms_simulator.cmd_set_alarm_cleared(0) + test_values(hd_simulator, 0) + + mouseClick(waitForObject(names.o_mainMenu_settings)) + mouseClick(waitForObject(names.o_settings_clear_alarm_condition)) + utils.waitForGUI() + + utils.tstDone() Index: tst_AlarmFlags/config.xml =================================================================== diff -u --- tst_AlarmFlags/config.xml (revision 0) +++ tst_AlarmFlags/config.xml (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -0,0 +1,10 @@ + + + + + + +AlarmFlags + + + Index: tst_AlarmFlags/test.py =================================================================== diff -u --- tst_AlarmFlags/test.py (revision 0) +++ tst_AlarmFlags/test.py (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -0,0 +1,87 @@ +## +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# copyright +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, +# IN PART OR IN WHOLE, +# WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# file tst_Alarm +# date 2020/06/26 +# author Peter Lucia +# + +import names +from dialin.ui import utils +from dialin import HDSimulator +from dialin.ui.hd_simulator_alarms import Alarms +from dialin.utils.conversions import integer_to_bit_array + +def test_flags(hd_simulator: HDSimulator): + """ + Tests the alarm flags + @param hd_simulatr: The HDSimulator object + @returns: None + """ + params = { + "system_fault": 0, + "stop": 0, + "no_clear": 0, + "no_resume": 0, + "no_rinseback": 0, + "no_end_treatment": 0, + "no_new_treatment": 0, + "user_must_ack": 0, + "alarms_to_escalate": 0, + "alarms_silenced": 0, + "lamp_on": 0, + "unused_1": 0, + "unused_2": 0, + "unused_3": 0, + "unused_4": 0, + "top_condition": 0 + } + + num_bits = 4 + for number in range(2**num_bits): + bits = integer_to_bit_array(number, num_bits) + params["no_resume"] = bits[0] + params["no_rinseback"] = bits[1] + params["no_end_treatment"] = bits[2] + params["user_must_ack"] = bits[3] + test.log("Flags", "{0}".format(bits)) + flags = hd_simulator.alarms_simulator.cmd_make_alarm_flags(**params) + hd_simulator.alarms_simulator.cmd_activate_alarm_id(Alarms.ALARM_ID_SOFTWARE_FAULT[0], + Alarms.ALARM_ID_SOFTWARE_FAULT[1], + Alarms.ALARM_ID_SOFTWARE_FAULT[2], + Alarms.ALARM_ID_SOFTWARE_FAULT[3], + flags) + if params["user_must_ack"]: + test.compare(waitForObject(names.o_okay_alarm).visible, True) + mouseClick(names.o_okay_alarm) + if not params["no_resume"]: + test.compare(waitForObject(names.o_alarm_resume).visible, True) + mouseClick(names.o_alarm_resume) + if not params["no_rinseback"]: + test.compare(waitForObject(names.o_alarm_rinseback).visible, True) + mouseClick(names.o_alarm_rinseback) + if not params["no_end_treatment"]: + test.compare(waitForObject(names.o_alarm_end).visible, True) + mouseClick(names.o_alarm_end) + + hd_simulator.alarms_simulator.cmd_send_clear_alarms() + + +def main(): + """ + Main function to test the alarm flags. + + @return: None + """ + utils.tstStart(__file__) + + startApplication(names.AUT_NAME + " -q") + hd_simulator = HDSimulator() + test_flags(hd_simulator) + + utils.tstDone() + Index: tst_AlarmSilence/config.xml =================================================================== diff -u --- tst_AlarmSilence/config.xml (revision 0) +++ tst_AlarmSilence/config.xml (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -0,0 +1,10 @@ + + + + + + +AlarmSilence + + + Index: tst_AlarmSilence/test.py =================================================================== diff -u --- tst_AlarmSilence/test.py (revision 0) +++ tst_AlarmSilence/test.py (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -0,0 +1,93 @@ +## +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# copyright +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, +# IN PART OR IN WHOLE, +# WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# file tst_Alarm +# date 2020/06/26 +# author Peter Lucia +# + +import names +from dialin.ui import utils +from dialin import HDSimulator +from dialin.ui.hd_simulator_alarms import Alarms + +def seconds_to_alarm_timeout(seconds): + """ + Converts seconds to hours, minutes, and seconds + @param seconds: (int) seconds + @return tuple + """ + hours = seconds // 3600 + minutes = (seconds % 3600) // 60 + seconds = (seconds % 3600) % 60 + return hours, minutes, seconds + + +def test_alarm_silence(hd_simulator: HDSimulator): + """ + Tests the alarm silence functionality + + @param hd_simulator: The HD Simulator object + @returns: None + """ + flags = hd_simulator.alarms_simulator.cmd_make_alarm_flags( + no_clear=1, + no_resume=1, + no_rinseback=1, + no_end_treatment=1, + no_new_treatment=1, + user_must_ack=1) + alarm = Alarms.ALARM_ID_ARTERIAL_PRESSURE_HIGH + state = alarm[0] + alarm_id = alarm[1] + escalates_in = alarm[2] + silence_expires = 100 + hd_simulator.alarms_simulator.flags = flags + + hd_simulator.alarms_simulator.cmd_activate_alarm_id(state, + alarm_id, + escalates_in, + silence_expires, + hd_simulator.alarms_simulator.flags) + + test.compare(waitForObject(names.o_alarm_mute_button).visible, True) + + # silence, de-silence, silence + for _ in range(3): + mouseClick(names.o_alarm_mute_button) + utils.waitForGUI() + hd_simulator.alarms_simulator.cmd_activate_alarm_id(state, + alarm_id, + escalates_in, + silence_expires, + hd_simulator.alarms_simulator.flags) + + test.compare(waitForObject(names.o_TimeText_TimeText).visible, True) + + for silence_expires in range(100, -1, -1): + hd_simulator.alarms_simulator.cmd_activate_alarm_id(state, + alarm_id, + escalates_in, + silence_expires, + hd_simulator.alarms_simulator.flags) + _, minutes, seconds = seconds_to_alarm_timeout(silence_expires) + test.compare(waitForObject(names.o_TimeText_TimeText).time, "{0}:{1:02d}".format(minutes, seconds)) + +def main(): + """ + Main function to test the alarm flags. + + @return: None + """ + utils.tstStart(__file__) + + startApplication(names.AUT_NAME + " -q") + hd_simulator = HDSimulator() + test_alarm_silence(hd_simulator) + + utils.tstDone() + Index: tst_Alarm_Colors/test.py =================================================================== diff -u -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 -r932d63fb26cda19a65375d592e454836f8b2522e --- tst_Alarm_Colors/test.py (.../test.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) +++ tst_Alarm_Colors/test.py (.../test.py) (revision 932d63fb26cda19a65375d592e454836f8b2522e) @@ -18,87 +18,20 @@ import names from dialin.ui import utils from dialin import HDSimulator -HDSimulator = HDSimulator() +from dialin.ui.hd_simulator_alarms import (Alarms, + NONE, + LOW, + MED, + HIGH, + HIGH_PRIORITY_COLOR, + MED_LOW_PRIORITY_COLOR) +from typing import List - -HIGH = 3 -MED = 2 -LOW = 1 -NONE = 0 - -HIGH_PRIORITY_COLOR = "#c53b33" -MED_LOW_PRIORITY_COLOR = "#f5a623" - -class Alarms: - - # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags) - ALARM_ID_NO_ALARM = (NONE, 0, 0, 0, 0) - ALARM_ID_SOFTWARE_FAULT = (HIGH, 1, 0, 0, 0) - ALARM_ID_STUCK_BUTTON_TEST_FAILED = (HIGH, 2, 0, 0, 0) - ALARM_ID_FPGA_POST_TEST_FAILED = (HIGH, 3, 0, 0, 0) - ALARM_ID_WATCHDOG_POST_TEST_FAILED = (HIGH, 4, 0, 0, 0) - ALARM_ID_UI_COMM_POST_FAILED = (HIGH, 5, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = (MED, 6, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_OFF_CHECK = (MED, 7, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = (MED, 8, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = (HIGH, 9, 0, 0, 0) - ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK = (MED, 10, 0, 0, 0) - ALARM_ID_DIAL_IN_PUMP_OFF_CHECK = (MED, 11, 0, 0, 0) - ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = (MED, 12, 0, 0, 0) - ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = (HIGH, 13, 0, 0, 0) - ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK = (MED, 14, 0, 0, 0) - ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = (MED, 15, 0, 0, 0) - ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = (MED, 16, 0, 0, 0) - ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = (HIGH, 17, 0, 0, 0) - ALARM_ID_WATCHDOG_EXPIRED = (HIGH, 18, 0, 0, 0) - ALARM_ID_RTC_COMM_ERROR = (HIGH, 19, 0, 0, 0) - ALARM_ID_RTC_CONFIG_ERROR = (HIGH, 20, 0, 0, 0) - ALARM_ID_DG_COMM_TIMEOUT = (HIGH, 21, 0, 0, 0) - ALARM_ID_UI_COMM_TIMEOUT = (HIGH, 22, 0, 0, 0) - ALARM_ID_COMM_TOO_MANY_BAD_CRCS = (HIGH, 23, 0, 0, 0) - ALARM_ID_TREATMENT_STOPPED_BY_USER = (LOW, 24, 0, 0, 0) - ALARM_ID_BLOOD_SITTING_WARNING = (MED, 25, 0, 0, 0) - ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME = (MED, 26, 0, 0, 0) - ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK = (HIGH, 27, 0, 0, 0) - ALARM_ID_CAN_MESSAGE_NOT_ACKED = (HIGH, 28, 0, 0, 0) - ALARM_ID_OCCLUSION_BLOOD_PUMP = (HIGH, 29, 0, 0, 0) - ALARM_ID_OCCLUSION_DIAL_IN_PUMP = (HIGH, 30, 0, 0, 0) - ALARM_ID_OCCLUSION_DIAL_OUT_PUMP = (HIGH, 31, 0, 0, 0) - ALARM_ID_ARTERIAL_PRESSURE_LOW = (HIGH, 32, 0, 0, 0) - ALARM_ID_ARTERIAL_PRESSURE_HIGH = (HIGH, 33, 0, 0, 0) - ALARM_ID_VENOUS_PRESSURE_LOW = (HIGH, 34, 0, 0, 0) - ALARM_ID_VENOUS_PRESSURE_HIGH = (HIGH, 35, 0, 0, 0) - ALARM_ID_UF_RATE_TOO_HIGH_ERROR = (HIGH, 36, 0, 0, 0) - ALARM_ID_UF_VOLUME_ACCURACY_ERROR = (HIGH, 37, 0, 0, 0) - ALARM_ID_RTC_BATTERY_LOW = (HIGH, 38, 0, 0, 0) - ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = (HIGH, 39, 0, 0, 0) - ALARM_ID_RTC_RAM_OPS_ERROR = (HIGH, 40, 0, 0, 0) - ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = (HIGH, 41, 0, 0, 0) - ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR = (HIGH, 42, 0, 0, 0) - ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR = (HIGH, 43, 0, 0, 0) - ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = (HIGH, 44, 0, 0, 0) - ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = (HIGH, 45, 0, 0, 0) - ALARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = (HIGH, 46, 0, 0, 0) - ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = (HIGH, 47, 0, 0, 0) - ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE = (HIGH, 48, 0, 0, 0) - ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT = (HIGH, 49, 0, 0, 0) - ALARM_ID_HD_COMM_TIMEOUT = (HIGH, 50, 0, 0, 0) - ALARM_ID_VALVE_CONTROL_FAILURE = (HIGH, 51, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = (HIGH, 52, 0, 0, 0) - ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = (HIGH, 53, 0, 0, 0) - ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = (HIGH, 54, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = (HIGH, 55, 0, 0, 0) - ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = (HIGH, 56, 0, 0, 0) - ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = (HIGH, 57, 0, 0, 0) - ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = (HIGH, 58, 0, 0, 0) - ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = (HIGH, 59, 0, 0, 0) - ALARM_ID_DOES_NOT_EXIST = (HIGH, 99, 0, 0, 0) - - -def test_alarms(alarms, alarm_list, skip_hd_timeout=True): +def test_alarms(hd_simulator:HDSimulator, alarms:Alarms, alarm_list: List[Alarms], skip_hd_timeout: bool = True): """ Tests a list of alarm tuples. + @param hd_simulator: The HD Simulator object @param alarms: Alarm class object @param alarms_list: list of alarm tuples to test. @param skip_timeout: whether to skip the hd comm timeout error, default = False @@ -112,17 +45,17 @@ continue #test.log("Testing {0} = {1}".format(alarm_list[idx], alarm_id)) color = HIGH_PRIORITY_COLOR if priority == HIGH else MED_LOW_PRIORITY_COLOR - flags = HDSimulator.alarms_simulator.cmd_make_alarm_flags( + flags = hd_simulator.alarms_simulator.cmd_make_alarm_flags( no_clear=1, no_resume=1, no_rinseback=1, no_end_treatment=1, no_new_treatment=1, user_must_ack=1) - HDSimulator.alarms_simulator.cmd_activate_alarm_id(priority, alarm_id, escalates_in, silent_expires_in, flags) + hd_simulator.alarms_simulator.cmd_activate_alarm_id(priority, alarm_id, escalates_in, silent_expires_in, flags) test.compare(waitForObject(names.o_alarm_dialog).color.name, color) mouseClick(waitForObject(names.o_okay_alarm)) - HDSimulator.alarms_simulator.cmd_send_clear_alarms() + hd_simulator.alarms_simulator.cmd_send_clear_alarms() def get_alarm_list(alarms): """ @@ -146,13 +79,13 @@ @return: None """ utils.tstStart(__file__) - + hd_simulator = HDSimulator() startApplication(names.AUT_NAME + " -q") alarms = Alarms() alarm_list = get_alarm_list(alarms) - test_alarms(alarms, alarm_list) + test_alarms(hd_simulator, alarms, alarm_list) os.system("killall " + names.AUT_NAME) sleep(3) @@ -161,7 +94,7 @@ alarm_list = [alarms.ALARM_ID_HD_COMM_TIMEOUT] # test hd comm timeout since it was skipped in the last test - test_alarms(alarms, alarm_list, skip_hd_timeout = False) + test_alarms(hd_simulator, alarms, alarm_list, skip_hd_timeout = False) utils.tstDone()