Index: shared/scripts/names.py =================================================================== diff -u -rc70f4f767e0216fb82b0aa809d11bc86073a6e1e -r0641bc72e2338b37ace48847abf301374b6620f6 --- shared/scripts/names.py (.../names.py) (revision c70f4f767e0216fb82b0aa809d11bc86073a6e1e) +++ shared/scripts/names.py (.../names.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -12,6 +12,8 @@ # author Behrouz NematiPour # +AUT_NAME = "denaliSquish" # Squish + # Top Parents o_QQuickView = { "type": "QQuickView"} o_Overlay = {"container": o_QQuickView, "type": "Overlay" } @@ -42,8 +44,8 @@ o_modalDialog = {"container": o_Overlay , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} # Power off -# o_poweroffButton = {"container": o_settingsHome, "id": "_poweroffButton", "type": "TouchRect" , "unnamed": 1, "visible": True} -o_poweroffButton = {"container": o_diagnostics_ScreenItem, "id": "_poweroffButton", "type": "TouchRect", "unnamed": 1, "visible": True} +o_poweroffButton = {"container": o_settingsHome, "id": "_poweroffButton", "type": "TouchRect" , "unnamed": 1, "visible": True} +#o_poweroffButton = {"container": o_diagnostics_ScreenItem, "id": "_poweroffButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_poweroff_shutdown = {"container": o_QQuickView , "id": "_shutdownRect" , "type": "TouchRect" , "unnamed": 1, "visible": True} o_poweroff_cancel = {"container": o_QQuickView , "id": "_cancelTouch" , "type": "TouchRect" , "unnamed": 1, "visible": True} o_poweroff_notification = {"container": o_Overlay , "id": "_titleText" , "type": "TitleText" , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"} @@ -165,31 +167,76 @@ -# Settings Load Cell Readings -o_settingsHome_reservoir1Prim = {"container": o_settingsHome, "objectName": "_LoadCellReadings0", "type": "Text"} -o_settingsHome_reservoir1Bkup = {"container": o_settingsHome, "objectName": "_LoadCellReadings1", "type": "Text"} -o_settingsHome_reservoir2Prim = {"container": o_settingsHome, "objectName": "_LoadCellReadings2", "type": "Text"} -o_settingsHome_reservoir2Bkup = {"container": o_settingsHome, "objectName": "_LoadCellReadings3", "type": "Text"} -# Settings Temperature Sensors -o_settingsHome_inletPrimaryHeater = {"container": o_settingsHome, "objectName": "_TemperatureSensors0" , "type": "Text"} -o_settingsHome_outletPrimaryHeater = {"container": o_settingsHome, "objectName": "_TemperatureSensors1" , "type": "Text"} -o_settingsHome_conductivitySensor1 = {"container": o_settingsHome, "objectName": "_TemperatureSensors2" , "type": "Text"} -o_settingsHome_conductivitySensor2 = {"container": o_settingsHome, "objectName": "_TemperatureSensors3" , "type": "Text"} -o_settingsHome_outletRedundancy = {"container": o_settingsHome, "objectName": "_TemperatureSensors4" , "type": "Text"} -o_settingsHome_inletDialysate = {"container": o_settingsHome, "objectName": "_TemperatureSensors5" , "type": "Text"} -o_settingsHome_primaryHeaterThermoCouple = {"container": o_settingsHome, "objectName": "_TemperatureSensors6" , "type": "Text"} -o_settingsHome_trimmerHeaterThermoCouple = {"container": o_settingsHome, "objectName": "_TemperatureSensors7" , "type": "Text"} -o_settingsHome_primaryHeaterColdJunction = {"container": o_settingsHome, "objectName": "_TemperatureSensors8" , "type": "Text"} -o_settingsHome_trimmerHeaterColdJunction = {"container": o_settingsHome, "objectName": "_TemperatureSensors9" , "type": "Text"} -o_settingsHome_primaryHeaterInternal = {"container": o_settingsHome, "objectName": "_TemperatureSensors10", "type": "Text"} -o_settingsHome_trimmerHeaterInternal = {"container": o_settingsHome, "objectName": "_TemperatureSensors11", "type": "Text"} -# Setting CANBusFaultCountText -o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } -blood_sitting_too_long_alarm_5_min_Text = {"container": o_Overlay, "text": "Blood sitting too long alarm (>5 min). ", "type": "Text", "unnamed": 1, "visible": True} +# DGROPumpData +o_managerHome_DGROPumpData_SetPtPressure = {"container": o_managerHome, "objectName": "_DGROPumpData0", "type": "Text"} +o_managerHome_DGROPumpData_FlowRate = {"container": o_managerHome, "objectName": "_DGROPumpData1", "type": "Text"} +o_managerHome_DGROPumpData_PWM = {"container": o_managerHome, "objectName": "_DGROPumpData2", "type": "Text"} +# DGPressuresData +o_managerHome_DGPressuresData_ROInletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData0", "type": "Text"} +o_managerHome_DGPressuresData_ROOutletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData1", "type": "Text"} +o_managerHome_DGPressuresData_DrainInletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData2", "type": "Text"} +o_managerHome_DGPressuresData_DrainOutletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData3", "type": "Text"} +# DGDrainPumpData +o_managerHome_DGDrainPumpData_SetPtRPM = {"container": o_managerHome, "objectName": "_DGDrainPumpData0", "type": "Text"} +o_managerHome_DGDrainPumpData_DACValue = {"container": o_managerHome, "objectName": "_DGDrainPumpData1", "type": "Text"} +# DGOperationMode +o_managerHome_DGOperationModeData_DGOpMode = {"container": o_managerHome, "objectName": "_DGOperationModeData", "type": "Text"} +# DGReservoirData +o_managerHome_DGReservoirData_ActiveReservoir = {"container": o_managerHome, "objectName": "_DGReservoirData0", "type": "Text"} +o_managerHome_DGReservoirData_FillToVolML = {"container": o_managerHome, "objectName": "_DGReservoirData1", "type": "Text"} +o_managerHome_DGReservoirData_DrainToVolML = {"container": o_managerHome, "objectName": "_DGReservoirData2", "type": "Text"} +# DGValvesStates +o_managerHome_DGValvesStatesData_ValvesStates = {"container": o_managerHome, "objectName": "_DGValvesStatesData", "type": "Text"} + +# DGHeatersData +o_managerHome_DGHeatersData_MainPriMaryDC = {"container": o_managerHome, "objectName": "_DGHeatersData0", "type": "Text"} +o_managerHome_DGHeatersData_SmallPrimaryDC = {"container": o_managerHome, "objectName": "_DGHeatersData1", "type": "Text"} +o_managerHome_DGHeatersData_TrimmerDC = {"container": o_managerHome, "objectName": "_DGHeatersData2", "type": "Text"} + +# DGLoadCellReadingsData +o_managerHome_DGLoadCellReadingsData_Rs1Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData0", "type": "Text"} +o_managerHome_DGLoadCellReadingsData_Rs1Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData1", "type": "Text"} +o_managerHome_DGLoadCellReadingsData_Rs2Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData2", "type": "Text"} +o_managerHome_DGLoadCellReadingsData_Rs2Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData3", "type": "Text"} + +# DGTemperaturesData +o_managerHome_DGTemperaturesData_InletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperaturesData0", "type": "Text"} +o_managerHome_DGTemperaturesData_OutletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperaturesData1", "type": "Text"} +o_managerHome_DGTemperaturesData_ConductivitySensor1 = {"container": o_managerHome, "objectName": "_DGTemperaturesData2", "type": "Text"} +o_managerHome_DGTemperaturesData_ConductivitySensor2 = {"container": o_managerHome, "objectName": "_DGTemperaturesData3", "type": "Text"} +o_managerHome_DGTemperaturesData_OutletRedundancy = {"container": o_managerHome, "objectName": "_DGTemperaturesData4", "type": "Text"} +o_managerHome_DGTemperaturesData_InletDialysate = {"container": o_managerHome, "objectName": "_DGTemperaturesData5", "type": "Text"} +o_managerHome_DGTemperaturesData_PrimaryHeaterThermocouple = {"container": o_managerHome, "objectName": "_DGTemperaturesData6", "type": "Text"} +o_managerHome_DGTemperaturesData_TrimmerHeaterThermocouple = {"container": o_managerHome, "objectName": "_DGTemperaturesData7", "type": "Text"} +o_managerHome_DGTemperaturesData_PrimaryHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperaturesData8", "type": "Text"} +o_managerHome_DGTemperaturesData_TrimmerHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperaturesData9", "type": "Text"} +o_managerHome_DGTemperaturesData_PrimaryHeaterInternalTemperature = {"container": o_managerHome, "objectName": "_DGTemperaturesData10", "type": "Text"} +o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature = {"container": o_managerHome, "objectName": "_DGTemperaturesData11", "type": "Text"} + +# HDOperationModeData +o_settingsHome_HDOperationModeData_OpMode = {"container": o_settingsHome, "objectName": "_HDOperationModeData", "type": "Text"} + +# TreatmentStatesData +o_settingsHome_TreatmentStatesData_SubMode = {"container": o_settingsHome, "objectName": "_TreatmentStatesData0", "type": "Text"} +o_settingsHome_TreatmentStatesData_UFState = {"container": o_settingsHome, "objectName": "_TreatmentStatesData1", "type": "Text"} +o_settingsHome_TreatmentStatesData_SalineState = {"container": o_settingsHome, "objectName": "_TreatmentStatesData2", "type": "Text"} + +# PressureOcclusionData +o_settingsHome_PressureOcclusionData_ArterialPressure = {"container": o_settingsHome, "objectName": "_PressureOcclusionData0", "type": "Text"} +o_settingsHome_PressureOcclusionData_VenousPressure = {"container": o_settingsHome, "objectName": "_PressureOcclusionData1", "type": "Text"} +o_settingsHome_PressureOcclusionData_BloodPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData2", "type": "Text"} +o_settingsHome_PressureOcclusionData_DialysateInletPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData3", "type": "Text"} +o_settingsHome_PressureOcclusionData_DialysateOutletPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData4", "type": "Text"} + +# Setting CANBusFaultCountText +o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } +blood_sitting_too_long_alarm_5_min_Text = {"container": o_Overlay, "text": "Blood sitting too long alarm (>5 min). ", "type": "Text", "unnamed": 1, "visible": True} + + Index: suite.conf =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -r0641bc72e2338b37ace48847abf301374b6620f6 --- suite.conf (.../suite.conf) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ suite.conf (.../suite.conf) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -5,6 +5,6 @@ IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_Internals tst_HomeScreen tst_ServiceShutdown tst_TreatmentScreen tst_Treatment_Section_BloodDialysate tst_Treatment_BloodFlowRate tst_Treatment_DialysateFlowRate tst_Treatment_Time tst_Treatment_Ultrafiltration tst_Treatment_PressureOcclusion tst_Treatment_LoadCellReadings tst_Treatment_TemperatureSensors tst_Treatment_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Treatment_Adjustment_Duration tst_Treatment_Adjustment_Ultrafiltration tst_CANBusFaultCount tst_Alarm +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_TreatmentStatesData tst_DGDrainPumpData tst_DGHeatersData tst_DGLoadCellReadingsData tst_DGPressureData tst_DGTemperaturesData tst_DGROPumpData tst_DGReservoirData tst_case2 tst_DGValvesStatesData tst_DGOperationMode tst_HDOperationModeData tst_HDPressureOcclusionData tst_CANBusFaultCount tst_DebugText tst_Alarm VERSION=3 WRAPPERS=Qt Index: tools/setup_env.sh =================================================================== diff -u -re760ce872232cc34710777236b4f219f69193559 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tools/setup_env.sh (.../setup_env.sh) (revision e760ce872232cc34710777236b4f219f69193559) +++ tools/setup_env.sh (.../setup_env.sh) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -21,4 +21,4 @@ virtualenv --python=python3.6 venv source venv/bin/activate branch="master" -pip3 install git+ssh://git@dvm-linux02:7999/vv/dialin.git@$branch +pip3 install git+ssh://git@192.168.10.132:7999/vv/dialin.git@$branch Index: tst_Alarm/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Alarm/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Alarm/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -8,64 +8,195 @@ # WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # file tst_Alarm -# date 2020/04/08 -# author Behrouz NematiPour +# date 2020/06/26 +# author Peter Lucia # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages +from time import sleep +import os -def main(): - utils.tstStart() +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): + """ + Tests a list of alarm tuples. - startApplication(names.AUT_NAME) - utils.waitForGUI(1) + @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 + @return: None + """ + + for idx, (priority, alarm_id, escalates_in, silent_expires_in, flags) in enumerate(alarm_list): + if (alarm_list[idx] == alarms.ALARM_ID_NO_ALARM): + continue + if (alarm_list[idx] == alarms.ALARM_ID_HD_COMM_TIMEOUT) and skip_hd_timeout: + continue + #test.log("Testing {0} = {1}".format(alarm_list[idx], alarm_id)) + color = HIGH_PRIORITY_COLOR if priority == HIGH else MED_LOW_PRIORITY_COLOR + denaliMessages.sendAlarm(priority, alarm_id, escalates_in, silent_expires_in, flags) + sleep(0.5) + if priority == HIGH: + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, color) + sleep(0.5) + mouseClick(waitForObjectExists(names.o_dismiss_alarm)) + else: + mouseClick(waitForObjectExists(names.o_alarm_bar)) + sleep(0.5) + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, color) + sleep(0.5) + mouseClick(waitForObjectExists(names.o_okay_alarm)) + sleep(0.5) + mouseClick(waitForObjectExists(names.o_alarm_bar)) + sleep(0.5) + mouseClick(waitForObjectExists(names.o_dismiss_alarm)) + + + + sleep(0.5) + denaliMessages.clear_all_alarms() + +def test_alarm_acknowledge(alarms): + """ + Exercises the acknowledge alarm functionality - denaliMessages.sendAlarm(3, 26, 2, 0, 0) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - utils.waitForGUI() # visual delay + @return: None + """ + #test.log("Testing alarm acknowledgement") - denaliMessages.sendAlarm(3, 26, 2, 0, 65535) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - utils.waitForGUI() # visual delay + denaliMessages.clear_all_alarms() + sleep(0.5) - denaliMessages.sendAlarm(2, 2, 0, 10, 100) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 2) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#ffa500") - utils.waitForGUI() # visual delay - denaliMessages.sendAlarm(1, 3, 0, 0, 54) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 1) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#008000") - utils.waitForGUI() # visual delay + denaliMessages.sendAlarm(*alarms.ALARM_ID_SOFTWARE_FAULT) + sleep(0.5) + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, HIGH_PRIORITY_COLOR) + sleep(0.5) + mouseClick(waitForObjectExists(names.o_okay_alarm)) + sleep(0.5) + denaliMessages.clear_all_alarms() + sleep(0.5) + denaliMessages.sendAlarm(*alarms.ALARM_ID_SOFTWARE_FAULT) + sleep(0.5) + + +def get_alarm_list(alarms): + """ + Gets the alarm list - denaliMessages.sendAlarm(0, 4, 0, 0, 91) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 0) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#ffffff") - utils.waitForGUI() # visual delay + @return: The alarms (list of tuples) + """ + + alarm_list = [] + for attr in dir(alarms): + if not callable(getattr(alarms, attr)) and attr.startswith("ALARM_ID"): + alarm_list.append(getattr(alarms, attr)) + + return sorted(alarm_list, key = lambda val: val [1]) + + +def main(): + """ + Main function to test the alarms. - denaliMessages.sendAlarm(3, 255, 0, 0, 0) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) - test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - utils.waitForGUI() # visual delay + @return: None + """ + utils.tstStart() - denaliMessages.sendAlarm(0, 0, 0, 0, 0) - try: # Notification Bar should be hidden - waitForObjectExists(names.o_ALARM_ID_MESSAGE,0) - test.compare(False, True) - except LookupError: - test.compare(False, False) - - # Coverage : These messages have not been implemented completely yet. - # but as long as the coverage is 100% it means the portion of the implementation for them are working fine. - denaliMessages.setAlarmTriggered(1) - denaliMessages.send_acknowledge_UI() - denaliMessages.setAlarmCleared (1) - denaliMessages.send_acknowledge_UI() - denaliMessages.sendUnknown_HD() - denaliMessages.sendUnknown_DG() + startApplication(names.AUT_NAME + " -q") + sleep(0.5) + + alarms = Alarms() + alarm_list = get_alarm_list(alarms) + + test_alarms(alarms, alarm_list) + + # test the alarm acknowledgement + test_alarm_acknowledge(alarms) + + os.system("killall " + names.AUT_NAME) + sleep(3) + startApplication(names.AUT_NAME) + sleep(0.5) + 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) + utils.tstDone() + Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -redafb92233ef9a8281c8133cc3882f17ac39de64 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_CANBusFaultCount/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,8 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + def gotoScreenNtest_Contains_CANBusFaultCount(): mouseClick(waitForObject(names.o_mainMenu_settings)) Index: tst_DGDrainPumpData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGDrainPumpData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGDrainPumpData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGDrainPumpData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGHeatersData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGHeatersData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGHeatersData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGHeatersData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGLoadCellReadingsData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGOperationMode/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGOperationMode/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGOperationMode/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages opModes = [ "DG_MODE_FAUL" , Index: tst_DGPressureData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGPressureData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGPressureData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGPressuresData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGROPumpData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGROPumpData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGROPumpData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGROPumpData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGReservoirData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGReservoirData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGReservoirData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGReservoirData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGTemperaturesData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_DGTemperaturesData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DGValvesStatesData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_DGValvesStatesData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_DGValvesStatesData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages valvesBitLen = 12 def gotoScreenNtest_Contains_DGValvesStatesData(): Index: tst_DebugText/test.py =================================================================== diff -u --- tst_DebugText/test.py (revision 0) +++ tst_DebugText/test.py (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- + +## +# 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_DebugText +# date 2020/08/02 +# author Behrouz NematiPour +# + +import names +from dialin.squish import utils, denaliMessages + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + # these tests are used for debugging and are placeholder for later use cases. + denaliMessages.setHDDebugText("01234567890123456789012345678901234567810123456789") + denaliMessages.setDGDebugText("01234567890123456789012345678901234567820123456789") + + utils.tstDone() Index: tst_HDOperationModeData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_HDOperationModeData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_HDOperationModeData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages opModes = [ "MODE_FAUL" , Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_PressureOcclusionData(): mouseClick(waitForObject(names.o_mainMenu_settings)) Index: tst_HomeScreen/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_HomeScreen/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_HomeScreen/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,7 +13,7 @@ # import names -import utils +from dialin.squish import utils def main(): utils.tstStart() Index: tst_ServiceShutdown/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_ServiceShutdown/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_ServiceShutdown/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,9 +13,7 @@ # import names -import utils -import globals -import denaliMessages +from dialin.squish import utils, globals, denaliMessages ################################################################################ # This test need to be changed when the Service screen has been implemented # @@ -30,6 +28,8 @@ mouseClick (waitForObjectExists(names.o_mainMenu_settings)) utils.waitForGUI() test.compare(waitForObjectExists(names.o_settingsHome).visible, True, globals.SRSUI(vSRSUI)) + # the settings test page reverted back and it's no longer on the diagnostic page. + #mouseClick(waitForObjectExists(names.o_diagnostics)) def gotoScreenNtest_Contains_TreatmentHome(vSRSUI=""): mouseClick (waitForObjectExists(names.o_mainMenu_treatment)) Index: tst_TreatmentScreen/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_TreatmentScreen/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_TreatmentScreen/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,9 @@ # import names -import utils +from dialin.squish import utils + def main(): utils.tstStart() Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_TreatmentStatesData/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,8 +13,7 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages def gotoScreenNtest_Contains_TreatmentStatesData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,9 +13,9 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + def gotoScreenNtest_Contains_FlowsSection(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True) @@ -27,7 +27,7 @@ def main(): utils.tstStart() - startApplication(names.AUT_NAME) + startApplication(names.AUT_NAME + " -q") utils.waitForGUI(1) gotoScreenNtest_Contains_FlowsSection() Index: tst_Treatment_Adjustment_Duration/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,9 +13,9 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + def gotoScreenNtest_Contains_DurationSection(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).visible, True) Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -redafb92233ef9a8281c8133cc3882f17ac39de64 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -12,9 +12,9 @@ # author Behrouz NematiPour # -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + from names import * eInvalid = 0 @@ -319,7 +319,7 @@ def main(): utils.tstStart() - startApplication(AUT_NAME) + startApplication(AUT_NAME + " -q") utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration() Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u -redafb92233ef9a8281c8133cc3882f17ac39de64 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) +++ tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,9 +13,9 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + def gotoScreenNtest_Contains_FlowsSection(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True) Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,9 +13,9 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + def gotoScreenNtest_Contains_FlowsSection(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True) Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -23,29 +23,29 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_PressureOcclusion() utils.waitForGUI(1) - denaliMessages.setTreatmentPressureOcclusion(0, 0, 0, 0, 0) + denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 0) - test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure, 0) + test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure , 0) - denaliMessages.setTreatmentPressureOcclusion(200, 100, 50, 25, 15) # Coverage + denaliMessages.setPressureOcclusionData(200, 100, 50, 25, 15) # Coverage test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 200) - test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure, 100) + test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure , 100) - denaliMessages.setTreatmentPressureOcclusion(200, 100, 50, 25, 15) + denaliMessages.setPressureOcclusionData(200, 100, 50, 25, 15) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 200) - test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure, 100) + test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure , 100) - denaliMessages.setTreatmentPressureOcclusion(0, 0, 0, 0, 0) + denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0) test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).arterilPressure, 0) - test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure, 0) + test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).venusPressure , 0) utils.tstDone() \ No newline at end of file Index: tst_Treatment_Section_BloodDialysate/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,7 +13,7 @@ # import names -import utils +from dialin.squish import utils def main(): utils.tstStart() Index: tst_Treatment_Time/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_Time/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_Time/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -13,9 +13,9 @@ # import names -import utils -import denaliMessages +from dialin.squish import utils, denaliMessages + def gotoScreenNtest_Contains_TimeSection(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).visible, True) Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27 -r0641bc72e2338b37ace48847abf301374b6620f6 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -22,7 +22,7 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) + denaliMessages.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) @@ -34,7 +34,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration() @@ -48,8 +48,6 @@ resetNTestTreatmentUltrafiltration() startNTestTreatmentUltrafiltration(minUF, maxUF) - - maxUF = 300 denaliMessages.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, maxUF, 30, 5) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF) Index: venv.bak/lib/python3.6/site-packages/dialin =================================================================== diff -u --- venv.bak/lib/python3.6/site-packages/dialin (revision 0) +++ venv.bak/lib/python3.6/site-packages/dialin (revision 0641bc72e2338b37ace48847abf301374b6620f6) @@ -0,0 +1 @@ +../../../../../dialin/dialin/ \ No newline at end of file