Index: shared/scripts/names.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- shared/scripts/names.py (.../names.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ shared/scripts/names.py (.../names.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -12,7 +12,7 @@ # author Behrouz NematiPour # -AUT_NAME = "denaliSquish" # Squish +AUT_NAME = "denali" # Squish # Top Parents o_QQuickView = { "type": "QQuickView"} @@ -161,25 +161,25 @@ -# Settings Load Cell Readings -o_settingsHome_reservoir1Prim = {"container": o_settingsHome, "objectName": "_LoadCellReadings0", "type": "Text"} -o_settingsHome_reservoir1Bkup = {"container": o_settingsHome, "objectName": "_LoadCellReadings1", "type": "Text"} -o_settingsHome_reservoir2Prim = {"container": o_settingsHome, "objectName": "_LoadCellReadings2", "type": "Text"} -o_settingsHome_reservoir2Bkup = {"container": o_settingsHome, "objectName": "_LoadCellReadings3", "type": "Text"} +# 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"} -# Settings Temperature Sensors -o_settingsHome_inletPrimaryHeater = {"container": o_settingsHome, "objectName": "_TemperatureSensors0" , "type": "Text"} -o_settingsHome_outletPrimaryHeater = {"container": o_settingsHome, "objectName": "_TemperatureSensors1" , "type": "Text"} -o_settingsHome_conductivitySensor1 = {"container": o_settingsHome, "objectName": "_TemperatureSensors2" , "type": "Text"} -o_settingsHome_conductivitySensor2 = {"container": o_settingsHome, "objectName": "_TemperatureSensors3" , "type": "Text"} -o_settingsHome_outletRedundancy = {"container": o_settingsHome, "objectName": "_TemperatureSensors4" , "type": "Text"} -o_settingsHome_inletDialysate = {"container": o_settingsHome, "objectName": "_TemperatureSensors5" , "type": "Text"} -o_settingsHome_primaryHeaterThermoCouple = {"container": o_settingsHome, "objectName": "_TemperatureSensors6" , "type": "Text"} -o_settingsHome_trimmerHeaterThermoCouple = {"container": o_settingsHome, "objectName": "_TemperatureSensors7" , "type": "Text"} -o_settingsHome_primaryHeaterColdJunction = {"container": o_settingsHome, "objectName": "_TemperatureSensors8" , "type": "Text"} -o_settingsHome_trimmerHeaterColdJunction = {"container": o_settingsHome, "objectName": "_TemperatureSensors9" , "type": "Text"} -o_settingsHome_primaryHeaterInternal = {"container": o_settingsHome, "objectName": "_TemperatureSensors10", "type": "Text"} -o_settingsHome_trimmerHeaterInternal = {"container": o_settingsHome, "objectName": "_TemperatureSensors11", "type": "Text"} +# 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"} # Setting CANBusFaultCountText o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } Index: suite.conf =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- suite.conf (.../suite.conf) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ suite.conf (.../suite.conf) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -5,6 +5,6 @@ IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_Internals tst_HomeScreen tst_ServiceShutdown tst_TreatmentScreen tst_Treatment_Section_BloodDialysate tst_Treatment_BloodFlowRate tst_Treatment_DialysateFlowRate tst_Treatment_Time tst_Treatment_Ultrafiltration tst_Treatment_PressureOcclusion tst_Treatment_LoadCellReadings tst_Treatment_TemperatureSensors tst_Treatment_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Treatment_Adjustment_Duration tst_Treatment_Adjustment_Ultrafiltration tst_CANBusFaultCount tst_Alarm tst_case1 +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 VERSION=3 WRAPPERS=Qt Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- tst_CANBusFaultCount/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -37,7 +37,6 @@ denaliMessages.setCanBUSFaultCount(10) test_values (10) - denaliMessages.setCanBUSFaultCount(100) test_values (100) Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -8,7 +8,7 @@ # WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # file tst_Treatment_Ultrafiltration -# date 2020/04/12 +# date 2020/06/17 # author Behrouz NematiPour # Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u --- tst_Treatment_BloodDialysateFlowRate/test.py (revision 0) +++ tst_Treatment_BloodDialysateFlowRate/test.py (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -0,0 +1,79 @@ +# -*- 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_BloodDialysateFlowRate +# date 2020/04/13 +# author Behrouz NematiPour +# + +import names +import utils +import denaliMessages + +def gotoScreenNtest_Contains_FlowsSection(): + mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) + test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True) + +def main(): + utils.tstStart() + + startApplication(names.AUT_NAME) + utils.waitForGUI(1) + + gotoScreenNtest_Contains_FlowsSection() + utils.waitForGUI(1) + + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "0") + + denaliMessages.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) # coverage + denaliMessages.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "125") + + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "0") + + denaliMessages.setTreatmentBloodFlowRate(175, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "175") + + denaliMessages.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") + + denaliMessages.setTreatmentBloodFlowRate(150, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "150") + + denaliMessages.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125") + + denaliMessages.setTreatmentBloodFlowRate(200, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "200") + + denaliMessages.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125") + + denaliMessages.setTreatmentBloodFlowRate(250, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "250") + + denaliMessages.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") + + denaliMessages.setTreatmentBloodFlowRate(275, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "275") + + denaliMessages.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145") + + denaliMessages.setTreatmentBloodFlowRate(300, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "300") + + denaliMessages.setTreatmentDialysateFlowRate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "155") + + denaliMessages.setTreatmentBloodFlowRate(350, 1, 1, 1, 1, 1, 1) + test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "350") + + utils.tstDone() \ No newline at end of file Fisheye: Tag edafb92233ef9a8281c8133cc3882f17ac39de64 refers to a dead (removed) revision in file `tst_Treatment_BloodFlowRate/test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag edafb92233ef9a8281c8133cc3882f17ac39de64 refers to a dead (removed) revision in file `tst_Treatment_DialysateFlowRate/test.py'. Fisheye: No comparison available. Pass `N' to diff? Index: tst_Treatment_LoadCellReadings/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- tst_Treatment_LoadCellReadings/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_LoadCellReadings/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -17,17 +17,17 @@ import denaliMessages def gotoScreenNtest_Contains_LoadCellReadings(): - mouseClick(waitForObject(names.o_mainMenu_settings)) + 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_settingsHome_reservoir1Prim).text), "{:.2f}".format(vRs1Prim)) - test.compare(str(waitForObjectExists(names.o_settingsHome_reservoir1Bkup).text), "{:.2f}".format(vRs1Bkup)) - test.compare(str(waitForObjectExists(names.o_settingsHome_reservoir2Prim).text), "{:.2f}".format(vRs2Prim)) - test.compare(str(waitForObjectExists(names.o_settingsHome_reservoir2Bkup).text), "{:.2f}".format(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() @@ -36,17 +36,18 @@ 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(10, 20, 30, 40) - test_values (10, 20, 30, 40) - 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) Index: tst_Treatment_TemperatureSensors/test.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- tst_Treatment_TemperatureSensors/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ tst_Treatment_TemperatureSensors/test.py (.../test.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -17,21 +17,21 @@ import denaliMessages def gotoScreenNtest_Contains_TemperatureSensors(): - mouseClick(waitForObject(names.o_mainMenu_settings)) + mouseClick(waitForObject(names.o_mainMenu_manager)) def test_values(vInletPrimaryHeater, vOutletPrimaryHeater, vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, vPrimaryHeaterThermoCouple, vPrimmerHeaterThermoCouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vTrimaryHeaterInternal ,vTrimmerHeaterInternal): - test.compare(str(waitForObjectExists(names.o_settingsHome_inletPrimaryHeater ).text), "{:.2f}".format(vInletPrimaryHeater )) - test.compare(str(waitForObjectExists(names.o_settingsHome_outletPrimaryHeater ).text), "{:.2f}".format(vOutletPrimaryHeater )) - test.compare(str(waitForObjectExists(names.o_settingsHome_conductivitySensor1 ).text), "{:.2f}".format(vConductivitySensor1 )) - test.compare(str(waitForObjectExists(names.o_settingsHome_conductivitySensor2 ).text), "{:.2f}".format(vConductivitySensor2 )) - test.compare(str(waitForObjectExists(names.o_settingsHome_outletRedundancy ).text), "{:.2f}".format(vOutletRedundancy )) - test.compare(str(waitForObjectExists(names.o_settingsHome_inletDialysate ).text), "{:.2f}".format(vInletDialysate )) - test.compare(str(waitForObjectExists(names.o_settingsHome_primaryHeaterThermoCouple).text), "{:.2f}".format(vPrimaryHeaterThermoCouple)) - test.compare(str(waitForObjectExists(names.o_settingsHome_trimmerHeaterThermoCouple).text), "{:.2f}".format(vPrimmerHeaterThermoCouple)) - test.compare(str(waitForObjectExists(names.o_settingsHome_primaryHeaterColdJunction).text), "{:.2f}".format(vPrimaryHeaterColdJunction)) - test.compare(str(waitForObjectExists(names.o_settingsHome_trimmerHeaterColdJunction).text), "{:.2f}".format(vTrimmerHeaterColdJunction)) - test.compare(str(waitForObjectExists(names.o_settingsHome_primaryHeaterInternal ).text), "{:.2f}".format(vTrimaryHeaterInternal )) - test.compare(str(waitForObjectExists(names.o_settingsHome_trimmerHeaterInternal ).text), "{:.2f}".format(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(): @@ -43,6 +43,11 @@ 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)