Index: shared/scripts/names.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- shared/scripts/names.py (.../names.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ shared/scripts/names.py (.../names.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -12,6 +12,8 @@ # author Behrouz NematiPour # +AUT_NAME = "denaliSquish" # Squish + # Top Parents o_QQuickView = { "type": "QQuickView"} o_Overlay = {"container": o_QQuickView, "type": "Overlay" } Index: suite.conf =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- suite.conf (.../suite.conf) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ suite.conf (.../suite.conf) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -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 +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 VERSION=3 WRAPPERS=Qt Index: tst_Alarm/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Alarm/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Alarm/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -19,7 +19,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) denaliMessages.sendAlarm(3, 26, 2, 0, 0) Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -rb11714354c2bdc8df3cfd03bb9c46f688a8b7c0b -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_CANBusFaultCount/test.py (.../test.py) (revision b11714354c2bdc8df3cfd03bb9c46f688a8b7c0b) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -28,7 +28,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_CANBusFaultCount() Index: tst_HomeScreen/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_HomeScreen/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_HomeScreen/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -18,7 +18,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) test.compare( waitForObjectExists(names.o_treatmentHome).visible, True) Index: tst_ServiceShutdown/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_ServiceShutdown/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_ServiceShutdown/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -83,7 +83,7 @@ utils.tstStart() # Start the Application - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) Index: tst_TreatmentScreen/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_TreatmentScreen/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_TreatmentScreen/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -18,7 +18,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -27,7 +27,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_FlowsSection() Index: tst_Treatment_Adjustment_Duration/test.py =================================================================== diff -u -rd53166805a654f22111b6af975018b61520dfdba -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision d53166805a654f22111b6af975018b61520dfdba) +++ tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -26,7 +26,7 @@ def main(): - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.tstStart() utils.waitForGUI(1) Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -rf8aa7703738b9dce05d14c319fe2a4473b9c2a5b -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision f8aa7703738b9dce05d14c319fe2a4473b9c2a5b) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -133,9 +133,9 @@ def closeScreen(): - utils.waitForGUI(1) + utils.waitForGUI() mouseClick(waitForObject(o_closeButton)) - utils.waitForGUI(1) + utils.waitForGUI() def testScreen_Paused_Notification(): @@ -319,7 +319,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration() Index: tst_Treatment_BloodFlowRate/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_BloodFlowRate/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Treatment_BloodFlowRate/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -23,7 +23,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_FlowsSection() Index: tst_Treatment_DialysateFlowRate/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_DialysateFlowRate/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Treatment_DialysateFlowRate/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -23,7 +23,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_FlowsSection() Index: tst_Treatment_LoadCellReadings/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_LoadCellReadings/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_LoadCellReadings/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -31,7 +31,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_LoadCellReadings() Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -33,7 +33,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_FlowsSection() Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -23,7 +23,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_PressureOcclusion() Index: tst_Treatment_Section_BloodDialysate/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -18,7 +18,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) # Goto Treatment Screen Index: tst_Treatment_TemperatureSensors/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_TemperatureSensors/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_TemperatureSensors/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -37,7 +37,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_TemperatureSensors() Index: tst_Treatment_Time/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_Time/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_Treatment_Time/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -32,7 +32,7 @@ test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).parent.parent.parent.parent.minimum, 0) def main(): - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_TimeSection() Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) @@ -22,7 +22,7 @@ def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF): for i in range(vMinUF, vMaxUF+1, 10): - denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) + denaliMessages.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) @@ -34,7 +34,7 @@ def main(): utils.tstStart() - startApplication("denaliSquish") + startApplication(names.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration()