Index: shared/scripts/denaliMessages.py =================================================================== diff -u -r99810cece725cd3b1070c61756563b90b6d36650 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- shared/scripts/denaliMessages.py (.../denaliMessages.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) +++ shared/scripts/denaliMessages.py (.../denaliMessages.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -45,10 +45,10 @@ Acknow = 65535 def send_acknowledge_HD(): - subprocess.call(['cansend', 'can0', '020#A5.01.00.FF.FF.00.44.00']) + subprocess.call(['cansend', 'can0', '020#A5.01.00.FF.FF.00.19.00']) def send_acknowledge_UI(): - subprocess.call(['cansend', 'can0', '100#A5.01.00.FF.FF.00.44.00']) + subprocess.call(['cansend', 'can0', '100#A5.01.00.FF.FF.00.19.00']) def show_PowerOffDialog(): subprocess.call(['cansend', 'can0', '020#A5.01.00.01.00.01.00.38']) @@ -82,8 +82,7 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def setTreatmentParamRanges(vMinTreatmentDuration, vMaxTreatmentDuration, vMinUFVolume, vMaxUFVolume, vMinDialysateFlowRate, vMaxDialysateFlowRate): - # This message needs to be acknowledged by seq# 01.00 : just call send_acknowledge_UI after this +def setTreatmentParamRanges (vMinTreatmentDuration, vMaxTreatmentDuration, vMinUFVolume, vMaxUFVolume, vMinDialysateFlowRate, vMaxDialysateFlowRate): frames = buildSetTreatmentParamRanges(vMinTreatmentDuration, vMaxTreatmentDuration, vMinUFVolume, vMaxUFVolume, vMinDialysateFlowRate, vMaxDialysateFlowRate) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: @@ -92,7 +91,7 @@ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def buildSetTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow = 0, vRotSpd = 0, vMotSpd = 0, vMCSpd = 0, vMCCurr = 0, vPWM = 0): +def buildSetTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): msg = messageBuilder.buildMessage( GuiActionType.BloodFlow, 4 * 7, False, utils.toI32(vFlowSetPt ), utils.toF32(vMeasFlow ), @@ -104,16 +103,16 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def setTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow = 0, vRotSpd = 0, vMotSpd = 0, vMCSpd = 0, vMCCurr = 0, vPWM = 0): - frames = buildSetTreatmentBloodFlowRate(vFlowSetPt) +def setTreatmentBloodFlowRate (vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): + frames = buildSetTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: subprocess.call(['cansend', 'can0', '040#{}'.format(frame)]) waitForMessageToBeSent() ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def buildSetTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow = 0, vRotSpd = 0, vMotSpd = 0, vMCSpd = 0, vMCCurr = 0, vPWM = 0): +def buildSetTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): msg = messageBuilder.buildMessage( GuiActionType.DialysateInletFlow, 4 * 7, False, utils.toI32(vFlowSetPt ), utils.toF32(vMeasFlow ), @@ -125,8 +124,8 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def setTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow = 0, vRotSpd = 0, vMotSpd = 0, vMCSpd = 0, vMCCurr = 0, vPWM = 0): - frames = buildSetTreatmentDialysateFlowRate(vFlowSetPt) +def setTreatmentDialysateFlowRate (vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): + frames = buildSetTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: subprocess.call(['cansend', 'can0', '040#{}'.format(frame)]) @@ -143,7 +142,7 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def sendTreatmentAdjustBloodDialysateResponse(vAccepted, vReason, vBloodRate, vDialysate): +def sendTreatmentAdjustBloodDialysateResponse (vAccepted, vReason, vBloodRate, vDialysate): frames = buildTreatmentAdjustBloodDialysateResponse(vAccepted, vReason, vBloodRate, vDialysate) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: @@ -160,7 +159,7 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def setTreatmentTime(vSecsTotal, vSecsElap, vSecsRem): +def setTreatmentTime (vSecsTotal, vSecsElap, vSecsRem): frames = buildTreatmentTime(vSecsTotal, vSecsElap, vSecsRem) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: @@ -169,7 +168,7 @@ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def buildSetTreatmentUltrafiltration(vRefUFVol, vMeasUFVol = 0, vRotSpd = 0, vMotSpd = 0, vMCSpd = 0, vMCCurr = 0, vPWM = 0): +def buildSetTreatmentUltrafiltration(vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): msg = messageBuilder.buildMessage( GuiActionType.DialysateOutletFlow, 4 * 7, False, utils.toF32(vRefUFVol ), utils.toF32(vMeasUFVol ), @@ -181,8 +180,8 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def setTreatmentUltrafiltration(vRefUFVol, vMeasUFVol = 0, vRotSpd = 0, vMotSpd = 0, vMCSpd = 0, vMCCurr = 0, vPWM = 0): - frames = buildSetTreatmentUltrafiltration(vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM) +def setTreatmentUltrafiltration (vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): + frames = buildSetTreatmentUltrafiltration(vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM ) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: subprocess.call(['cansend', 'can0', '040#{}'.format(frame)]) @@ -200,7 +199,7 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def setTreatmentPressureOcclusion(vArtPres = 0, vVenPres = 0, vBPOccl = 0, vDIPOccl = 0, vDOPOccl = 0): +def setTreatmentPressureOcclusion (vArtPres, vVenPres, vBPOccl, vDIPOccl, vDOPOccl): frames = buildSetTreatmentPressureOcclusion(vArtPres, vVenPres, vBPOccl, vDIPOccl, vDOPOccl) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: @@ -219,9 +218,56 @@ ) return messageBuilder.toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def sendAlarm(vState, vTop, vEsclatesIn, vSilentExpires, vFlags): +def sendAlarm (vState, vTop, vEsclatesIn, vSilentExpires, vFlags): frames = buildAlarm(vState, vTop, vEsclatesIn, vSilentExpires, vFlags) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: subprocess.call(['cansend', 'can0', '001#{}'.format(frame)]) waitForMessageToBeSent() +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def buildAlarmTriggered(vAlarmID): + msg = messageBuilder.buildMessage( GuiActionType.AlarmTriggered, 4 , True, + utils.toI16 (vAlarmID) + ) + return messageBuilder.toFrames(msg) +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def setAlarmTriggered(vAlarmID): + frames = buildAlarmTriggered(vAlarmID) + frames = messageBuilder.toCandumpFormat(frames) + for frame in frames: + subprocess.call(['cansend', 'can0', '001#{}'.format(frame)]) + waitForMessageToBeSent() +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def buildAlarmCleared(vAlarmID): + msg = messageBuilder.buildMessage( GuiActionType.AlarmCleared, 4 , True, + utils.toI16 (vAlarmID) + ) + return messageBuilder.toFrames(msg) +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def setAlarmCleared(vAlarmID): + frames = buildAlarmCleared(vAlarmID) + frames = messageBuilder.toCandumpFormat(frames) + for frame in frames: + subprocess.call(['cansend', 'can0', '001#{}'.format(frame)]) + waitForMessageToBeSent() +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def buildUnknown(): + msg = messageBuilder.buildMessage( GuiActionType.Unknown, 0 , False) + return messageBuilder.toFrames(msg) +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def sendUnknown_HD(): + frames = buildUnknown() + frames = messageBuilder.toCandumpFormat(frames) + for frame in frames: + subprocess.call(['cansend', 'can0', '001#{}'.format(frame)]) # send from HD + waitForMessageToBeSent() +## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +def sendUnknown_DG(): + frames = buildUnknown() + frames = messageBuilder.toCandumpFormat(frames) + for frame in frames: + subprocess.call(['cansend', 'can0', '070#{}'.format(frame)]) # send from DG + waitForMessageToBeSent() Index: shared/scripts/utils.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- shared/scripts/utils.py (.../utils.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ shared/scripts/utils.py (.../utils.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -16,7 +16,7 @@ import struct ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -def waitForGUI(vDelay = 1): +def waitForGUI(vDelay = 2): time.sleep(vDelay) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ def toUXX(vValue, vByteCount, vDelimiter): Index: suite.conf =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- suite.conf (.../suite.conf) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ suite.conf (.../suite.conf) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -5,6 +5,6 @@ IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_GlobalTests 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_ParametersRange tst_Treatment_Adjustment_BloodDialysate 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_ParametersRange tst_Treatment_Adjustment_BloodDialysate tst_Alarm VERSION=3 WRAPPERS=Qt Index: tst_Alarm/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- tst_Alarm/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_Alarm/test.py (.../test.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -12,39 +12,57 @@ # author Behrouz NematiPour # +import utils import names import denaliMessages def main(): startApplication("denaliSquish") - - denaliMessages.sendAlarm(3, 26, 2, 0, 65535) + + denaliMessages.sendAlarm(3, 26, 2, 0, 0) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - - - denaliMessages.sendAlarm(2, 2, 0, 0, 100) + utils.waitForGUI() # visual delay + + denaliMessages.sendAlarm(3, 26, 2, 0, 65535) + test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) + test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") + utils.waitForGUI() # visual delay + + denaliMessages.sendAlarm(2, 2, 0, 10, 100) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 2) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#ffa500") - + utils.waitForGUI() # visual delay - denaliMessages.sendAlarm(1, 3, 0, 0, 54) + denaliMessages.sendAlarm(1, 3, 0, 0, 54) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 1) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#008000") - - denaliMessages.sendAlarm(0, 4, 0, 0, 91) + utils.waitForGUI() # visual delay + + denaliMessages.sendAlarm(0, 4, 0, 0, 91) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 0) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#ffffff") - - denaliMessages.sendAlarm(3, 255, 0, 0, 0) + utils.waitForGUI() # visual delay + + denaliMessages.sendAlarm(3, 255, 0, 0, 0) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).level, 3) test.compare(waitForObjectExists(names.o_ALARM_ID_MESSAGE).color.name, "#c53b33") - - denaliMessages.sendAlarm(0, 0, 0, 0, 0) + utils.waitForGUI() # visual delay + + denaliMessages.sendAlarm(0, 0, 0, 0, 0) try: # Notification Bar should be hidden waitForObjectExists(names.o_ALARM_ID_MESSAGE,0) test.compare(False, True) except LookupError: test.compare(False, False) - - + + # Coverage : These messages have not been implemented completely yet. + # but as long as the coverage is 100% it means the portion of the implementation for them are working fine. + denaliMessages.setAlarmTriggered(1) + denaliMessages.send_acknowledge_UI() + denaliMessages.setAlarmCleared (1) + denaliMessages.send_acknowledge_UI() + denaliMessages.sendUnknown_HD() + denaliMessages.sendUnknown_DG() + + Fisheye: Tag c1b9d926e38745dcd9fb3e0503176b1c85182294 refers to a dead (removed) revision in file `tst_GlobalTests/test.py'. Fisheye: No comparison available. Pass `N' to diff? Index: tst_HomeScreen/test.py =================================================================== diff -u -r99810cece725cd3b1070c61756563b90b6d36650 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- tst_HomeScreen/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) +++ tst_HomeScreen/test.py (.../test.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -26,7 +26,8 @@ test.compare(str(waitForObjectExists(names.o_mainMenu_treatment).text.text), "Treatment" , "SRSUI 534") test.compare(str(waitForObjectExists(names.o_mainMenu_manager ).text.text), "Manager" , "SRSUI 026") test.compare(str(waitForObjectExists(names.o_mainMenu_settings ).text.text), "Settings" , "SRSUI 028") - + utils.waitForGUI() + mouseClick (waitForObjectExists(names.o_mainMenu_manager)) utils.waitForGUI() test.compare(waitForObjectExists(names.o_managerHome ).visible, True , "SRSUI 027") Index: tst_Internals/test.py =================================================================== diff -u --- tst_Internals/test.py (revision 0) +++ tst_Internals/test.py (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -0,0 +1,19 @@ +# -*- 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_GlobalTests +# date 2019/11/20 +# author Behrouz NematiPour +# + +import unittests + +def main(): + unittests.testPythonVersion() + unittests.testcrc8() Index: tst_ServiceShutdown/test.py =================================================================== diff -u -r99810cece725cd3b1070c61756563b90b6d36650 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- tst_ServiceShutdown/test.py (.../test.py) (revision 99810cece725cd3b1070c61756563b90b6d36650) +++ tst_ServiceShutdown/test.py (.../test.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -87,7 +87,8 @@ # 028 : The Home Screen shall display a "Settings" button. test.compare(str(waitForObjectExists(names.o_mainMenu_settings).text.text), "Settings", globals.SRSUI(28)) - + utils.waitForGUI() + # 029 : Upon "Settings" button depress on the Home Screen; the UI shall navigate the user to the Device Settings Screen. gotoScreenNtest_Contains_PowerOffButton(29) Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -30,8 +30,8 @@ gotoScreenNtest_Contains_FlowsSection() utils.waitForGUI(1) - denaliMessages.setTreatmentBloodFlowRate(175) - denaliMessages.setTreatmentDialysateFlowRate(250) + denaliMessages.setTreatmentBloodFlowRate(175, 0, 0, 0, 0, 0, 0) + denaliMessages.setTreatmentDialysateFlowRate(250, 1, 1, 1, 1, 1, 1) gotoScreenNTest_Contains_Ranges() utils.waitForGUI(1) @@ -70,9 +70,8 @@ waitForObjectExists(names.o_bloodFlowSlider_Slider).value, waitForObjectExists(names.o_dialysateFlowSlider_Slider).value ) - denaliMessages.setTreatmentBloodFlowRate(225) - denaliMessages.setTreatmentDialysateFlowRate(200) + denaliMessages.setTreatmentBloodFlowRate(225, 1, 1, 1, 1, 1, 1) + denaliMessages.setTreatmentDialysateFlowRate(200, 0, 0, 0, 0, 0, 0) test.compare(str(waitForObjectExists(names.o_treatmentStart_225_Text).text), "225") test.compare(str(waitForObjectExists(names.o_treatmentStart_200_Text).text), "200") - Index: tst_Treatment_DialysateFlowRate/test.py =================================================================== diff -u -r929c42f19c662c57ae264d200658fb1690353008 -rc1b9d926e38745dcd9fb3e0503176b1c85182294 --- tst_Treatment_DialysateFlowRate/test.py (.../test.py) (revision 929c42f19c662c57ae264d200658fb1690353008) +++ tst_Treatment_DialysateFlowRate/test.py (.../test.py) (revision c1b9d926e38745dcd9fb3e0503176b1c85182294) @@ -28,11 +28,21 @@ test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "0") - denaliMessages.setTreatmentDialysateFlowRate(145, 0, 0, 0, 0, 0, 0) # coverage - denaliMessages.setTreatmentDialysateFlowRate(145, 0, 0, 0, 0, 0, 0) + 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.setTreatmentDialysateFlowRate(155, 1, 1, 1, 1, 1, 1) + 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.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.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.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.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")