uitest: guard execute_dialog_through_action

Mostly done with a script
for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac
< UITest: introduce guarded context managers >

Change-Id: I8b0e4aa746f7973b1bd1343219820d8b2315cf19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117703
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

2 files changed, 8 insertions, 12 deletions

diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index c601116d2a6b..833f5a726049 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -128,7 +128,9 @@ class UITest(object):
 
         raise DialogNotExecutedException(command)
 
-    def execute_dialog_through_action(self, ui_object, action, parameters = None, event_name = "DialogExecute"):
+    # Calls UITest.close_dialog_through_button at exit
+    @contextmanager
+    def execute_dialog_through_action(self, ui_object, action, parameters = None, event_name = "DialogExecute", close_button = "ok"):
         if parameters is None:
             parameters = tuple()
 
@@ -137,7 +139,11 @@ class UITest(object):
             time_ = 0
             while time_ < MAX_WAIT:
                 if event.executed:
-                    time.sleep(DEFAULT_SLEEP)
+                    xDialog = self._xUITest.getTopFocusWindow()
+                    try:
+                        yield xDialog
+                    finally:
+                        self.close_dialog_through_button(xDialog.getChild(close_button))
                     return
                 time_ += DEFAULT_SLEEP
                 time.sleep(DEFAULT_SLEEP)
diff --git a/uitest/uitest/uihelper/guarded.py b/uitest/uitest/uihelper/guarded.py
index 5cfed2d49e1a..f6e91b0f5088 100644
--- a/uitest/uitest/uihelper/guarded.py
+++ b/uitest/uitest/uihelper/guarded.py
@@ -21,16 +21,6 @@ def create_doc_in_start_center(testCase, app):
 
 # Calls UITest.close_dialog_through_button at exit
 @contextmanager
-def execute_dialog_through_action(testCase, ui_object, action, parameters = None, event_name = "DialogExecute", close_button = "ok"):
-    testCase.ui_test.execute_dialog_through_action(ui_object, action, parameters, event_name)
-    xDialog = testCase.xUITest.getTopFocusWindow()
-    try:
-        yield xDialog
-    finally:
-        testCase.ui_test.close_dialog_through_button(xDialog.getChild(close_button))
-
-# Calls UITest.close_dialog_through_button at exit
-@contextmanager
 def execute_dialog_through_command(testCase, command, printNames=False, close_button = "ok"):
     testCase.ui_test.execute_dialog_through_command(command, printNames)
     xDialog = testCase.xUITest.getTopFocusWindow()