Index: shared/scripts/names.py =================================================================== diff -u -rf2be6fa2cfa123dd2c65ae4b3e9e2bd12d5d6a9e -rac88b33834b21228e3dd2764b5fa6ff13cbababe --- shared/scripts/names.py (.../names.py) (revision f2be6fa2cfa123dd2c65ae4b3e9e2bd12d5d6a9e) +++ shared/scripts/names.py (.../names.py) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -161,7 +161,7 @@ o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True} o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"} o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True} -o_dismiss_alarm = {"container": o_Overlay, "id": "_dismiss", "type": "TouchRect", "unnamed": 1, "visible": True} +o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "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} o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True} Index: tools/run_tests.sh =================================================================== diff -u -r1b2880abb6dd871b225dfafd45848b45215e6e81 -rac88b33834b21228e3dd2764b5fa6ff13cbababe --- tools/run_tests.sh (.../run_tests.sh) (revision 1b2880abb6dd871b225dfafd45848b45215e6e81) +++ tools/run_tests.sh (.../run_tests.sh) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -15,7 +15,7 @@ # and can run tests with the specified tags # ############################################################################ -TAGS=AlarmStatusData,DGOperationMode,DGROPumpData,HDOperationModeData,TreatmentUltrafiltration,TreatmentSalineData,CreateTreatment +TAGS=TreatmentAdjustmentBloodDialysate,TreatmentAdjustmentDuration,TreatmentStatesData,HDOutletFlowData,AlarmColors,CreateTreatment TIMEOUT=60 rm -rf /tmp/UnitTest Index: tst_AlarmCleared/config.xml =================================================================== diff -u --- tst_AlarmCleared/config.xml (revision 0) +++ tst_AlarmCleared/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +AlarmCleared + + + Index: tst_AlarmTriggered/config.xml =================================================================== diff -u --- tst_AlarmTriggered/config.xml (revision 0) +++ tst_AlarmTriggered/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +AlarmTriggered + + + Index: tst_Alarm_Colors/config.xml =================================================================== diff -u --- tst_Alarm_Colors/config.xml (revision 0) +++ tst_Alarm_Colors/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +AlarmColors + + + Index: tst_Alarm_Colors/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -rac88b33834b21228e3dd2764b5fa6ff13cbababe --- tst_Alarm_Colors/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Alarm_Colors/test.py (.../test.py) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -111,25 +111,18 @@ #test.log("Testing {0} = {1}".format(alarm_list[idx], alarm_id)) color = HIGH_PRIORITY_COLOR if priority == HIGH else MED_LOW_PRIORITY_COLOR denaliMessages.setAlarmStatus(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) + test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, color) + mouseClick(waitForObjectExists(names.o_dismiss_alarm)) + sleep(0.20) + mouseClick(waitForObjectExists(names.o_alarm_bar)) + sleep(0.20) + mouseClick(waitForObjectExists(names.o_dismiss_alarm)) + sleep(0.20) + mouseClick(waitForObjectExists(names.o_alarm_bar)) + sleep(0.20) + mouseClick(waitForObjectExists(names.o_okay_alarm)) + sleep(0.20) + mouseClick(waitForObjectExists(names.o_alarm_bar)) denaliMessages.clear_all_alarms() def test_alarm_acknowledge(alarms): Index: tst_CANBusFaultCount/config.xml =================================================================== diff -u --- tst_CANBusFaultCount/config.xml (revision 0) +++ tst_CANBusFaultCount/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +CANBusFaultCount + + + Index: tst_CreateTreatment/test.py =================================================================== diff -u -r8101db5b5f4518548258c0724c2f50c67d591191 -rac88b33834b21228e3dd2764b5fa6ff13cbababe --- tst_CreateTreatment/test.py (.../test.py) (revision 8101db5b5f4518548258c0724c2f50c67d591191) +++ tst_CreateTreatment/test.py (.../test.py) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -232,7 +232,7 @@ @return: None """ - flick(waitForObject(names.o_create_treatment_flickable), 0, 1800) + flick(waitForObject(names.o_create_treatment_flickable), 0, 2000) # check that UI didn't change the page after prematurely clicking continue test.compare(waitForObject(names.o_create_treatment_continue).visible, True) Index: tst_DGDrainPumpData/config.xml =================================================================== diff -u --- tst_DGDrainPumpData/config.xml (revision 0) +++ tst_DGDrainPumpData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGDrainPumpData + + + Index: tst_DGHeatersData/config.xml =================================================================== diff -u --- tst_DGHeatersData/config.xml (revision 0) +++ tst_DGHeatersData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGHeatersData + + + Index: tst_DGLoadCellReadingsData/config.xml =================================================================== diff -u --- tst_DGLoadCellReadingsData/config.xml (revision 0) +++ tst_DGLoadCellReadingsData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGLoadCellReadingsData + + + Index: tst_DGPressureData/config.xml =================================================================== diff -u --- tst_DGPressureData/config.xml (revision 0) +++ tst_DGPressureData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGPressureData + + + Index: tst_DGReservoirData/config.xml =================================================================== diff -u --- tst_DGReservoirData/config.xml (revision 0) +++ tst_DGReservoirData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGReservoirData + + + Index: tst_DGTemperaturesData/config.xml =================================================================== diff -u --- tst_DGTemperaturesData/config.xml (revision 0) +++ tst_DGTemperaturesData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGTemperaturesData + + + Index: tst_DGValvesStatesData/config.xml =================================================================== diff -u --- tst_DGValvesStatesData/config.xml (revision 0) +++ tst_DGValvesStatesData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DGValvesStatesData + + + Index: tst_DebugText/config.xml =================================================================== diff -u --- tst_DebugText/config.xml (revision 0) +++ tst_DebugText/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +DebugText + + + Index: tst_HDBloodFlowData/config.xml =================================================================== diff -u --- tst_HDBloodFlowData/config.xml (revision 0) +++ tst_HDBloodFlowData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +HDBloodFlowData + + + Index: tst_HDInletFlowData/config.xml =================================================================== diff -u --- tst_HDInletFlowData/config.xml (revision 0) +++ tst_HDInletFlowData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +HDInletFlowData + + + Index: tst_HDOutletFlowData/config.xml =================================================================== diff -u --- tst_HDOutletFlowData/config.xml (revision 0) +++ tst_HDOutletFlowData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +HDOutletFlowData + + + Index: tst_HDPressureOcclusionData/config.xml =================================================================== diff -u --- tst_HDPressureOcclusionData/config.xml (revision 0) +++ tst_HDPressureOcclusionData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +HDPressureOcclusionData + + + Index: tst_HomeScreen/config.xml =================================================================== diff -u --- tst_HomeScreen/config.xml (revision 0) +++ tst_HomeScreen/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +HomeScreen + + + Index: tst_Internals/config.xml =================================================================== diff -u --- tst_Internals/config.xml (revision 0) +++ tst_Internals/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +Internals + + + Index: tst_ServiceShutdown/config.xml =================================================================== diff -u --- tst_ServiceShutdown/config.xml (revision 0) +++ tst_ServiceShutdown/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +ServiceShutdown + + + Index: tst_TreatmentScreen/config.xml =================================================================== diff -u --- tst_TreatmentScreen/config.xml (revision 0) +++ tst_TreatmentScreen/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentScreen + + + Index: tst_TreatmentStatesData/config.xml =================================================================== diff -u --- tst_TreatmentStatesData/config.xml (revision 0) +++ tst_TreatmentStatesData/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentStatesData + + + Index: tst_Treatment_Adjustment_BloodDialysate/config.xml =================================================================== diff -u --- tst_Treatment_Adjustment_BloodDialysate/config.xml (revision 0) +++ tst_Treatment_Adjustment_BloodDialysate/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentAdjustmentBloodDialysate + + + Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -rac88b33834b21228e3dd2764b5fa6ff13cbababe --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -42,7 +42,7 @@ denaliMessages.setTreatmentParamRanges(0, 0, 0, 0, 150, 550) denaliMessages.send_acknowledge_UI() - mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) + mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 180, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225) @@ -63,7 +63,7 @@ denaliMessages.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250) utils.waitForGUI(2) - mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) + mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 180, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225) Index: tst_Treatment_Adjustment_Duration/config.xml =================================================================== diff -u --- tst_Treatment_Adjustment_Duration/config.xml (revision 0) +++ tst_Treatment_Adjustment_Duration/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentAdjustmentDuration + + + Index: tst_Treatment_Adjustment_Saline/config.xml =================================================================== diff -u --- tst_Treatment_Adjustment_Saline/config.xml (revision 0) +++ tst_Treatment_Adjustment_Saline/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentAdjustmentSaline + + + Index: tst_Treatment_Adjustment_Ultrafiltration/config.xml =================================================================== diff -u --- tst_Treatment_Adjustment_Ultrafiltration/config.xml (revision 0) +++ tst_Treatment_Adjustment_Ultrafiltration/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentAdjustmentUltrafiltration + + + Index: tst_Treatment_BloodDialysateFlowRate/config.xml =================================================================== diff -u --- tst_Treatment_BloodDialysateFlowRate/config.xml (revision 0) +++ tst_Treatment_BloodDialysateFlowRate/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentBloodDialysateFlowRate + + + Index: tst_Treatment_ParametersRange/config.xml =================================================================== diff -u --- tst_Treatment_ParametersRange/config.xml (revision 0) +++ tst_Treatment_ParametersRange/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentParametersRange + + + Index: tst_Treatment_PressureOcclusion/config.xml =================================================================== diff -u --- tst_Treatment_PressureOcclusion/config.xml (revision 0) +++ tst_Treatment_PressureOcclusion/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentPressureOcclusion + + + Index: tst_Treatment_Section_BloodDialysate/config.xml =================================================================== diff -u --- tst_Treatment_Section_BloodDialysate/config.xml (revision 0) +++ tst_Treatment_Section_BloodDialysate/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentSectionBloodDialysate + + + Index: tst_Treatment_Time/config.xml =================================================================== diff -u --- tst_Treatment_Time/config.xml (revision 0) +++ tst_Treatment_Time/config.xml (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) @@ -0,0 +1,10 @@ + + + + + + +TreatmentTime + + +