diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-09-12 21:16:40 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-09-13 10:38:27 +0200 |
| commit | f75bae7082322a2e79997d041ce5f8afd3910107 (patch) | |
| tree | e4820226bf00e8b5726a737c568c52961ae1bce9 /sd | |
| parent | 714278ce47692d57965b06e8b83de632e6e97d2d (diff) | |
uitest: combine execute_modeless_dialog_through_command methods
Change-Id: Idada1927f6b8b55133e1ff8c776a987699df1dc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122012
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/uitest/findReplace/findReplace.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/qa/uitest/findReplace/findReplace.py b/sd/qa/uitest/findReplace/findReplace.py index 906f53bba363..ac9c0598329f 100644 --- a/sd/qa/uitest/findReplace/findReplace.py +++ b/sd/qa/uitest/findReplace/findReplace.py @@ -22,7 +22,7 @@ class findReplace(UITestCase): self.assertEqual(impress_doc.CurrentController.getCurrentPage().Number, 1) # search for string "second" - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:SearchDialog", close_button="close") as xDialog: + with self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog", close_button="close") as xDialog: searchterm = xDialog.getChild("searchterm") searchterm.executeAction("TYPE", mkPropertyValues({"TEXT":"second"})) #2nd slide xsearch = xDialog.getChild("search") @@ -45,7 +45,7 @@ class findReplace(UITestCase): # click twice the Replace button, check "Replace first first" # open the dialog again - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:SearchDialog", close_button="close") as xDialog: + with self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog", close_button="close") as xDialog: # verify search string is still "third" from previous search searchterm = xDialog.getChild("searchterm") @@ -70,7 +70,7 @@ class findReplace(UITestCase): replace.executeAction("CLICK", tuple()) #click twice Replace button (one selects, second replaces) # reopen the dialog, because of bug 122788 - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:SearchDialog", close_button="close") as xDialog: + with self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog", close_button="close") as xDialog: # now replace first (uncheck match case) with word "aaa" - click once Replace All button, check "Replace aaa aaa" matchcase = xDialog.getChild("matchcase") @@ -84,14 +84,14 @@ class findReplace(UITestCase): replaceall.executeAction("CLICK", tuple()) # click on replace all button # go to second page - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:SearchDialog", close_button="close") as xDialog: + with self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog", close_button="close") as xDialog: searchterm = xDialog.getChild("searchterm") searchterm.executeAction("TYPE", mkPropertyValues({"TEXT":"second"})) #2nd slide xsearch = xDialog.getChild("search") xsearch.executeAction("CLICK", tuple()) self.assertEqual(impress_doc.CurrentController.getCurrentPage().Number, 2) #now check if text "Replace aaa aaa" is on first slide - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:SearchDialog", close_button="close") as xDialog: + with self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog", close_button="close") as xDialog: searchterm = xDialog.getChild("searchterm") backsearch = xDialog.getChild("backsearch") searchterm.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) |