diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-20 09:45:36 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-06-20 19:47:45 +0200 |
| commit | 37c157340f90aac9d044aa351e5f98299da7342c (patch) | |
| tree | b2ea1b01122b85e4822a3ef1920df39e5c8c0af8 /vcl | |
| parent | a6a447b08dd3959747181fe5350db68acc8c7481 (diff) | |
Propagate failure out from css.ui.test.XUITest::executeCommand/Dialog
Change-Id: Id7bd2d6f35f45d9957facf56d66cfc57a1e0ef6a
Reviewed-on: https://gerrit.libreoffice.org/39002
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/uitest/uitest.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/uitest/uno/uitest_uno.cxx | 12 |
2 files changed, 10 insertions, 14 deletions
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() |