CppunitTest_framework_loadenv: inherit from UnoApiTest

Change-Id: I9c997691d6b7f0c46089eec86b614bcd1a0d71a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143102
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2022-11-22 11:18:55 +01:00
parent 9d4627322f
commit 8654586816
2 changed files with 10 additions and 15 deletions

View file

@ -21,8 +21,11 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_loadenv, \
cppuhelper \
sal \
salhelper \
subsequenttest \
test \
unotest \
utl \
tl \
vcl \
))

View file

@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/bootstrapfixture.hxx>
#include <unotest/macros_test.hxx>
#include <test/unoapi_test.hxx>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XFrame.hpp>
@ -22,21 +21,15 @@ using namespace ::com::sun::star;
namespace
{
/// Covers framework/source/loadenv/ fixes.
class Test : public test::BootstrapFixture, public unotest::MacrosTest
class Test : public UnoApiTest
{
public:
void setUp() override;
Test()
: UnoApiTest("/framework/qa/cppunit/data/")
{
}
};
void Test::setUp()
{
test::BootstrapFixture::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
}
constexpr OUStringLiteral DATA_DIRECTORY = u"/framework/qa/cppunit/data/";
class DocumentOpener
{
public:
@ -61,8 +54,7 @@ CPPUNIT_TEST_FIXTURE(Test, testDoubleLoading)
// path.
for (int i = 0; i < 2; ++i)
{
auto pURL = std::make_unique<OUString>(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "double-loading.odt");
auto pURL = std::make_unique<OUString>(createFileURL(u"double-loading.odt"));
Application::PostUserEvent(LINK(nullptr, DocumentOpener, OpenDocument), pURL.release());
}
Scheduler::ProcessEventsToIdle();