Index: shared/scripts/names.py =================================================================== diff -u -r9304d64222c02f0dc812ff86dc945c8deba46440 -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- shared/scripts/names.py (.../names.py) (revision 9304d64222c02f0dc812ff86dc945c8deba46440) +++ shared/scripts/names.py (.../names.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -252,15 +252,15 @@ o_managerHome_DGDrainPumpData_DACValue = {"container": o_managerHome, "objectName": "_DGDrainPumpData1", "type": "Text"} # DGOperationMode -o_managerHome_DGOperationModeData_DGOpMode = {"container": o_managerHome, "objectName": "_DGOperationModeData", "type": "Text"} +o_managerHome_DGOperationModeData_DGOpMode = {"container": o_managerHome, "objectName": "_DGOperationModeData0", "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"} +o_managerHome_DGValvesStatesData_ValvesStates = {"container": o_managerHome, "objectName": "_DGValvesStatesData0", "type": "Text"} # DGHeatersData o_managerHome_DGHeatersData_MainPriMaryDC = {"container": o_managerHome, "objectName": "_DGHeatersData0", "type": "Text"} @@ -288,7 +288,7 @@ o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature = {"container": o_managerHome, "objectName": "_DGTemperaturesData11", "type": "Text"} # HDOperationModeData -o_settingsHome_HDOperationModeData_OpMode = {"container": o_settingsHome, "objectName": "_HDOperationModeData", "type": "Text"} +o_managerHome_HDOperationModeData_OpMode = {"container": o_managerHome, "objectName": "_HDOperationModeData0", "type": "Text"} # TreatmentStatesData o_settingsHome_TreatmentStatesData_SubMode = {"container": o_settingsHome, "objectName": "_TreatmentStatesData0", "type": "Text"} @@ -306,20 +306,38 @@ o_treatmentStart_ultrafiltration_notification = {"container": o_treatmentStart_ultrafiltration_section, "objectName": "NotificationBar" , "type": "NotificationBarSmall" } # 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"} +o_managerHome_PressureOcclusionData_ArterialPressure = {"container": o_managerHome, "objectName": "_PressureOcclusionData0", "type": "Text"} +o_managerHome_PressureOcclusionData_VenousPressure = {"container": o_managerHome, "objectName": "_PressureOcclusionData1", "type": "Text"} +o_managerHome_PressureOcclusionData_BloodPumpOcclusion = {"container": o_managerHome, "objectName": "_PressureOcclusionData2", "type": "Text"} +o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion = {"container": o_managerHome, "objectName": "_PressureOcclusionData3", "type": "Text"} +o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion = {"container": o_managerHome, "objectName": "_PressureOcclusionData4", "type": "Text"} +# BloodFlowData +o_managerHome_BloodFlowData_FlowSetPoint = {"container": o_managerHome, "objectName": "_HDBloodFlowData0" , "type": "Text"} +o_managerHome_BloodFlowData_MeasuredFlow = {"container": o_managerHome, "objectName": "_HDBloodFlowData1" , "type": "Text"} +o_managerHome_BloodFlowData_RotorSpeed = {"container": o_managerHome, "objectName": "_HDBloodFlowData2" , "type": "Text"} +o_managerHome_BloodFlowData_MotorSpeed = {"container": o_managerHome, "objectName": "_HDBloodFlowData3" , "type": "Text"} +o_managerHome_BloodFlowData_MotorCtlSpeed = {"container": o_managerHome, "objectName": "_HDBloodFlowData4" , "type": "Text"} +o_managerHome_BloodFlowData_MotorCtlCurrent = {"container": o_managerHome, "objectName": "_HDBloodFlowData5" , "type": "Text"} +o_managerHome_BloodFlowData_PWMDutyCycle = {"container": o_managerHome, "objectName": "_HDBloodFlowData6" , "type": "Text"} + +# InletFlowData +o_managerHome_InletFlowData_FlowSetPoint = {"container": o_managerHome, "objectName": "_HDInletFlowData0" , "type": "Text"} +o_managerHome_InletFlowData_MeasuredFlow = {"container": o_managerHome, "objectName": "_HDInletFlowData1" , "type": "Text"} +o_managerHome_InletFlowData_RotorSpeed = {"container": o_managerHome, "objectName": "_HDInletFlowData2" , "type": "Text"} +o_managerHome_InletFlowData_MotorSpeed = {"container": o_managerHome, "objectName": "_HDInletFlowData3" , "type": "Text"} +o_managerHome_InletFlowData_MotorCtlSpeed = {"container": o_managerHome, "objectName": "_HDInletFlowData4" , "type": "Text"} +o_managerHome_InletFlowData_MotorCtlCurrent = {"container": o_managerHome, "objectName": "_HDInletFlowData5" , "type": "Text"} +o_managerHome_InletFlowData_PWMDutyCycle = {"container": o_managerHome, "objectName": "_HDInletFlowData6" , "type": "Text"} + # OutletFlowData -o_settingsHome_OutletFlowData_RefUFVol = {"container": o_settingsHome, "objectName": "_OutletFlowData0", "type": "Text"} -o_settingsHome_OutletFlowData_MeasUFVol = {"container": o_settingsHome, "objectName": "_OutletFlowData1", "type": "Text"} -o_settingsHome_OutletFlowData_RotorSpeed = {"container": o_settingsHome, "objectName": "_OutletFlowData2", "type": "Text"} -o_settingsHome_OutletFlowData_MotorSpeed = {"container": o_settingsHome, "objectName": "_OutletFlowData3", "type": "Text"} -o_settingsHome_OutletFlowData_MotorCtlSpeed = {"container": o_settingsHome, "objectName": "_OutletFlowData4", "type": "Text"} -o_settingsHome_OutletFlowData_MotorCtlCurrent = {"container": o_settingsHome, "objectName": "_OutletFlowData5", "type": "Text"} -o_settingsHome_OutletFlowData_PWMDtCycle = {"container": o_settingsHome, "objectName": "_OutletFlowData6", "type": "Text"} +o_managerHome_OutletFlowData_RefUFVol = {"container": o_managerHome, "objectName": "_HDOutletFlowData0", "type": "Text"} +o_managerHome_OutletFlowData_MeasUFVol = {"container": o_managerHome, "objectName": "_HDOutletFlowData1", "type": "Text"} +o_managerHome_OutletFlowData_RotorSpeed = {"container": o_managerHome, "objectName": "_HDOutletFlowData2", "type": "Text"} +o_managerHome_OutletFlowData_MotorSpeed = {"container": o_managerHome, "objectName": "_HDOutletFlowData3", "type": "Text"} +o_managerHome_OutletFlowData_MotorCtlSpeed = {"container": o_managerHome, "objectName": "_HDOutletFlowData4", "type": "Text"} +o_managerHome_OutletFlowData_MotorCtlCurrent = {"container": o_managerHome, "objectName": "_HDOutletFlowData5", "type": "Text"} +o_managerHome_OutletFlowData_PWMDtCycle = {"container": o_managerHome, "objectName": "_HDOutletFlowData6", "type": "Text"} # Saline Bolus o_treatmentStart_SalineSection = {"container": o_treatmentStart_TreatmentStart, "id": "_SalineTouchArea" , "type": "TreatmentFluid" } @@ -331,7 +349,7 @@ # Setting CANBusFaultCountText -o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } +o_managerHome_canbusFaultCount = {"container": o_managerHome, "id": "_canbusFaultCountText", "type": "Text" } # Alarm System o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"} Index: suite.conf =================================================================== diff -u -r9fc49dcb5999a8def502d0a0984b35b9e67a8092 -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- suite.conf (.../suite.conf) (revision 9fc49dcb5999a8def502d0a0984b35b9e67a8092) +++ suite.conf (.../suite.conf) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -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_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_Saline tst_TreatmentSalineData 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_HDOutletFlowData tst_HDPressureOcclusionData tst_CANBusFaultCount tst_DebugText 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_Saline tst_TreatmentSalineData tst_TreatmentStatesData 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_Alarm_Colors tst_AlarmStatusData tst_AlarmTriggered tst_AlarmCleared VERSION=3 WRAPPERS=Qt Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- tst_CANBusFaultCount/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -## +# # # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, @@ -21,13 +21,14 @@ def gotoScreenNtest_Contains_CANBusFaultCount(): - mouseClick(waitForObject(names.o_mainMenu_settings)) + mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0) def test_values(vCount): - test.compare(str(waitForObjectExists(names.o_settingsHome_canbusFaultCount).text), "CAN Faults : {}".format(vCount)) + test.compare(str(waitForObjectExists(names.o_managerHome_canbusFaultCount).text), "CAN Faults: {}".format(vCount)) + def main(): utils.tstStart(__file__) @@ -43,9 +44,8 @@ denaliMessages.setCanBUSFaultCount(100) test_values (100) - denaliMessages.setCanBUSFaultCount(100) # Coverage + denaliMessages.setCanBUSFaultCount(100) # Coverage test_values (100) - denaliMessages.setCanBUSFaultCount(0) test_values (0) Index: tst_HDBloodFlowData/test.py =================================================================== diff -u --- tst_HDBloodFlowData/test.py (revision 0) +++ tst_HDBloodFlowData/test.py (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -0,0 +1,62 @@ +# -*- 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_HDBloodFlowData +# date 2020/08/20 +# author Behrouz NematiPour +# + +import names +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + + +def gotoScreenNtest_Contains_BloodFlowData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0, 0, 0, 0, 0) + + +def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_FlowSetPoint ).text), "{:.0f}".format( vFlowSetPt )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MeasuredFlow ).text), "{:.2f}".format( vMeasFlow )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_RotorSpeed ).text), "{:.2f}".format( vRotSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorSpeed ).text), "{:.2f}".format( vMotSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMCSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMCCurr )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_PWMDutyCycle ).text), "%" "{:.2f}".format( vPWM )) + + +def main(): + utils.tstStart(__file__) + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_BloodFlowData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentBloodFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + + denaliMessages.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) + test_values (100, 200, 300, 400, 500, 600, 700) + + # Coverage + denaliMessages.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700) + test_values (100, 200, 300, 400, 500, 600, 700) + + denaliMessages.setTreatmentBloodFlowRate(0, 0, 0, 0, 0, 0, 0) + test_values (0, 0, 0, 0, 0, 0, 0) + + utils.tstDone() Index: tst_HDInletFlowData/test.py =================================================================== diff -u --- tst_HDInletFlowData/test.py (revision 0) +++ tst_HDInletFlowData/test.py (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -0,0 +1,62 @@ +# -*- 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_HDInletFlowData +# date 2020/08/20 +# author Behrouz NematiPour +# + +import names +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + + +def gotoScreenNtest_Contains_InletFlowData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0, 0, 0, 0, 0) + + +def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_FlowSetPoint ).text), "{:.2f}".format( vFlowSetPt )) + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MeasuredFlow ).text), "{:.2f}".format( vMeasFlow )) + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_RotorSpeed ).text), "{:.2f}".format( vRotSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorSpeed ).text), "{:.2f}".format( vMotSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMCSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMCCurr )) + test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_PWMDutyCycle ).text), "%" "{:.2f}".format( vPWM )) + + +def main(): + utils.tstStart(__file__) + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_InletFlowData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6) + + denaliMessages.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) + test_values (100, 200, 300, 400, 500, 600, 700) + + # Coverage + denaliMessages.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700) + test_values (100, 200, 300, 400, 500, 600, 700) + + denaliMessages.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0) + test_values (0, 0, 0, 0, 0, 0, 0) + + utils.tstDone() Index: tst_HDOperationModeData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- tst_HDOperationModeData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_HDOperationModeData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -33,15 +33,15 @@ ] def gotoScreenNtest_Contains_HDOperationModeData(): - mouseClick(waitForObject(names.o_mainMenu_settings)) + mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0) def test_values(vOpMode): if (vOpMode < len(opModes)): - test.compare(str(waitForObjectExists(names.o_settingsHome_HDOperationModeData_OpMode).text), opModes[vOpMode]) + test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), opModes[vOpMode]) else: - test.compare(str(waitForObjectExists(names.o_settingsHome_HDOperationModeData_OpMode).text), "UNDEFINED [{}]".format(vOpMode)) + test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), "UNDEFINED [{}]".format(vOpMode)) def main(): Index: tst_HDOutletFlowData/test.py =================================================================== diff -u -r2ef15fa5a3d4c92513a2b99733adfa2fff11478e -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- tst_HDOutletFlowData/test.py (.../test.py) (revision 2ef15fa5a3d4c92513a2b99733adfa2fff11478e) +++ tst_HDOutletFlowData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -21,18 +21,18 @@ def gotoScreenNtest_Contains_OutletFlowData(): - mouseClick(waitForObject(names.o_mainMenu_settings)) + mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0, 0, 0, 0, 0) def test_values(vRefUFVol, vMeasUFVol, vRotorSpeed, vMotorSpeed, vMotorCtlSpeed, vMotorCtlCurrent, vPWMDtCycle): - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_RefUFVol ).text), "{:.2f}".format(utils.ml2l(vRefUFVol ))) - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_MeasUFVol ).text), "{:.2f}".format(utils.ml2l(vMeasUFVol ))) - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_RotorSpeed ).text), "{:.2f}".format( vRotorSpeed )) - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_MotorSpeed ).text), "{:.2f}".format( vMotorSpeed )) - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMotorCtlSpeed )) - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMotorCtlCurrent )) - test.compare(str(waitForObjectExists(names.o_settingsHome_OutletFlowData_PWMDtCycle ).text), "%" "{:.2f}".format( vPWMDtCycle )) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RefUFVol ).text), "{:.2f}".format(utils.ml2l(vRefUFVol ))) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MeasUFVol ).text), "{:.2f}".format(utils.ml2l(vMeasUFVol ))) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RotorSpeed ).text), "{:.2f}".format( vRotorSpeed )) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorSpeed ).text), "{:.2f}".format( vMotorSpeed )) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMotorCtlSpeed )) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMotorCtlCurrent )) + test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_PWMDtCycle ).text), "%" "{:.2f}".format( vPWMDtCycle )) def main(): Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u -r4aea809c4c3eaaeb674f79f550aff589e61d6739 -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -21,16 +21,16 @@ def gotoScreenNtest_Contains_PressureOcclusionData(): - mouseClick(waitForObject(names.o_mainMenu_settings)) + mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0, 0, 0) def test_values(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion): - test.compare(str(waitForObjectExists(names.o_settingsHome_PressureOcclusionData_ArterialPressure ).text), "{:.2f}".format(vArterialPressure )) - test.compare(str(waitForObjectExists(names.o_settingsHome_PressureOcclusionData_VenousPressure ).text), "{:.2f}".format(vVenousPressure )) - test.compare(str(waitForObjectExists(names.o_settingsHome_PressureOcclusionData_BloodPumpOcclusion ).text), "{:.2f}".format(vBloodPumpOcclusion )) - test.compare(str(waitForObjectExists(names.o_settingsHome_PressureOcclusionData_DialysateInletPumpOcclusion ).text), "{:.2f}".format(vDialysateInletPumpOcclusion )) - test.compare(str(waitForObjectExists(names.o_settingsHome_PressureOcclusionData_DialysateOutletPumpOcclusion).text), "{:.2f}".format(vDialysateOutletPumpOcclusion)) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_ArterialPressure ).text), "{:.2f}".format(vArterialPressure )) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_VenousPressure ).text), "{:.2f}".format(vVenousPressure )) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion ).text), "{:.2f}".format(vBloodPumpOcclusion )) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion ).text), "{:.2f}".format(vDialysateInletPumpOcclusion )) + test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion).text), "{:.2f}".format(vDialysateOutletPumpOcclusion)) def main(): Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -rc5a7028efbf4a343a6ce3d92d3d534a5e15d784c -r211e5b6d52df1fb7af4b50ed652afdd373a64231 --- tst_TreatmentStatesData/test.py (.../test.py) (revision c5a7028efbf4a343a6ce3d92d3d534a5e15d784c) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 211e5b6d52df1fb7af4b50ed652afdd373a64231) @@ -40,13 +40,11 @@ def test_values(vSubMode, vUFState, vSalineState): # these test cases are not always depending to each other if (vSubMode == txStates.TREATMENT_DIALYSIS_STATE_NOT): - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_section ).visible, True ) - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage ).visible, True ) - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_second ).visible, True ) - test.compare( findObject (names.o_treatmentStart_treatmentTime_notification ).visible, False) + test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage ).visible, vSalineState != txStates.SALINE_START_STATE ) + test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_second ).visible, vSalineState != txStates.SALINE_START_STATE ) + test.compare( findObject (names.o_treatmentStart_treatmentTime_notification ).visible, vSalineState == txStates.SALINE_START_STATE ) if (vSubMode == txStates.TREATMENT_DIALYSIS_STATE ): - test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_section ).visible, True ) test.compare( findObject (names.o_treatmentStart_treatmentTime_arrowImage ).visible, False) test.compare( findObject (names.o_treatmentStart_treatmentTime_second ).visible, False) test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_notification ).visible, True ) @@ -65,18 +63,20 @@ test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineStart ).text.text), "START BOLUS") test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineNotification ).text ), "Maximum cumulative saline bolus volume delivered") test.compare( waitForObjectExists(names.o_treatmentStart_SalineNotification ).visible, True) - print(7) # in all the other cases it should be enabled test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, vSalineState != txStates.SALINE_DISABLE_STATE) - if (vSalineState == txStates.SALINE_STOP_STATE ): test.compare( waitForObjectExists(names.o_treatmentStart_ultrafiltration_section ).isTouchable, True ) utils.waitForGUI() mouseClick ( waitForObject (names.o_treatmentStart_ultrafiltration_section)) utils.waitForGUI() - test.compare( findObject (names.o_treatmentAdjustmentUltrafiltrationStart_Screen ).visible , True ) + if (vUFState == txStates.UF_PAUSED_STATE ): + test.compare( findObject (names.o_treatmentAdjustmentUltrafiltrationPaused_Screen ).visible , True ) + else: + test.compare( findObject (names.o_treatmentAdjustmentUltrafiltrationStart_Screen ).visible , True ) + mouseClick ( waitForObject (names.o_closeButton)) if (vSalineState == txStates.SALINE_START_STATE ):