sc/qa/uitest/calc_tests7/save_readonly_with_password.py | 10 +++++----- sd/qa/uitest/impress_tests/tdf141297.py | 10 +++++----- sw/qa/uitest/writer_tests7/tdf90401.py | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit f8790b1d586b3865cfdc56e8f4cdab55a8617769 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Nov 19 17:25:06 2021 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 19 18:25:28 2021 +0100 uitest: better use execute_dialog_through_action in these cases Change-Id: Ic2317db908afc12973624034f29c1de6f4efd60c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125561 Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py index c930b3ece9cd..9552da9695a1 100644 --- a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py +++ b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py @@ -31,7 +31,7 @@ class save_readonly_with_password(UITestCase): xPasswordCheckButton.executeAction("CLICK", tuple()) xOpen = xSaveDialog.getChild("open") - with self.ui_test.execute_dialog_through_action(xOpen, "CLICK") as xPasswordDialog: + with self.ui_test.execute_dialog_through_action(xOpen, "CLICK", close_button="") as xPasswordDialog: xReadonly = xPasswordDialog.getChild("readonly") xReadonly.executeAction("CLICK", tuple()) xNewPassword = xPasswordDialog.getChild("newpassroEntry") @@ -39,10 +39,10 @@ class save_readonly_with_password(UITestCase): xConfirmPassword = xPasswordDialog.getChild("confirmropassEntry") xConfirmPassword.executeAction("TYPE", mkPropertyValues({"TEXT": "password"})) - # XLSX confirmation dialog is displayed - xWarnDialog = self.xUITest.getTopFocusWindow() - xSave = xWarnDialog.getChild("save") - self.ui_test.close_dialog_through_button(xSave) + xOk = xPasswordDialog.getChild("ok") + # XLSX confirmation dialog is displayed + with self.ui_test.execute_dialog_through_action(xOk, "CLICK", close_button="save"): + pass with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as document: diff --git a/sd/qa/uitest/impress_tests/tdf141297.py b/sd/qa/uitest/impress_tests/tdf141297.py index 1af3465238d9..41fde2ba835d 100644 --- a/sd/qa/uitest/impress_tests/tdf141297.py +++ b/sd/qa/uitest/impress_tests/tdf141297.py @@ -23,7 +23,7 @@ class tdf141297(UITestCase): xCancelBtn = xTemplateDlg.getChild("close") self.ui_test.close_dialog_through_button(xCancelBtn) - with self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", close_button="open") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", close_button="") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("LibreOffice.jpg")})) @@ -33,10 +33,10 @@ class tdf141297(UITestCase): xLink.executeAction("CLICK", tuple()) - #Confirmation dialog is displayed - xWarnDialog = self.xUITest.getTopFocusWindow() - xOK = xWarnDialog.getChild("ok") - self.ui_test.close_dialog_through_button(xOK) + xOpen = xOpenDialog.getChild("open") + #Confirmation dialog is displayed + with self.ui_test.execute_dialog_through_action(xOpen, "CLICK"): + pass with self.ui_test.execute_dialog_through_command(".uno:ManageLinks", close_button="close") as xDialog: diff --git a/sw/qa/uitest/writer_tests7/tdf90401.py b/sw/qa/uitest/writer_tests7/tdf90401.py index df71127feb04..7303b7c31e3e 100644 --- a/sw/qa/uitest/writer_tests7/tdf90401.py +++ b/sw/qa/uitest/writer_tests7/tdf90401.py @@ -120,16 +120,16 @@ class tdf90401(UITestCase): xOkBtn.executeAction('CLICK', tuple()) # Save Copy as - with self.ui_test.execute_dialog_through_command('.uno:SaveAs', close_button="open") as xDialog: + with self.ui_test.execute_dialog_through_command('.uno:SaveAs', close_button="") as xDialog: xFileName = xDialog.getChild('file_name') xFileName.executeAction('TYPE', mkPropertyValues({'KEYCODE':'CTRL+A'})) xFileName.executeAction('TYPE', mkPropertyValues({'KEYCODE':'BACKSPACE'})) xFileName.executeAction('TYPE', mkPropertyValues({'TEXT': xFilePath})) - # DOCX confirmation dialog is displayed - xWarnDialog = self.xUITest.getTopFocusWindow() - xOK = xWarnDialog.getChild("save") - self.ui_test.close_dialog_through_button(xOK) + xOpen = xDialog.getChild("open") + # DOCX confirmation dialog is displayed + with self.ui_test.execute_dialog_through_action(xOpen, "CLICK", close_button="save"): + pass with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as writer_doc2:
