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")