Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_CANBusFaultCount/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -24,7 +24,7 @@ def test_values(vCount): - test.compare(str(waitForObjectExists(names.o_managerHome_canbusFaultCount).text), "CAN Faults: {}".format(vCount)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_canbusFaultCount, "text", "CAN Faults: {}".format(vCount))).text), "CAN Faults: {}".format(vCount)) def main(): @@ -36,16 +36,16 @@ gotoScreenNtest_Contains_CANBusFaultCount() utils.waitForGUI(1) - HDSimulator.setCanBUSFaultCount(10) + HDSimulator.cmd_set_canbus_fault_count(10) test_values (10) - HDSimulator.setCanBUSFaultCount(100) + HDSimulator.cmd_set_canbus_fault_count(100) test_values (100) - HDSimulator.setCanBUSFaultCount(100) # Coverage + HDSimulator.cmd_set_canbus_fault_count(100) # Coverage test_values (100) - HDSimulator.setCanBUSFaultCount(0) + HDSimulator.cmd_set_canbus_fault_count(0) test_values (0) utils.tstDone() Index: tst_DGHeatersData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DGHeatersData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGHeatersData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -24,9 +24,9 @@ def test_values(vMainPriMaryDC, vSmallPrimaryDC, vTrimmerDC): - test.compare(str(waitForObjectExists(names.o_managerHome_DGHeatersData_MainPriMaryDC ).text), "{:.0f}".format(vMainPriMaryDC )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGHeatersData_SmallPrimaryDC).text), "{:.0f}".format(vSmallPrimaryDC)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGHeatersData_TrimmerDC ).text), "{:.0f}".format(vTrimmerDC )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGHeatersData_MainPriMaryDC , "text", "{:.0f}".format(vMainPriMaryDC )) ).text), "{:.0f}".format(vMainPriMaryDC )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGHeatersData_SmallPrimaryDC, "text", "{:.0f}".format(vSmallPrimaryDC)) ).text), "{:.0f}".format(vSmallPrimaryDC)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGHeatersData_TrimmerDC , "text", "{:.0f}".format(vTrimmerDC )) ).text), "{:.0f}".format(vTrimmerDC )) def main(): Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGLoadCellReadingsData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -24,10 +24,10 @@ def test_values(vRs1Prim, vRs1Bkup, vRs2Prim, vRs2Bkup): - test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs1Prim).text), "{:.2f}".format(vRs1Prim)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs1Bkup).text), "{:.2f}".format(vRs1Bkup)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs2Prim).text), "{:.2f}".format(vRs2Prim)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGLoadCellReadingsData_Rs2Bkup).text), "{:.2f}".format(vRs2Bkup)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGLoadCellReadingsData_Rs1Prim, "text", "{:.2f}".format(vRs1Prim))).text), "{:.2f}".format(vRs1Prim)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGLoadCellReadingsData_Rs1Bkup, "text", "{:.2f}".format(vRs1Bkup))).text), "{:.2f}".format(vRs1Bkup)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGLoadCellReadingsData_Rs2Prim, "text", "{:.2f}".format(vRs2Prim))).text), "{:.2f}".format(vRs2Prim)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGLoadCellReadingsData_Rs2Bkup, "text", "{:.2f}".format(vRs2Bkup))).text), "{:.2f}".format(vRs2Bkup)) def main(): Index: tst_DGPressureData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DGPressureData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGPressureData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -24,10 +24,10 @@ def test_values(vROInletPSI, vROOutletPSI, vDrainInletPSI, vDrainOutletPSI): - test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_ROInletPSI ).text), "{:.2f}".format(vROInletPSI )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_ROOutletPSI ).text), "{:.2f}".format(vROOutletPSI )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_DrainInletPSI ).text), "{:.2f}".format(vDrainInletPSI )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGPressuresData_DrainOutletPSI).text), "{:.2f}".format(vDrainOutletPSI)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGPressuresData_ROInletPSI , "text", "{:.2f}".format(vROInletPSI))).text), "{:.2f}".format(vROInletPSI)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGPressuresData_ROOutletPSI , "text", "{:.2f}".format(vROOutletPSI))).text), "{:.2f}".format(vROOutletPSI )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGPressuresData_DrainInletPSI , "text", "{:.2f}".format(vDrainInletPSI))).text), "{:.2f}".format(vDrainInletPSI )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGPressuresData_DrainOutletPSI, "text", "{:.2f}".format(vDrainOutletPSI))).text),"{:.2f}".format(vDrainOutletPSI)) def main(): Index: tst_DGReservoirData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DGReservoirData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGReservoirData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -24,9 +24,9 @@ def test_values(vActiveReservoir, vFillToVolML, vDrainToVolML): - test.compare(str(waitForObjectExists(names.o_managerHome_DGReservoirData_ActiveReservoir).text), "{:.0f}".format(vActiveReservoir)) - test.compare(str(waitForObjectExists(names.o_managerHome_DGReservoirData_FillToVolML ).text), "{:.0f}".format(vFillToVolML )) - test.compare(str(waitForObjectExists(names.o_managerHome_DGReservoirData_DrainToVolML ).text), "{:.0f}".format(vDrainToVolML )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGReservoirData_ActiveReservoir, "text", "{:.0f}".format(vActiveReservoir))).text), "{:.0f}".format(vActiveReservoir)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGReservoirData_FillToVolML , "text", "{:.0f}".format(vFillToVolML))).text), "{:.0f}".format(vFillToVolML )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGReservoirData_DrainToVolML , "text", "{:.0f}".format(vDrainToVolML))).text), "{:.0f}".format(vDrainToVolML )) def main(): 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(): Index: tst_DGValvesStatesData/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DGValvesStatesData/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_DGValvesStatesData/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -25,7 +25,7 @@ def test_values(vValvesStates): - test.compare(str(waitForObjectExists(names.o_managerHome_DGValvesStatesData_ValvesStates).text), "{0:012b}".format(vValvesStates)) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGValvesStatesData_ValvesStates, "text", "{0:012b}".format(vValvesStates))).text), "{0:012b}".format(vValvesStates)) def main(): Index: tst_DebugText/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_DebugText/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_DebugText/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -25,8 +25,8 @@ utils.waitForGUI(1) # these tests are used for debugging and are placeholder for later use cases. - HDSimulator.send_CheckIn_DG() - HDSimulator.setDGDebugText("01234567890123456789012345678901234567820123456789") - HDSimulator.setHDDebugText("01234567890123456789012345678901234567810123456789") + HDSimulator.cmd_send_checkin_dg() + HDSimulator.cmd_set_dg_debug_text("01234567890123456789012345678901234567820123456789") + HDSimulator.cmd_set_hd_debug_text("01234567890123456789012345678901234567810123456789") utils.tstDone() Index: tst_ServiceShutdown/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_ServiceShutdown/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_ServiceShutdown/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -15,8 +15,8 @@ import names from dialin.ui import globals, HDSimulator from dialin.ui import utils +HDSimulator = HDSimulator() - ################################################################################ # This test need to be changed when the Service screen has been implemented # # This is only checking the functionality exists and it's working # @@ -39,16 +39,16 @@ test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, globals.SRSUI(vSRSUI)) def showNtest_PowerOffDialog(vSRSUI=""): - HDSimulator.show_PowerOffDialog() + HDSimulator.cmd_show_poweroff_dialog() test_PowerOffDialog(vSRSUI) def hideNtest_PowerOffDialog(vSRSUI=""): - HDSimulator.hide_PowerOffDialog() + HDSimulator.cmd_hide_poweroff_dialog() test_PowerOffButton(vSRSUI) def showNtest_PowerOffNotificationDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) - HDSimulator.show_PowerOffNotificationDialog() + HDSimulator.cmd_show_poweroff_notification_dialog() test.compare(str(waitForObjectExists(names.o_poweroff_notification).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog") constantPartOfTheMessage = "System is shutting down" test.compare(str(waitForObjectExists(names.o_poweroff_notification).text)[0:len(constantPartOfTheMessage)], constantPartOfTheMessage, mSRSUI + " - Message Text") @@ -57,7 +57,7 @@ def showNtest_PowerOffRejectionDialog(vSRSUI=""): mSRSUI = globals.SRSUI(vSRSUI) - HDSimulator.show_PowerOffRejectionDialog() + HDSimulator.cmd_show_poweroff_rejection_dialog() test.compare(str(waitForObjectExists(names.o_poweroff_rejection).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog") constantPartOfTheMessage = "Cannot shutdown during " # there might be the reason, concatenated at the end of the string. test.compare(str(waitForObjectExists(names.o_poweroff_rejection).text)[0:len(constantPartOfTheMessage)], constantPartOfTheMessage, mSRSUI + " - Message Text") Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -42,7 +42,7 @@ utils.waitForGUI(1) HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550) - HDSimulator.send_acknowledge_UI() + HDSimulator.cmd_send_acknowledge_ui() mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton) mouseClick(waitForObject(names.o_dialysateFlowSlider_Slider), 79, 5, Qt.LeftButton) @@ -52,13 +52,13 @@ # sendTreatmentAdjustBloodDialysateRequest mouseClick(waitForObject(names.o_confirmButton)) - HDSimulator.waitForMessageToBeSent() + HDSimulator.wait_for_message_to_be_sent() utils.waitForGUI(7) # wait for ack timeout 5 is the timeout added +2 Sec for safe range. # sendTreatmentAdjustBloodDialysateRequest again mouseClick(waitForObject(names.o_confirmButton)) - HDSimulator.waitForMessageToBeSent() - HDSimulator.send_acknowledge_HD() + HDSimulator.wait_for_message_to_be_sent() + HDSimulator.cmd_send_acknowledge_hd() HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -r867655840cada2d79fa5028c8fab68516ea59673 -rb4a285d31b57c278de779b2081eeffc74f256807 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision 867655840cada2d79fa5028c8fab68516ea59673) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision b4a285d31b57c278de779b2081eeffc74f256807) @@ -48,17 +48,17 @@ minDF = 150 maxDF = 550 HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) #coverage - HDSimulator.send_acknowledge_UI() + HDSimulator.cmd_send_acknowledge_ui() test_Dialysate_Ranges(minDF, maxDF) HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) - HDSimulator.send_acknowledge_UI() + HDSimulator.cmd_send_acknowledge_ui() test_Dialysate_Ranges(minDF, maxDF) minDF = 200 maxDF = 500 HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, minDF, maxDF) - HDSimulator.send_acknowledge_UI() + HDSimulator.cmd_send_acknowledge_ui() test_Dialysate_Ranges(minDF, maxDF) utils.tstDone() \ No newline at end of file