diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-29 11:44:54 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-29 15:10:03 +0200 |
commit | 5b8a13486d3809066e663549879c209992d5479d (patch) | |
tree | 8c2701d8827e24eb7f36eb707c20905c41653485 /cui/qa | |
parent | Update git submodules (diff) | |
download | core-5b8a13486d3809066e663549879c209992d5479d.tar.gz core-5b8a13486d3809066e663549879c209992d5479d.zip |
uitest: combine execute_dialog_through_command methods
Change-Id: Iaa03d37a9ac3862b8cb08a81e37a611632433880
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118077
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'cui/qa')
-rw-r--r-- | cui/qa/uitest/dialogs/chardlg.py | 6 | ||||
-rw-r--r-- | cui/qa/uitest/dialogs/pastedlg.py | 2 | ||||
-rw-r--r-- | cui/qa/uitest/dialogs/shortcuts.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py index e2c518d18ef3..878f9e2a8ae7 100644 --- a/cui/qa/uitest/dialogs/chardlg.py +++ b/cui/qa/uitest/dialogs/chardlg.py @@ -25,7 +25,7 @@ class Test(UITestCase): self.xUITest.executeCommand(".uno:SelectAll") # Now use Format -> Character. - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") # Select RID_SVXPAGE_CHAR_EFFECTS. select_pos(xTabs, "1") @@ -56,7 +56,7 @@ class Test(UITestCase): self.xUITest.executeCommand(".uno:SelectAll") # Now use Format -> Character. - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") # Select RID_SVXPAGE_CHAR_EFFECTS. select_pos(xTabs, "1") @@ -82,7 +82,7 @@ class Test(UITestCase): editWin = doc.getChild("writer_edit") # Use Format -> Character. - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") # Select RID_SVXPAGE_CHAR_EFFECTS. select_pos(xTabs, "1") diff --git a/cui/qa/uitest/dialogs/pastedlg.py b/cui/qa/uitest/dialogs/pastedlg.py index 048463286003..9248f923891d 100644 --- a/cui/qa/uitest/dialogs/pastedlg.py +++ b/cui/qa/uitest/dialogs/pastedlg.py @@ -26,7 +26,7 @@ class Test(UITestCase): self.xUITest.executeCommand(".uno:Copy") # Now use paste special to see what formats are offered. - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial", close_button="cancel") as pasteSpecial: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial", close_button="cancel") as pasteSpecial: formats = pasteSpecial.getChild("list") entryCount = int(get_state_as_dict(formats)["Children"]) items = [] diff --git a/cui/qa/uitest/dialogs/shortcuts.py b/cui/qa/uitest/dialogs/shortcuts.py index 7f3f9337a525..261536d0694f 100644 --- a/cui/qa/uitest/dialogs/shortcuts.py +++ b/cui/qa/uitest/dialogs/shortcuts.py @@ -17,7 +17,7 @@ class Test(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() xWriterEdit = xWriterDoc.getChild("writer_edit") - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") |