Index: .project =================================================================== diff -u --- .project (revision 0) +++ .project (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,17 @@ + + + Projects_testsuites + + + + + + org.python.pydev.PyDevBuilder + + + + + + org.python.pydev.pythonNature + + Index: .pydevproject =================================================================== diff -u --- .pydevproject (revision 0) +++ .pydevproject (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,5 @@ + + +Default +python 2.7 + Index: .settings/org.eclipse.core.resources.prefs =================================================================== diff -u --- .settings/org.eclipse.core.resources.prefs (revision 0) +++ .settings/org.eclipse.core.resources.prefs (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +encoding//tst_DGOperationMode/test.py=utf-8 +encoding//tst_DGValvesStatesData/test.py=utf-8 +encoding//tst_HDOperationModeData/test.py=utf-8 +encoding//tst_HDPressureOcclusionData/test.py=utf-8 +encoding//tst_HomeScreen/test.py=utf-8 +encoding//tst_Internals/test.py=utf-8 +encoding//tst_ServiceShutdown/test.py=utf-8 Index: _tst_DGHeatersData_/test.py =================================================================== diff -u --- _tst_DGHeatersData_/test.py (revision 0) +++ _tst_DGHeatersData_/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,54 @@ +# -*- 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_Treatment_DGHeaters +# date 2020/07/19 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGHeaters(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0) + + +def test_values(vMainPrimaryDC , vSmallPrimaryDC , vTrimmerDC): + test.compare(str(waitForObjectExists(names.o_managerHome_DGHeaters_MainPrimaryDC ).text), "{}".format(vMainPrimaryDC )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGHeaters_SmallPrimaryDC).text), "{}".format(vSmallPrimaryDC)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGHeaters_TrimmerDC ).text), "{}".format(vTrimmerDC )) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGHeaters() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentDGHeaters(i, i + step * 1, i + step * 2) + test_values (i, i + step * 1, i + step * 2) + + denaliMessages.setTreatmentDGHeaters(100, 200, 300) + test_values (100, 200, 300) + + denaliMessages.setTreatmentDGHeaters(100, 200, 300) # Coverage + test_values (100, 200, 300) + + denaliMessages.setTreatmentDGHeaters(0, 0, 0) + test_values (0, 0, 0) + + utils.tstDone() + Index: shared/scripts/names.py =================================================================== diff -u -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 --- shared/scripts/names.py (.../names.py) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) +++ shared/scripts/names.py (.../names.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -161,47 +161,75 @@ -# Manager Load Cell Readings -o_managerHome_reservoir1Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadings0", "type": "Text"} -o_managerHome_reservoir1Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadings1", "type": "Text"} -o_managerHome_reservoir2Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadings2", "type": "Text"} -o_managerHome_reservoir2Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadings3", "type": "Text"} -# Manager Temperature Sensors -o_managerHome_inletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperatures0" , "type": "Text"} -o_managerHome_outletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperatures1" , "type": "Text"} -o_managerHome_conductivitySensor1 = {"container": o_managerHome, "objectName": "_DGTemperatures2" , "type": "Text"} -o_managerHome_conductivitySensor2 = {"container": o_managerHome, "objectName": "_DGTemperatures3" , "type": "Text"} -o_managerHome_outletRedundancy = {"container": o_managerHome, "objectName": "_DGTemperatures4" , "type": "Text"} -o_managerHome_inletDialysate = {"container": o_managerHome, "objectName": "_DGTemperatures5" , "type": "Text"} -o_managerHome_primaryHeaterThermoCouple = {"container": o_managerHome, "objectName": "_DGTemperatures6" , "type": "Text"} -o_managerHome_trimmerHeaterThermoCouple = {"container": o_managerHome, "objectName": "_DGTemperatures7" , "type": "Text"} -o_managerHome_primaryHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperatures8" , "type": "Text"} -o_managerHome_trimmerHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperatures9" , "type": "Text"} -o_managerHome_primaryHeaterInternal = {"container": o_managerHome, "objectName": "_DGTemperatures10", "type": "Text"} -o_managerHome_trimmerHeaterInternal = {"container": o_managerHome, "objectName": "_DGTemperatures11", "type": "Text"} -# Manager DG Drain Pump -o_managerHome_DGDrainPump_RPM = {"container": o_managerHome, "objectName": "_DGDrainPump0", "type": "Text", "visible": True} -o_managerHome_DGDrainPump_DAC = {"container": o_managerHome, "objectName": "_DGDrainPump1", "type": "Text", "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"} -# Manager DG Heaters -o_managerHome_DGHeaters_MainPrimaryDC = {"container": o_managerHome, "objectName": "_DGHeaters0", "type": "Text", "visible": True} -o_managerHome_DGHeaters_SmallPrimaryDC = {"container": o_managerHome, "objectName": "_DGHeaters1", "type": "Text", "visible": True} -o_managerHome_DGHeaters_TrimmerDC = {"container": o_managerHome, "objectName": "_DGHeaters2", "type": "Text", "visible": True} +# 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"} -# Manager DG RO Pump -o_managerHome_DGROPumpData_SetPtPressure = {"container": o_managerHome, "objectName": "_DGROPump0", "type": "Text", "visible": True} -o_managerHome_DGROPumpData_FlowRate = {"container": o_managerHome, "objectName": "_DGROPump1", "type": "Text", "visible": True} -o_managerHome_DGROPumpData_PWM = {"container": o_managerHome, "objectName": "_DGROPump2", "type": "Text", "visible": True} +# DGDrainPumpData +o_managerHome_DGDrainPumpData_SetPtRPM = {"container": o_managerHome, "objectName": "_DGDrainPumpData0", "type": "Text"} +o_managerHome_DGDrainPumpData_DACValue = {"container": o_managerHome, "objectName": "_DGDrainPumpData1", "type": "Text"} -# Manager DG Pressure -o_managerHome_DGPressure_ROInletPSI = {"container": o_managerHome, "objectName": "_DGPressures0", "type": "Text"} -o_managerHome_DGPressure_ROOutletPSI = {"container": o_managerHome, "objectName": "_DGPressures1", "type": "Text"} -o_managerHome_DGPressure_DrainInletPSI = {"container": o_managerHome, "objectName": "_DGPressures2", "type": "Text"} -o_managerHome_DGPressure_DrainOutletPSI = {"container": o_managerHome, "objectName": "_DGPressures3", "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" } +o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } Index: suite.conf =================================================================== diff -u -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 --- suite.conf (.../suite.conf) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) +++ suite.conf (.../suite.conf) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -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_CANBusFaultCount tst_Treatment_DGDrainPump tst_Treatment_DGHeaters tst_Treatment_DGLoadCellReadings tst_Treatment_DGPressure tst_Treatment_DGTemperatureSensors tst_Treatment_DGROPump 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_Alarm VERSION=3 WRAPPERS=Qt Index: tst_DGDrainPumpData/test.py =================================================================== diff -u --- tst_DGDrainPumpData/test.py (revision 0) +++ tst_DGDrainPumpData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,54 @@ +# -*- 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_DGDrainPumpData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGDrainPumpData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0) + + +def test_values(vSetPtRPM, vDACValue): + test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPumpData_SetPtRPM).text), "{:.0f}".format(vSetPtRPM)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPumpData_DACValue).text), "{:.0f}".format(vDACValue)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGDrainPumpData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGDrainPumpData(i, i + step * 1) + test_values (i, i + step * 1) + + denaliMessages.setDGDrainPumpData(100, 200) + test_values (100, 200) + + denaliMessages.setDGDrainPumpData(100, 200) + test_values (100, 200) + + # Coverage + denaliMessages.setDGDrainPumpData(0, 0) + test_values (0, 0) + + utils.tstDone() + Index: tst_DGHeatersData/test.py =================================================================== diff -u --- tst_DGHeatersData/test.py (revision 0) +++ tst_DGHeatersData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,55 @@ +# -*- 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_DGHeatersData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGHeatersData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0) + + +def test_values(vMainPriMaryDC, vSmallPrimaryDC, vTrimmerDC): + test.compare(str(waitForObjectExists(names.o_managerHome_DGHeatersData_MainPriMaryDC ).text), "{:.0f}".format(vMainPriMaryDC )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGHeatersData_SmallPrimaryDC).text), "{:.0f}".format(vSmallPrimaryDC)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGHeatersData_TrimmerDC ).text), "{:.0f}".format(vTrimmerDC )) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGHeatersData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGHeatersData(i, i + step * 1, i + step * 2) + test_values (i, i + step * 1, i + step * 2) + + denaliMessages.setDGHeatersData(100, 200, 300) + test_values (100, 200, 300) + + denaliMessages.setDGHeatersData(100, 200, 300) + test_values (100, 200, 300) + + # Coverage + denaliMessages.setDGHeatersData(0, 0, 0) + test_values (0, 0, 0) + + utils.tstDone() + Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u --- tst_DGLoadCellReadingsData/test.py (revision 0) +++ tst_DGLoadCellReadingsData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,56 @@ +# -*- 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_DGLoadCellReadingsData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGLoadCellReadingsData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0, 0) + + +def test_values(vRs1Prim, vRs1Bkup, vRs2Prim, vRs2Bkup): + test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs1Prim).text), "{:.2f}".format(vRs1Prim)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs1Bkup).text), "{:.2f}".format(vRs1Bkup)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs2Prim).text), "{:.2f}".format(vRs2Prim)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs2Bkup).text), "{:.2f}".format(vRs2Bkup)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGLoadCellReadingsData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGLoadCellReadingsData(i, i + step * 1, i + step * 2, i + step * 3) + test_values (i, i + step * 1, i + step * 2, i + step * 3) + + denaliMessages.setDGLoadCellReadingsData(100, 200, 300, 400) + test_values (100, 200, 300, 400) + + denaliMessages.setDGLoadCellReadingsData(100, 200, 300, 400) + test_values (100, 200, 300, 400) + + # Coverage + denaliMessages.setDGLoadCellReadingsData(0, 0, 0, 0) + test_values (0, 0, 0, 0) + + utils.tstDone() + Index: tst_DGOperationMode/test.py =================================================================== diff -u --- tst_DGOperationMode/test.py (revision 0) +++ tst_DGOperationMode/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,75 @@ +# -*- 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_DGOperationMode +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +opModes = [ + "DG_MODE_FAUL" , + "DG_MODE_SERV" , + "DG_MODE_INIT" , + "DG_MODE_STAN" , + "DG_MODE_SOLO" , + "DG_MODE_CIRC" , + "DG_MODE_FILL" , + "DG_MODE_DRAI" , + "DG_MODE_FLUS" , + "DG_MODE_HEAT" , + "DG_MODE_CHEM" , + "DG_MODE_NLEG" +] + +def gotoScreenNtest_Contains_DGOperationModeData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0) + + +def test_values(vDGOpMode): + if (vDGOpMode < len(opModes)): + test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), opModes[vDGOpMode]) + else: + test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), "UNDEFINED [{}]".format(vDGOpMode)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGOperationModeData() + utils.waitForGUI(1) + + step = 1 + for i in range ( 0, len(opModes), step): + denaliMessages.setDGOperationMode(i) + test_values (i) + + denaliMessages.setDGOperationMode(1) + test_values (1) + + # Coverage + denaliMessages.setDGOperationMode(1) + test_values (1) + + denaliMessages.setDGOperationMode(0) + test_values (0) + + outOfRangeCheck = len(opModes) + 1 + denaliMessages.setDGOperationMode(outOfRangeCheck) + test_values (outOfRangeCheck) + + utils.tstDone() + Index: tst_DGPressureData/test.py =================================================================== diff -u --- tst_DGPressureData/test.py (revision 0) +++ tst_DGPressureData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,56 @@ +# -*- 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_DGPressuresData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGPressuresData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0, 0) + + +def test_values(vROInletPSI, vROOutletPSI, vDrainInletPSI, vDrainOutletPSI): + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_ROInletPSI ).text), "{:.2f}".format(vROInletPSI )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_ROOutletPSI ).text), "{:.2f}".format(vROOutletPSI )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_DrainInletPSI ).text), "{:.2f}".format(vDrainInletPSI )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_DrainOutletPSI).text), "{:.2f}".format(vDrainOutletPSI)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGPressuresData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGPressuresData(i, i + step * 1, i + step * 2, i + step * 3) + test_values (i, i + step * 1, i + step * 2, i + step * 3) + + denaliMessages.setDGPressuresData(100, 200, 300, 400) + test_values (100, 200, 300, 400) + + denaliMessages.setDGPressuresData(100, 200, 300, 400) + test_values (100, 200, 300, 400) + + # Coverage + denaliMessages.setDGPressuresData(0, 0, 0, 0) + test_values (0, 0, 0, 0) + + utils.tstDone() + Index: tst_DGROPumpData/test.py =================================================================== diff -u --- tst_DGROPumpData/test.py (revision 0) +++ tst_DGROPumpData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,55 @@ +# -*- 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_DGROPumpData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGROPumpData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0) + + +def test_values(vSetPtPressure, vFlowRate, vPWM): + test.compare(str(waitForObjectExists(names.o_managerHome_DGROPumpData_SetPtPressure).text), "{:.0f}".format(vSetPtPressure)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGROPumpData_FlowRate ).text), "{:.2f}".format(vFlowRate )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGROPumpData_PWM ).text), "{:.2f}".format(vPWM )) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGROPumpData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGROPumpData(i, i + step * 1, i + step * 2) + test_values (i, i + step * 1, i + step * 2) + + denaliMessages.setDGROPumpData(100, 200, 300) + test_values (100, 200, 300) + + denaliMessages.setDGROPumpData(100, 200, 300) + test_values (100, 200, 300) + + # Coverage + denaliMessages.setDGROPumpData(0, 0, 0) + test_values (0, 0, 0) + + utils.tstDone() + Index: tst_DGReservoirData/test.py =================================================================== diff -u --- tst_DGReservoirData/test.py (revision 0) +++ tst_DGReservoirData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,55 @@ +# -*- 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_DGReservoirData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGReservoirData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0) + + +def test_values(vActiveReservoir, vFillToVolML, vDrainToVolML): + test.compare(str(waitForObjectExists(names.o_managerHome_DGReservoirData_ActiveReservoir).text), "{:.0f}".format(vActiveReservoir)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGReservoirData_FillToVolML ).text), "{:.0f}".format(vFillToVolML )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGReservoirData_DrainToVolML ).text), "{:.0f}".format(vDrainToVolML )) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGReservoirData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGReservoirData(i, i + step * 1, i + step * 2) + test_values (i, i + step * 1, i + step * 2) + + denaliMessages.setDGReservoirData(100, 200, 300) + test_values (100, 200, 300) + + denaliMessages.setDGReservoirData(100, 200, 300) + test_values (100, 200, 300) + + # Coverage + denaliMessages.setDGReservoirData(0, 0, 0) + test_values (0, 0, 0) + + utils.tstDone() + Index: tst_DGTemperaturesData/test.py =================================================================== diff -u --- tst_DGTemperaturesData/test.py (revision 0) +++ tst_DGTemperaturesData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,64 @@ +# -*- 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_DGTemperaturesData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGTemperaturesData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + + +def test_values(vInletPrimaryHeater, vOutletPrimaryHeater, vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature): + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_InletPrimaryHeater ).text), "{:.2f}".format(vInletPrimaryHeater )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_OutletPrimaryHeater ).text), "{:.2f}".format(vOutletPrimaryHeater )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_ConductivitySensor1 ).text), "{:.2f}".format(vConductivitySensor1 )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_ConductivitySensor2 ).text), "{:.2f}".format(vConductivitySensor2 )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_OutletRedundancy ).text), "{:.2f}".format(vOutletRedundancy )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_InletDialysate ).text), "{:.2f}".format(vInletDialysate )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_PrimaryHeaterThermocouple ).text), "{:.2f}".format(vPrimaryHeaterThermocouple )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_TrimmerHeaterThermocouple ).text), "{:.2f}".format(vTrimmerHeaterThermocouple )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_PrimaryHeaterColdJunction ).text), "{:.2f}".format(vPrimaryHeaterColdJunction )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_TrimmerHeaterColdJunction ).text), "{:.2f}".format(vTrimmerHeaterColdJunction )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_PrimaryHeaterInternalTemperature).text), "{:.2f}".format(vPrimaryHeaterInternalTemperature)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature).text), "{:.2f}".format(vTrimmerHeaterInternalTemperature)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGTemperaturesData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setDGTemperaturesData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6, i + step * 7, i + step * 8, i + step * 9, i + step * 10, i + step * 11) + test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6, i + step * 7, i + step * 8, i + step * 9, i + step * 10, i + step * 11) + + denaliMessages.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + + denaliMessages.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + + # Coverage + denaliMessages.setDGTemperaturesData(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + test_values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + + utils.tstDone() + Index: tst_DGValvesStatesData/test.py =================================================================== diff -u --- tst_DGValvesStatesData/test.py (revision 0) +++ tst_DGValvesStatesData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,54 @@ +# -*- 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_DGValvesStatesData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +valvesBitLen = 12 +def gotoScreenNtest_Contains_DGValvesStatesData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0) + + +def test_values(vValvesStates): + test.compare(str(waitForObjectExists(names.o_managerHome_DGValvesStatesData_ValvesStates).text), "{0:012b}".format(vValvesStates)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGValvesStatesData() + utils.waitForGUI(1) + + denaliMessages.setDGValvesStates(1) + test_values (1) + + denaliMessages.setDGValvesStates(2) + test_values (2) + + i = 2 + while ( i < 2 ** valvesBitLen ): + denaliMessages.setDGValvesStates(i) + test_values (i) + i *= 2 + + denaliMessages.setDGValvesStates(0) + test_values (0) + + utils.tstDone() + Index: tst_HDOperationModeData/test.py =================================================================== diff -u --- tst_HDOperationModeData/test.py (revision 0) +++ tst_HDOperationModeData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,71 @@ +# -*- 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_HDOperationModeData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +opModes = [ + "MODE_FAUL" , + "MODE_SERV" , + "MODE_INIT" , + "MODE_STAN" , + "MODE_TPAR" , + "MODE_PRET" , + "MODE_TREA" , + "MODE_POST" , + "MODE_NLEG" , +] + +def gotoScreenNtest_Contains_HDOperationModeData(): + mouseClick(waitForObject(names.o_mainMenu_settings)) + test_values(0) + + +def test_values(vOpMode): + if (vOpMode < len(opModes)): + test.compare(str(waitForObjectExists(names.o_settingsHome_HDOperationModeData_OpMode).text), opModes[vOpMode]) + else: + test.compare(str(waitForObjectExists(names.o_settingsHome_HDOperationModeData_OpMode).text), "UNDEFINED [{}]".format(vOpMode)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_HDOperationModeData() + utils.waitForGUI(1) + + step = 1 + for i in range ( 0, len(opModes), step): + denaliMessages.setHDOperationModeData(i + step * 0) + test_values (i + step * 0) + + denaliMessages.setHDOperationModeData(1) + test_values (1) + + # Coverage + denaliMessages.setHDOperationModeData(1) + test_values (1) + + denaliMessages.setHDOperationModeData(0) + test_values (0) + + outOfRangeCheck = len(opModes) + 1 + denaliMessages.setHDOperationModeData(outOfRangeCheck) + test_values (outOfRangeCheck) + + utils.tstDone() Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u --- tst_HDPressureOcclusionData/test.py (revision 0) +++ tst_HDPressureOcclusionData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,56 @@ +# -*- 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_PressureOcclusionData +# date 2020/07/27 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_PressureOcclusionData(): + mouseClick(waitForObject(names.o_mainMenu_settings)) + 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)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_PressureOcclusionData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setPressureOcclusionData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) + test_values (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4) + + denaliMessages.setPressureOcclusionData(100, 200, 300, 400, 500) + test_values (100, 200, 300, 400, 500) + + # Coverage + denaliMessages.setPressureOcclusionData(100, 200, 300, 400, 500) + test_values (100, 200, 300, 400, 500) + + denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0) + test_values (0, 0, 0, 0, 0) + + utils.tstDone() Index: tst_Internals/test.py =================================================================== diff -u -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 --- tst_Internals/test.py (.../test.py) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) +++ tst_Internals/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -20,12 +20,12 @@ def main(): utils.tstStart() - startApplication(names.AUT_NAME) - utils.waitForGUI(1) unittests.testPythonVersion() unittests.testcrc8() + startApplication(names.AUT_NAME) + utils.waitForGUI(1) denaliMessages.setHDDebugText("01234567890123456789012345678901234567810123456789") denaliMessages.setDGDebugText("01234567890123456789012345678901234567820123456789") Index: tst_TreatmentStatesData/test.py =================================================================== diff -u --- tst_TreatmentStatesData/test.py (revision 0) +++ tst_TreatmentStatesData/test.py (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -0,0 +1,59 @@ +# -*- 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_TreatmentStatesData +# date 2020/07/26 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_TreatmentStatesData(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0, 0) + + +def test_values(vSubMode, vUFState, vSalineState): + # there have been no UI object associated with these values yet. + # enable it when needed. + return None + #test.compare(str(waitForObjectExists(names.o_settingsHome_TreatmentStatesData_SubMode ).text), "{:.0f}".format(vSubMode )) + #test.compare(str(waitForObjectExists(names.o_settingsHome_TreatmentStatesData_UFState ).text), "{:.0f}".format(vUFState )) + #test.compare(str(waitForObjectExists(names.o_settingsHome_TreatmentStatesData_SalineState ).text), "{:.0f}".format(vSalineState)) + + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_TreatmentStatesData() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentStatesData(i, i + step * 1, i + step * 2) + test_values (i, i + step * 1, i + step * 2) + + denaliMessages.setTreatmentStatesData(100, 200, 300) + test_values (100, 200, 300) + + # Coverage + denaliMessages.setTreatmentStatesData(100, 200, 300) + test_values (100, 200, 300) + + denaliMessages.setTreatmentStatesData(0, 0, 0) + test_values (0, 0, 0) + + utils.tstDone() + Fisheye: Tag 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 refers to a dead (removed) revision in file `tst_Treatment_DGDrainPump/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 refers to a dead (removed) revision in file `tst_Treatment_DGHeaters/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 refers to a dead (removed) revision in file `tst_Treatment_DGLoadCellReadings/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 refers to a dead (removed) revision in file `tst_Treatment_DGPressure/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 refers to a dead (removed) revision in file `tst_Treatment_DGROPump/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 refers to a dead (removed) revision in file `tst_Treatment_DGTemperatureSensors/test.py'. Fisheye: No comparison available. Pass `N' to diff? Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -29,23 +29,23 @@ 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_Ultrafiltration/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -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)