Index: tst_HDBloodFlowData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -ra7b9888952bec12aef09dab4db580b790c6db5ba --- tst_HDBloodFlowData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_HDBloodFlowData/test.py (.../test.py) (revision a7b9888952bec12aef09dab4db580b790c6db5ba) @@ -24,15 +24,26 @@ def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_FlowSetPoint , "text", "{:.0f}".format( vFlowSetPt ))).text), "{:.0f}".format( vFlowSetPt )) - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MeasuredFlow , "text", "{:.2f}".format( vMeasFlow ))).text), "{:.2f}".format( vMeasFlow )) - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_RotorSpeed , "text", "{:.2f}".format( vRotSpd ))).text), "{:.2f}".format( vRotSpd )) - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorSpeed , "text", "{:.2f}".format( vMotSpd ))).text), "{:.2f}".format( vMotSpd )) - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlSpeed , "text", "{:.2f}".format( vMCSpd ))).text), "{:.2f}".format( vMCSpd )) - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlCurrent, "text", "{:.2f}".format( vMCCurr ))).text), "{:.2f}".format( vMCCurr )) - test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_PWMDutyCycle , "text", "%" "{:.2f}".format( vPWM ))).text), "%" "{:.2f}".format( vPWM )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_FlowSetPoint ).text), "{:.0f}".format( vFlowSetPt )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MeasuredFlow ).text), "{:.2f}".format( vMeasFlow )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_RotorSpeed ).text), "{:.2f}".format( vRotSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorSpeed ).text), "{:.2f}".format( vMotSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMCSpd )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMCCurr )) + test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_PWMDutyCycle ).text), "%" "{:.2f}".format( vPWM )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_FlowSetPoint , "text", "{:.0f}".format( vFlowSetPt ))).text), "{:.0f}".format( vFlowSetPt )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MeasuredFlow , "text", "{:.2f}".format( vMeasFlow ))).text), "{:.2f}".format( vMeasFlow )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_RotorSpeed , "text", "{:.2f}".format( vRotSpd ))).text), "{:.2f}".format( vRotSpd )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorSpeed , "text", "{:.2f}".format( vMotSpd ))).text), "{:.2f}".format( vMotSpd )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlSpeed , "text", "{:.2f}".format( vMCSpd ))).text), "{:.2f}".format( vMCSpd )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlCurrent, "text", "{:.2f}".format( vMCCurr ))).text), "{:.2f}".format( vMCCurr )) + # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_PWMDutyCycle , "text", "%" "{:.2f}".format( vPWM ))).text), "%" "{:.2f}".format( vPWM )) + + + + def main(): utils.tstStart(__file__)