Index: shared/scripts/names.py =================================================================== diff -u -redafb92233ef9a8281c8133cc3882f17ac39de64 -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f --- shared/scripts/names.py (.../names.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) +++ shared/scripts/names.py (.../names.py) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -12,7 +12,7 @@ # author Behrouz NematiPour # -AUT_NAME = "denali" # Squish +AUT_NAME = "denaliSquish" # Squish # Top Parents o_QQuickView = { "type": "QQuickView"} @@ -181,10 +181,27 @@ o_managerHome_primaryHeaterInternal = {"container": o_managerHome, "objectName": "_DGTemperatures10", "type": "Text"} o_managerHome_trimmerHeaterInternal = {"container": o_managerHome, "objectName": "_DGTemperatures11", "type": "Text"} -# Setting CANBusFaultCountText -o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "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} +# 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} +# 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} +# 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"} +# Setting CANBusFaultCountText +o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } + Index: suite.conf =================================================================== diff -u -redafb92233ef9a8281c8133cc3882f17ac39de64 -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f --- suite.conf (.../suite.conf) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) +++ suite.conf (.../suite.conf) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -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_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_CANBusFaultCount tst_Treatment_DGDrainPump tst_Treatment_DGHeaters tst_Treatment_DGLoadCellReadings tst_Treatment_DGPressure tst_Treatment_DGTemperatureSensors tst_Treatment_DGROPump tst_Alarm VERSION=3 WRAPPERS=Qt Index: tst_Internals/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f --- tst_Internals/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Internals/test.py (.../test.py) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -14,12 +14,19 @@ import utils import unittests - +import denaliMessages +import names def main(): utils.tstStart() + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + unittests.testPythonVersion() unittests.testcrc8() + denaliMessages.setHDDebugText("01234567890123456789012345678901234567810123456789") + denaliMessages.setDGDebugText("01234567890123456789012345678901234567820123456789") + utils.tstDone() \ No newline at end of file Index: tst_Treatment_DGDrainPump/test.py =================================================================== diff -u --- tst_Treatment_DGDrainPump/test.py (revision 0) +++ tst_Treatment_DGDrainPump/test.py (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -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_Treatment_DG_DrainPump +# date 2020/07/19 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGDrainPump(): + mouseClick(waitForObject(names.o_mainMenu_manager)) + test_values(0, 0) + + +def test_values(vRPM, vDAC): + test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPump_RPM).text), "{}".format(vRPM)) + test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPump_DAC).text), "{}".format(vDAC)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGDrainPump() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentDGDrainPump(i, i + step * 1) + test_values (i, i + step * 1) + + + denaliMessages.setTreatmentDGDrainPump(100, 200) + test_values (100, 200) + + denaliMessages.setTreatmentDGDrainPump(100, 200) # Coverage + test_values (100, 200) + + + denaliMessages.setTreatmentDGDrainPump(0, 0) + test_values (0, 0) + + utils.tstDone() + Index: tst_Treatment_DGHeaters/test.py =================================================================== diff -u --- tst_Treatment_DGHeaters/test.py (revision 0) +++ tst_Treatment_DGHeaters/test.py (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -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: tst_Treatment_DGLoadCellReadings/test.py =================================================================== diff -u --- tst_Treatment_DGLoadCellReadings/test.py (revision 0) +++ tst_Treatment_DGLoadCellReadings/test.py (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -0,0 +1,57 @@ +# -*- 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_LoadCellReadings +# date 2020/06/21 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_LoadCellReadings(): + 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_reservoir1Prim).text), "{:.2f}".format(vRs1Prim)) + test.compare(str(waitForObjectExists(names.o_managerHome_reservoir1Bkup).text), "{:.2f}".format(vRs1Bkup)) + test.compare(str(waitForObjectExists(names.o_managerHome_reservoir2Prim).text), "{:.2f}".format(vRs2Prim)) + test.compare(str(waitForObjectExists(names.o_managerHome_reservoir2Bkup).text), "{:.2f}".format(vRs2Bkup)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_LoadCellReadings() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentLoadCellReadings(i, i + step * 1 , i + step * 2, i + step * 3) + test_values (i, i + step * 1 , i + step * 2, i + step * 3) + + + denaliMessages.setTreatmentLoadCellReadings(100, 200, 300, 400) + test_values (100, 200, 300, 400) + + denaliMessages.setTreatmentLoadCellReadings(100, 200, 300, 400) # Coverage + test_values (100, 200, 300, 400) + + + denaliMessages.setTreatmentLoadCellReadings(0, 0, 0, 0) + test_values (0, 0, 0, 0) + + utils.tstDone() + Index: tst_Treatment_DGPressure/test.py =================================================================== diff -u --- tst_Treatment_DGPressure/test.py (revision 0) +++ tst_Treatment_DGPressure/test.py (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -0,0 +1,57 @@ +# -*- 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_DGPressure +# date 2020/07/19 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_DGPressure(): + 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_DGPressure_ROInletPSI ).text), "{:.2f}".format(vROInletPSI )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressure_ROOutletPSI ).text), "{:.2f}".format(vROOutletPSI )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressure_DrainInletPSI ).text), "{:.2f}".format(vDrainInletPSI )) + test.compare(str(waitForObjectExists(names.o_managerHome_DGPressure_DrainOutletPSI).text), "{:.2f}".format(vDrainOutletPSI)) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_DGPressure() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step ): + denaliMessages.setTreatmentDGPressure(i, i + step * 1 , i + step * 2, i + step * 3) + test_values (i, i + step * 1 , i + step * 2, i + step * 3) + + + denaliMessages.setTreatmentDGPressure(100, 200, 300, 400) + test_values (100, 200, 300, 400) + + denaliMessages.setTreatmentDGPressure(100, 200, 300, 400) # Coverage + test_values (100, 200, 300, 400) + + + denaliMessages.setTreatmentDGPressure(0, 0, 0, 0) + test_values (0, 0, 0, 0) + + utils.tstDone() + Index: tst_Treatment_DGROPump/test.py =================================================================== diff -u --- tst_Treatment_DGROPump/test.py (revision 0) +++ tst_Treatment_DGROPump/test.py (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -0,0 +1,52 @@ +# -*- 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/21 +# 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 + step * 0, i + step * 1, i + step * 2) + test_values (i + step * 0, i + step * 1, i + step * 2) + + denaliMessages.setDGROPumpData(100, 200, 300) + test_values (100, 200, 300) + + # Coverage + denaliMessages.setDGROPumpData(100, 200, 300) + test_values (100, 200, 300) + + denaliMessages.setDGROPumpData(0, 0, 0) + test_values (0, 0, 0) + + + utils.tstDone() Index: tst_Treatment_DGTemperatureSensors/test.py =================================================================== diff -u --- tst_Treatment_DGTemperatureSensors/test.py (revision 0) +++ tst_Treatment_DGTemperatureSensors/test.py (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) @@ -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_Treatment_TemperatureSensors +# date 2020/06/21 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_TemperatureSensors(): + 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, vPrimmerHeaterThermoCouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vTrimaryHeaterInternal ,vTrimmerHeaterInternal): + test.compare(str(waitForObjectExists(names.o_managerHome_inletPrimaryHeater ).text), "{:.2f}".format(vInletPrimaryHeater )) + test.compare(str(waitForObjectExists(names.o_managerHome_outletPrimaryHeater ).text), "{:.2f}".format(vOutletPrimaryHeater )) + test.compare(str(waitForObjectExists(names.o_managerHome_conductivitySensor1 ).text), "{:.2f}".format(vConductivitySensor1 )) + test.compare(str(waitForObjectExists(names.o_managerHome_conductivitySensor2 ).text), "{:.2f}".format(vConductivitySensor2 )) + test.compare(str(waitForObjectExists(names.o_managerHome_outletRedundancy ).text), "{:.2f}".format(vOutletRedundancy )) + test.compare(str(waitForObjectExists(names.o_managerHome_inletDialysate ).text), "{:.2f}".format(vInletDialysate )) + test.compare(str(waitForObjectExists(names.o_managerHome_primaryHeaterThermoCouple).text), "{:.2f}".format(vPrimaryHeaterThermoCouple)) + test.compare(str(waitForObjectExists(names.o_managerHome_trimmerHeaterThermoCouple).text), "{:.2f}".format(vPrimmerHeaterThermoCouple)) + test.compare(str(waitForObjectExists(names.o_managerHome_primaryHeaterColdJunction).text), "{:.2f}".format(vPrimaryHeaterColdJunction)) + test.compare(str(waitForObjectExists(names.o_managerHome_trimmerHeaterColdJunction).text), "{:.2f}".format(vTrimmerHeaterColdJunction)) + test.compare(str(waitForObjectExists(names.o_managerHome_primaryHeaterInternal ).text), "{:.2f}".format(vTrimaryHeaterInternal )) + test.compare(str(waitForObjectExists(names.o_managerHome_trimmerHeaterInternal ).text), "{:.2f}".format(vTrimmerHeaterInternal )) + + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_TemperatureSensors() + utils.waitForGUI(1) + + step = 10 + for i in range ( 10, 500, step): + denaliMessages.setTreatmentTemperatureSensors(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.setTreatmentTemperatureSensors(10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65) + test_values (10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65) + + denaliMessages.setTreatmentTemperatureSensors(100, 151, 202, 253, 304, 355, 406, 457, 508, 559, 610, 611) + test_values (100, 151, 202, 253, 304, 355, 406, 457, 508, 559, 610, 611) + + denaliMessages.setTreatmentTemperatureSensors(100, 151, 202, 253, 304, 355, 406, 457, 508, 559, 610, 611) # Coverage + test_values (100, 151, 202, 253, 304, 355, 406, 457, 508, 559, 610, 611) + + denaliMessages.setTreatmentTemperatureSensors(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() + Fisheye: Tag 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f refers to a dead (removed) revision in file `tst_Treatment_LoadCellReadings/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f refers to a dead (removed) revision in file `tst_Treatment_TemperatureSensors/test.py'. Fisheye: No comparison available. Pass `N' to diff?