sd/qa/unit/tiledrendering/LOKitSearchTest.cxx | 27 ++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
New commits: commit a5a487832820cd1f82d3f5dd73aa22045e805917 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 31 11:59:23 2022 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Oct 31 15:32:15 2022 +0100 CppunitTest_sd_tiledrendering: inherit from UnoApiTest (part2) Change-Id: I541eb1f119c37c263814a9a5c7944461220b11e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142070 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx index 12b83754dbd6..d47cb3700ce3 100644 --- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx +++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx @@ -33,13 +33,13 @@ using namespace css; -class LOKitSearchTest : public SdModelTestBase, public XmlTestTools +class LOKitSearchTest : public UnoApiTest, public XmlTestTools { -private: - static constexpr OUStringLiteral DATA_DIRECTORY = u"/sd/qa/unit/tiledrendering/data/"; - public: - LOKitSearchTest() = default; + LOKitSearchTest() + : UnoApiTest("/sd/qa/unit/tiledrendering/data/") + { + } virtual void setUp() override; virtual void tearDown() override; @@ -85,42 +85,37 @@ private: const uno::Sequence<beans::PropertyValue>& rArguments = uno::Sequence<beans::PropertyValue>()); - uno::Reference<lang::XComponent> mxComponent; std::unique_ptr<CallbackRecorder> mpCallbackRecorder; }; void LOKitSearchTest::setUp() { - test::BootstrapFixture::setUp(); + UnoApiTest::setUp(); // prevent showing warning message box setenv("OOX_NO_SMARTART_WARNING", "1", 1); comphelper::LibreOfficeKit::setActive(true); - mxDesktop.set( - css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); mpCallbackRecorder = std::make_unique<CallbackRecorder>(); } void LOKitSearchTest::tearDown() { if (mxComponent.is()) + { mxComponent->dispose(); + mxComponent.clear(); + } comphelper::LibreOfficeKit::setActive(false); - test::BootstrapFixture::tearDown(); + UnoApiTest::tearDown(); } SdXImpressDocument* LOKitSearchTest::createDoc(const char* pName, const uno::Sequence<beans::PropertyValue>& rArguments) { - if (mxComponent.is()) - mxComponent->dispose(); - - mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) - + OUString::createFromAscii(pName)); - + loadFromURL(OUString::createFromAscii(pName)); SdXImpressDocument* pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); CPPUNIT_ASSERT(pImpressDocument); pImpressDocument->initializeForTiledRendering(rArguments);
