From f75bae7082322a2e79997d041ce5f8afd3910107 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Sun, 12 Sep 2021 21:16:40 +0200 Subject: 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 --- uitest/demo_ui/combobox.py | 2 +- uitest/demo_ui/edit.py | 4 ++-- uitest/demo_ui/tabcontrol.py | 2 +- uitest/demo_ui/treelist.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'uitest/demo_ui') diff --git a/uitest/demo_ui/combobox.py b/uitest/demo_ui/combobox.py index d2e8491c161c..00080b3fa2b0 100644 --- a/uitest/demo_ui/combobox.py +++ b/uitest/demo_ui/combobox.py @@ -16,7 +16,7 @@ class ComboBoxTest(UITestCase): with self.ui_test.create_doc_in_start_center("calc"): - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AddName", close_button="cancel") as xAddNameDlg: + with self.ui_test.execute_modeless_dialog_through_command(".uno:AddName", close_button="cancel") as xAddNameDlg: scopeCB = xAddNameDlg.getChild("scope") select_pos(scopeCB, "1") diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py index 94b86c639d0a..e6ac12a7d8e9 100644 --- a/uitest/demo_ui/edit.py +++ b/uitest/demo_ui/edit.py @@ -18,7 +18,7 @@ class EditTest(UITestCase): with self.ui_test.create_doc_in_start_center("calc"): - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AddName", close_button="cancel") as xAddNameDlg: + with self.ui_test.execute_modeless_dialog_through_command(".uno:AddName", close_button="cancel") as xAddNameDlg: xEdit = xAddNameDlg.getChild("edit") @@ -30,7 +30,7 @@ class EditTest(UITestCase): with self.ui_test.create_doc_in_start_center("calc"): - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AddName", close_button="cancel") as xAddNameDlg: + with self.ui_test.execute_modeless_dialog_through_command(".uno:AddName", close_button="cancel") as xAddNameDlg: xEdit = xAddNameDlg.getChild("edit") diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py index 505bd5690b87..883fecb0890b 100644 --- a/uitest/demo_ui/tabcontrol.py +++ b/uitest/demo_ui/tabcontrol.py @@ -23,7 +23,7 @@ class TabControlTest(UITestCase): enter_text_to_cell(xGridWindow, "B2", "=2+3+4") xGridWindow.executeAction("SELECT", mkPropertyValues({"CELL": "B2"})) - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:FunctionDialog", close_button="cancel") as xFunctionDlg: + with self.ui_test.execute_modeless_dialog_through_command(".uno:FunctionDialog", close_button="cancel") as xFunctionDlg: xTabs = xFunctionDlg.getChild("tabcontrol") diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py index eb6a90b8ef1e..a8461ad7f8f3 100644 --- a/uitest/demo_ui/treelist.py +++ b/uitest/demo_ui/treelist.py @@ -23,7 +23,7 @@ class TreeListTest(UITestCase): enter_text_to_cell(xGridWindow, "B2", "=2+3+4") xGridWindow.executeAction("SELECT", mkPropertyValues({"CELL": "B2"})) - with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:FunctionDialog", close_button="cancel") as xFunctionDlg: + with self.ui_test.execute_modeless_dialog_through_command(".uno:FunctionDialog", close_button="cancel") as xFunctionDlg: xTabs = xFunctionDlg.getChild("tabcontrol") -- cgit