Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r40314c67874695eefc506c3a6a33896495953edd --- tst_DGTemperaturesData/test.py (.../test.py) (revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) @@ -13,52 +13,64 @@ # import names -from dialin.squish import utils, denaliMessages +from dialin.ui import utils +from configuration import config, utility +from dialin.ui.dg_simulator import DGSimulator +dg_simulator = DGSimulator() + def gotoScreenNtest_Contains_DGTemperaturesData(): - mouseClick(waitForObject(names.o_mainMenu_manager)) - test_values(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + mainMenuManager = utility.get_object_from_names(names.o_sd_logo_test_acess, "names.o_mainMenu_manager object is missing") + if mainMenuManager is not None: + doubleClick(mainMenuManager) + test_values(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -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)) +def test_values(vInletPrimaryHeater, vHeatDisinfect, vOutletPrimaryHeater, + vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, + vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, + vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, + vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature, + vfpgaBoard, vLoadCellA1B1, vLoadCellA2B2, vInternalTHDORTD, + vInternalTDIRTD, vinteralTHDRTD, vInternalCondSnsrTemp, vBaroTempSensor): + + listDGTempData = [vInletPrimaryHeater, vHeatDisinfect, vOutletPrimaryHeater, + vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, + vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, + vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, + vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature, + vfpgaBoard, vLoadCellA1B1, vLoadCellA2B2, vInternalTHDORTD, + vInternalTDIRTD, vinteralTHDRTD, vInternalCondSnsrTemp, vBaroTempSensor] + + for index in range(len(listDGTempData)): + names.o_DGTemperaturesData0_Text["objectName"] = f"_DGTemperaturesData{index}" + test.compare(str(waitForObjectExists(names.o_DGTemperaturesData0_Text).text), "{:.2f}".format(listDGTempData[index] )) + - def main(): utils.tstStart(__file__) - startApplication(names.AUT_NAME) + startApplication(config.AUT_NAME) utils.waitForGUI(1) gotoScreenNtest_Contains_DGTemperaturesData() utils.waitForGUI(1) step = 10 for i in range ( 10, 500, step): - denaliMessages.setDGTemperaturesData(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) + dg_simulator.cmd_set_dg_temperatures_data(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,i + step * 12,i + step * 13,i + step * 14,i + step * 15,i + step * 16,i + step * 17,i + step * 18,i + step * 19, i + step * 20) + utils.waitForGUI(1) # wait for GUI to update + 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,i + step * 12,i + step * 13,i + step * 14,i + step * 15,i + step * 16,i + step * 17,i + step * 18,i + step * 19, i + step * 20) - denaliMessages.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) - test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) + dg_simulator.cmd_set_dg_temperatures_data(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2100) + utils.waitForGUI(1) # wait for GUI to update + test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2100) - denaliMessages.setDGTemperaturesData(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) - test_values (100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200) - # Coverage - denaliMessages.setDGTemperaturesData(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) - test_values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + dg_simulator.cmd_set_dg_temperatures_data(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + utils.waitForGUI(1) # wait for GUI to update + test_values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) utils.tstDone()