Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DGTemperaturesData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -24,18 +24,18 @@ def test_values(vInletPrimaryHeater, vOutletPrimaryHeater, vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature): - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_InletPrimaryHeater ).text), "{:.2f}".format(vInletPrimaryHeater )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_OutletPrimaryHeater ).text), "{:.2f}".format(vOutletPrimaryHeater )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_ConductivitySensor1 ).text), "{:.2f}".format(vConductivitySensor1 )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_ConductivitySensor2 ).text), "{:.2f}".format(vConductivitySensor2 )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_OutletRedundancy ).text), "{:.2f}".format(vOutletRedundancy )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_InletDialysate ).text), "{:.2f}".format(vInletDialysate )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_PrimaryHeaterThermocouple ).text), "{:.2f}".format(vPrimaryHeaterThermocouple )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_TrimmerHeaterThermocouple ).text), "{:.2f}".format(vTrimmerHeaterThermocouple )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_PrimaryHeaterColdJunction ).text), "{:.2f}".format(vPrimaryHeaterColdJunction )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_TrimmerHeaterColdJunction ).text), "{:.2f}".format(vTrimmerHeaterColdJunction )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_PrimaryHeaterInternalTemperature).text), "{:.2f}".format(vPrimaryHeaterInternalTemperature)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature).text), "{:.2f}".format(vTrimmerHeaterInternalTemperature)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_InletPrimaryHeater , "text", "{:.2f}".format(vInletPrimaryHeater))).text) , "{:.2f}".format(vInletPrimaryHeater)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_OutletPrimaryHeater , "text", "{:.2f}".format(vOutletPrimaryHeater))).text) , "{:.2f}".format(vOutletPrimaryHeater )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_ConductivitySensor1 , "text", "{:.2f}".format(vConductivitySensor1))).text) , "{:.2f}".format(vConductivitySensor1 )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_ConductivitySensor2 , "text", "{:.2f}".format(vConductivitySensor2))).text) , "{:.2f}".format(vConductivitySensor2 )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_OutletRedundancy , "text", "{:.2f}".format(vOutletRedundancy))).text) , "{:.2f}".format(vOutletRedundancy )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_InletDialysate , "text", "{:.2f}".format(vInletDialysate))).text) , "{:.2f}".format(vInletDialysate )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_PrimaryHeaterThermocouple , "text", "{:.2f}".format(vPrimaryHeaterThermocouple))).text) , "{:.2f}".format(vPrimaryHeaterThermocouple )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_TrimmerHeaterThermocouple , "text", "{:.2f}".format(vTrimmerHeaterThermocouple))).text) , "{:.2f}".format(vTrimmerHeaterThermocouple )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_PrimaryHeaterColdJunction , "text", "{:.2f}".format(vPrimaryHeaterColdJunction))).text) , "{:.2f}".format(vPrimaryHeaterColdJunction )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_TrimmerHeaterColdJunction , "text", "{:.2f}".format(vTrimmerHeaterColdJunction))).text) , "{:.2f}".format(vTrimmerHeaterColdJunction )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_PrimaryHeaterInternalTemperature, "text", "{:.2f}".format(vPrimaryHeaterInternalTemperature))).text), "{:.2f}".format(vPrimaryHeaterInternalTemperature)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature, "text", "{:.2f}".format(vTrimmerHeaterInternalTemperature))).text), "{:.2f}".format(vTrimmerHeaterInternalTemperature)) def main():