[Libreoffice-commits] core.git: include/vcl offapi/com uitest/uitest vcl/source

[Stephan Bergmann]

 include/vcl/uitest/uitest.hxx           |    4 ++--
 offapi/com/sun/star/ui/test/XUITest.idl |    4 ++--
 uitest/uitest/test.py                   |    9 ++++++---
 vcl/source/uitest/uitest.cxx            |   12 ++++--------
 vcl/source/uitest/uno/uitest_uno.cxx    |   12 ++++++------
 5 files changed, 20 insertions(+), 21 deletions(-)

New commits:
commit 37c157340f90aac9d044aa351e5f98299da7342c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 20 09:45:36 2017 +0200

    Propagate failure out from css.ui.test.XUITest::executeCommand/Dialog
    
    Change-Id: Id7bd2d6f35f45d9957facf56d66cfc57a1e0ef6a
    Reviewed-on: https://gerrit.libreoffice.org/39002
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 1674ad2fd50f..4031402e8fc0 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -19,9 +19,9 @@ class UITEST_DLLPUBLIC UITest
 {
 public:
 
-    static void executeCommand(const OUString& rCommand);
+    static bool executeCommand(const OUString& rCommand);
 
-    static void executeDialog(const OUString& rCommand);
+    static bool executeDialog(const OUString& rCommand);
 
     static std::unique_ptr<UIObject> getFocusTopWindow();
 
diff --git a/offapi/com/sun/star/ui/test/XUITest.idl b/offapi/com/sun/star/ui/test/XUITest.idl
index 55f234164296..f4926a19bd09 100644
--- a/offapi/com/sun/star/ui/test/XUITest.idl
+++ b/offapi/com/sun/star/ui/test/XUITest.idl
@@ -16,9 +16,9 @@ module com { module sun { module star { module ui { module test {
 
 interface XUITest
 {
-    void executeCommand([in] string command);
+    boolean executeCommand([in] string command);
 
-    void executeDialog([in] string command);
+    boolean executeDialog([in] string command);
 
     XUIObject getTopFocusWindow();
 
diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index 04168c48ae2a..f477369154fa 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -70,7 +70,8 @@ class UITest(object):
 
     def execute_dialog_through_command(self, command):
         with EventListener(self._xContext, "DialogExecute") as event:
-            self._xUITest.executeDialog(command)
+            if not self._xUITest.executeDialog(command):
+                raise DialogNotExecutedException(command)
             time_ = 0
             while time_ < MAX_WAIT:
                 if event.executed:
@@ -83,7 +84,8 @@ class UITest(object):
 
     def execute_modeless_dialog_through_command(self, command):
         with EventListener(self._xContext, "ModelessDialogVisible") as event:
-            self._xUITest.executeCommand(command)
+            if not self._xUITest.executeCommand(command):
+                raise DialogNotExecutedException(command)
             time_ = 0
             while time_ < MAX_WAIT:
                 if event.executed:
@@ -160,7 +162,8 @@ class UITest(object):
 
     def close_doc(self):
         with EventListener(self._xContext, ["DialogExecute", "OnViewClosed"] ) as event:
-            self._xUITest.executeDialog(".uno:CloseDoc")
+            if not self._xUITest.executeDialog(".uno:CloseDoc"):
+                print(".uno:CloseDoc failed")
             time_ = 0
             while time_ < MAX_WAIT:
                 if event.hasExecuted("DialogExecute"):
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 1058ecefb956..086adfab0537 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -17,24 +17,20 @@
 
 #include <comphelper/dispatchcommand.hxx>
 
-void UITest::executeCommand(const OUString& rCommand)
+bool UITest::executeCommand(const OUString& rCommand)
 {
-    bool bSuccess = comphelper::dispatchCommand(
+    return comphelper::dispatchCommand(
         rCommand,
         {{"SynchronMode", -1, css::uno::Any(true),
           css::beans::PropertyState_DIRECT_VALUE}});
-
-    SAL_WARN_IF(!bSuccess, "vcl.uitest", "failed to execute command: " << rCommand);
 }
 
-void UITest::executeDialog(const OUString& rCommand)
+bool UITest::executeDialog(const OUString& rCommand)
 {
-    bool bSuccess = comphelper::dispatchCommand(
+    return comphelper::dispatchCommand(
         rCommand,
         {{"SynchronMode", -1, css::uno::Any(false),
           css::beans::PropertyState_DIRECT_VALUE}});
-
-    SAL_WARN_IF(!bSuccess, "vcl.uitest", "failed to execute dialog command: " << rCommand);
 }
 
 std::unique_ptr<UIObject> UITest::getFocusTopWindow()
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 1d874c32c7d1..9486ff752b97 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -38,9 +38,9 @@ public:
 
     UITestUnoObj();
 
-    void SAL_CALL executeCommand(const OUString& rCommand) override;
+    sal_Bool SAL_CALL executeCommand(const OUString& rCommand) override;
 
-    void SAL_CALL executeDialog(const OUString& rCommand) override;
+    sal_Bool SAL_CALL executeDialog(const OUString& rCommand) override;
 
     css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() override;
 
@@ -59,16 +59,16 @@ UITestUnoObj::UITestUnoObj():
 {
 }
 
-void SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand)
+sal_Bool SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand)
 {
     SolarMutexGuard aGuard;
-    UITest::executeCommand(rCommand);
+    return UITest::executeCommand(rCommand);
 }
 
-void SAL_CALL UITestUnoObj::executeDialog(const OUString& rCommand)
+sal_Bool SAL_CALL UITestUnoObj::executeDialog(const OUString& rCommand)
 {
     SolarMutexGuard aGuard;
-    UITest::executeDialog(rCommand);
+    return UITest::executeDialog(rCommand);
 }
 
 css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocusWindow()