sw/qa/uitest/sidebar/stylesSidebar.py | 9 +++------
sw/qa/uitest/writer_tests/compareDocuments.py | 13 ++++---------
sw/qa/uitest/writer_tests7/tdf119661.py | 6 ++----
sw/qa/uitest/writer_tests7/tdf90401.py | 5 +----
4 files changed, 10 insertions(+), 23 deletions(-)
New commits:
commit b58fe9414f6303ed55f4c82bd697bd2ca35347d7
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Jun 29 15:34:16 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 29 21:50:27 2021 +0200
uitest: simplify code with execute_dialog_through_action
Change-Id: I84cee48c7f7b450e00fed4f70b6c0c41e03dea9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118116
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/uitest/sidebar/stylesSidebar.py
b/sw/qa/uitest/sidebar/stylesSidebar.py
index 96793b13b4c1..7480c8008d78 100644
--- a/sw/qa/uitest/sidebar/stylesSidebar.py
+++ b/sw/qa/uitest/sidebar/stylesSidebar.py
@@ -35,13 +35,10 @@ class StylesSidebar(UITestCase):
self.assertEqual('true', get_state_as_dict(xPages)['Selected'])
xFileName = xDialog.getChild("fromfile")
- xFileName.executeAction("CLICK", tuple())
- xOpenDialog = self.xUITest.getTopFocusWindow()
- xFileName = xOpenDialog.getChild("file_name")
- xFileName.executeAction("TYPE", mkPropertyValues({"TEXT":
get_url_for_data_file("customStyles.odt")}))
- xOpenBtn = xOpenDialog.getChild("open")
- xOpenBtn.executeAction("CLICK", tuple())
+ with self.ui_test.execute_dialog_through_action(xFileName,
'CLICK', close_button="open") as dialog:
+ xFileName = dialog.getChild("file_name")
+ xFileName.executeAction("TYPE", mkPropertyValues({"TEXT":
get_url_for_data_file("customStyles.odt")}))
xWriterDoc = self.xUITest.getTopFocusWindow()
xWriterEdit = xWriterDoc.getChild("writer_edit")
diff --git a/sw/qa/uitest/writer_tests/compareDocuments.py
b/sw/qa/uitest/writer_tests/compareDocuments.py
index 037b12f309d9..a8e0f21d87f9 100644
--- a/sw/qa/uitest/writer_tests/compareDocuments.py
+++ b/sw/qa/uitest/writer_tests/compareDocuments.py
@@ -21,16 +21,13 @@ class compareDocuments(UITestCase):
xWriterDoc = self.xUITest.getTopFocusWindow()
with
self.ui_test.execute_dialog_through_command(".uno:CompareDocuments",
close_button="") as xOpenDialog:
-
xFileName = xOpenDialog.getChild("file_name")
xFileName.executeAction("TYPE", mkPropertyValues({"TEXT":
get_url_for_data_file("tdf130960_2.odt")}))
xOpenBtn = xOpenDialog.getChild("open")
- xOpenBtn.executeAction("CLICK", tuple())
# Close the dialog and open it again so the list of changes is
updated
- xTrackDlg = self.xUITest.getTopFocusWindow()
- xcloseBtn = xTrackDlg.getChild("close")
- self.ui_test.close_dialog_through_button(xcloseBtn)
+ with self.ui_test.execute_dialog_through_action(xOpenBtn,
'CLICK', close_button="close"):
+ pass
self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges")
xTrackDlg = self.xUITest.getTopFocusWindow()
@@ -55,12 +52,10 @@ class compareDocuments(UITestCase):
xFileName = xOpenDialog.getChild("file_name")
xFileName.executeAction("TYPE", mkPropertyValues({"TEXT":
get_url_for_data_file("tdf137855_2.odt")}))
xOpenBtn = xOpenDialog.getChild("open")
- xOpenBtn.executeAction("CLICK", tuple())
# Close the dialog and open it again so the list of changes is
updated
- xTrackDlg = self.xUITest.getTopFocusWindow()
- xcloseBtn = xTrackDlg.getChild("close")
- self.ui_test.close_dialog_through_button(xcloseBtn)
+ with self.ui_test.execute_dialog_through_action(xOpenBtn,
'CLICK', close_button="close"):
+ pass
self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges")
xTrackDlg = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/writer_tests7/tdf119661.py
b/sw/qa/uitest/writer_tests7/tdf119661.py
index e1464b962c99..a761bb88ceab 100644
--- a/sw/qa/uitest/writer_tests7/tdf119661.py
+++ b/sw/qa/uitest/writer_tests7/tdf119661.py
@@ -27,12 +27,10 @@ class tdf119661(UITestCase):
xLink.executeAction("CLICK", tuple())
xOpenBtn = xOpenDialog.getChild("open")
- xOpenBtn.executeAction("CLICK", tuple())
#Confirmation dialog is displayed
- xWarnDialog = self.xUITest.getTopFocusWindow()
- xOK = xWarnDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOK)
+ with self.ui_test.execute_dialog_through_action(xOpenBtn, 'CLICK'):
+ pass
with self.ui_test.execute_dialog_through_command(".uno:LinkDialog",
close_button="close") as xDialog:
diff --git a/sw/qa/uitest/writer_tests7/tdf90401.py
b/sw/qa/uitest/writer_tests7/tdf90401.py
index 40b9b483153f..98a9064b6304 100644
--- a/sw/qa/uitest/writer_tests7/tdf90401.py
+++ b/sw/qa/uitest/writer_tests7/tdf90401.py
@@ -30,7 +30,7 @@ class tdf90401(UITestCase):
# enable remove personal info security option
- with
self.ui_test.execute_dialog_through_command('.uno:OptionsTreeDialog',
close_button="") as xDialog:
+ with
self.ui_test.execute_dialog_through_command('.uno:OptionsTreeDialog') as
xDialog:
xPages = xDialog.getChild('pages')
xGenEntry = xPages.getChild('0')
xSecurityPage = xGenEntry.getChild('6')
@@ -46,9 +46,6 @@ class tdf90401(UITestCase):
# event DialogClosed after closing
xOkBtn.executeAction('CLICK', tuple())
- xOKBtn = xDialog.getChild('ok')
- self.ui_test.close_dialog_through_button(xOKBtn)
-
# save and reload the document to remove personal info
with TemporaryDirectory() as tempdir:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
