mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uitest: provide a way to select a floating window, e.g. popup menu

Browse Source 
Change-Id: Ice418b974c59c7d8c773b81a82f0a06c84547f10
Reviewed-on: https://gerrit.libreoffice.org/35699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
2017-03-26 00:24:10 +01:00
parent 013e5bacc6
commit 3c979a362b
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vcl/uitest/uitest.hxx
View File

@@ -24,6 +24,8 @@ public:
static void executeDialog(const OUString& rCommand); static void executeDialog(const OUString& rCommand);
static std::unique_ptr<UIObject> getFocusTopWindow(); static std::unique_ptr<UIObject> getFocusTopWindow();
static std::unique_ptr<UIObject> getFloatWindow();
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
offapi/com/sun/star/ui/test/XUITest.idl
View File

@@ -21,6 +21,8 @@ interface XUITest
void executeDialog([in] string command); void executeDialog([in] string command);
XUIObject getTopFocusWindow(); XUIObject getTopFocusWindow();
XUIObject getFloatWindow();
}; };
}; }; }; }; }; }; }; }; }; };

12
vcl/source/uitest/uitest.cxx
View File

@@ -49,4 +49,16 @@ std::unique_ptr<UIObject> UITest::getFocusTopWindow()
return rWinData.mpFirstFrame->GetUITestFactory()(rWinData.mpFirstFrame); return rWinData.mpFirstFrame->GetUITestFactory()(rWinData.mpFirstFrame);
} }
std::unique_ptr<UIObject> UITest::getFloatWindow()
{
ImplSVData* pSVData = ImplGetSVData();
ImplSVWinData& rWinData = pSVData->maWinData;
VclPtr<vcl::Window> pFloatWin = rWinData.mpFirstFloat;
if (pFloatWin)
return pFloatWin->GetUITestFactory()(pFloatWin);
return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

9
vcl/source/uitest/uno/uitest_uno.cxx
View File

@@ -44,6 +44,8 @@ public:
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() override; css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() override;
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getFloatWindow() override;
OUString SAL_CALL getImplementationName() override; OUString SAL_CALL getImplementationName() override;
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
@@ -76,6 +78,13 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocus
return new UIObjectUnoObj(std::move(pObj)); return new UIObjectUnoObj(std::move(pObj));
} }
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getFloatWindow()
{
SolarMutexGuard aGuard;
std::unique_ptr<UIObject> pObj = UITest::getFloatWindow();
return new UIObjectUnoObj(std::move(pObj));
}
OUString SAL_CALL UITestUnoObj::getImplementationName() OUString SAL_CALL UITestUnoObj::getImplementationName()
{ {
return OUString("org.libreoffice.uitest.UITest"); return OUString("org.libreoffice.uitest.UITest");