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>

3 files changed, 19 insertions, 19 deletions

diff --git a/sw/qa/uitest/writer_tests/compareDocuments.py b/sw/qa/uitest/writer_tests/compareDocuments.py
index bc21b53aedba..55a0618ea570 100644
--- a/sw/qa/uitest/writer_tests/compareDocuments.py
+++ b/sw/qa/uitest/writer_tests/compareDocuments.py
@@ -29,7 +29,7 @@ class compareDocuments(UITestCase):
                 with self.ui_test.execute_dialog_through_action(xOpenBtn, 'CLICK', close_button="close"):
                     pass
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
                 changesList = xTrackDlg.getChild("writerchanges")
 
                 text = "Unknown Author\t" + datetime.datetime.now().strftime("%m/%d/%Y")
@@ -54,7 +54,7 @@ class compareDocuments(UITestCase):
                 with self.ui_test.execute_dialog_through_action(xOpenBtn, 'CLICK', close_button="close"):
                     pass
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
                 changesList = xTrackDlg.getChild("writerchanges")
 
                 # Check the number of changes
diff --git a/sw/qa/uitest/writer_tests/trackedChanges.py b/sw/qa/uitest/writer_tests/trackedChanges.py
index fafa93714cca..698202bf1647 100644
--- a/sw/qa/uitest/writer_tests/trackedChanges.py
+++ b/sw/qa/uitest/writer_tests/trackedChanges.py
@@ -23,7 +23,7 @@ class trackedchanges(UITestCase):
             selection = self.xUITest.executeCommand(".uno:SelectAll")  #select whole text
             self.xUITest.executeCommand(".uno:Cut")   #cut  text
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close"):
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close"):
                 pass
 
     def test_tracked_changes_accept(self):
@@ -36,7 +36,7 @@ class trackedchanges(UITestCase):
             type_text(xWriterEdit, "Test LibreOffice")
             self.xUITest.executeCommand(".uno:ShowTrackedChanges")
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
                 xAccBtn = xTrackDlg.getChild("accept")
                 xAccBtn.executeAction("CLICK", tuple())
 
@@ -52,7 +52,7 @@ class trackedchanges(UITestCase):
             type_text(xWriterEdit, "Test LibreOffice")
             self.xUITest.executeCommand(".uno:ShowTrackedChanges")
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
 
                 xAccBtn = xTrackDlg.getChild("acceptall")
                 xAccBtn.executeAction("CLICK", tuple())
@@ -70,7 +70,7 @@ class trackedchanges(UITestCase):
             type_text(xWriterEdit, "Test LibreOffice")
             self.xUITest.executeCommand(".uno:ShowTrackedChanges")
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
 
                 xRejBtn = xTrackDlg.getChild("reject")
                 xRejBtn.executeAction("CLICK", tuple())
@@ -87,7 +87,7 @@ class trackedchanges(UITestCase):
             type_text(xWriterEdit, "Test LibreOffice")
             self.xUITest.executeCommand(".uno:ShowTrackedChanges")
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
 
                 xAccBtn = xTrackDlg.getChild("rejectall")
                 xAccBtn.executeAction("CLICK", tuple())
@@ -136,7 +136,7 @@ class trackedchanges(UITestCase):
                     "Unknown Author\t01/24/2020 16:19:39\t",
                     "Xisco Fauli\t01/27/2020 17:42:55\t"]
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
                 changesList = xTrackDlg.getChild("writerchanges")
 
                 resultsAccept = [
@@ -195,7 +195,7 @@ class trackedchanges(UITestCase):
 
             self.assertEqual(5, document.CurrentController.PageCount)
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg:
                 changesList = xTrackDlg.getChild("writerchanges")
                 self.assertEqual(147, len(changesList.getChildren()))
 
diff --git a/sw/qa/uitest/writer_tests/wordCount.py b/sw/qa/uitest/writer_tests/wordCount.py
index 4e0fe9298dcd..3632b4587c9a 100644
--- a/sw/qa/uitest/writer_tests/wordCount.py
+++ b/sw/qa/uitest/writer_tests/wordCount.py
@@ -20,7 +20,7 @@ class writerWordCount(UITestCase):
             type_text(xWriterEdit, "Test for word count dialog") #type text
             xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS": "0", "END_POS": "8"})) #select two words
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
@@ -49,7 +49,7 @@ class writerWordCount(UITestCase):
 
             xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS": "24", "END_POS": "39"})) #select two words
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
                 xselectchars = xDialog.getChild("selectchars")
@@ -73,13 +73,13 @@ class writerWordCount(UITestCase):
         with self.ui_test.create_doc_in_start_center("writer") as document:
             xWriterDoc = self.xUITest.getTopFocusWindow()
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close"):
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close"):
                 pass
 
     def test_tdf58050(self):
         with self.ui_test.load_file(get_url_for_data_file("tdf58050.html")) as writer_doc:
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
@@ -107,7 +107,7 @@ class writerWordCount(UITestCase):
             #Open writer, enter "Testing one two! Test?"
             type_text(xWriterEdit, "Testing one two! Test?")
             #-> LO says: 4 words. SUCCESS! :)
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
@@ -139,7 +139,7 @@ class writerWordCount(UITestCase):
             type_text(xWriterEdit, "This is a test sentence.")
             #3. Open the word count dialogue.
             #   Word count in both, dialogue and status line, shows 5 words.
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
@@ -163,7 +163,7 @@ class writerWordCount(UITestCase):
             #5. Replace selection by a non-breaking space by pressing Shift+Ctrl+Space.  Don't move the cursor.
             self.xUITest.executeCommand(".uno:InsertNonBreakingSpace")
             #   Word count in dialogue shows 4 words, whereas in the status line it shows 5 words.
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
@@ -185,7 +185,7 @@ class writerWordCount(UITestCase):
             #6. Move the cursor by pressing Left.
             self.xUITest.executeCommand(".uno:GoLeft")
             #   Word count in both, dialogue and status line, shows 5 words.
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
@@ -211,7 +211,7 @@ class writerWordCount(UITestCase):
             xWriterEdit = xWriterDoc.getChild("writer_edit")
             #1. Open attached document
             #2. Tools> Word count
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")
                 xselectchars = xDialog.getChild("selectchars")
@@ -255,7 +255,7 @@ class writerWordCount(UITestCase):
 
             self.xUITest.executeCommand(".uno:SelectAll")
 
-            with self.ui_test.execute_modeless_dialog_through_command_guarded(".uno:WordCountDialog", close_button="close") as xDialog:
+            with self.ui_test.execute_modeless_dialog_through_command(".uno:WordCountDialog", close_button="close") as xDialog:
 
                 xselectwords = xDialog.getChild("selectwords")
                 xdocwords = xDialog.getChild("docwords")