CppunitTest_writerfilter_rtftok: inherit from UnoApiTest

Change-Id: I24dce2b743a2c2d1a7cc96b8d7833bde0ab385d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142096
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

6 files changed, 58 insertions, 207 deletions

diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx b/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx
index 5f4091688b16..6bca37ae5a2f 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx
@@ -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/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -21,44 +20,22 @@ using namespace ::com::sun::star;
 namespace
 {
 /// Tests for writerfilter/source/rtftok/rtfdispatchsymbol.cxx.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public UnoApiTest
 {
-private:
-    uno::Reference<lang::XComponent> mxComponent;
-
 public:
-    void setUp() override;
-    void tearDown() override;
-    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+    Test()
+        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+    {
+    }
 };
 
-void Test::setUp()
-{
-    test::BootstrapFixture::setUp();
-
-    mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
-
 CPPUNIT_TEST_FIXTURE(Test, testPage)
 {
     // Given a file with a \page and 2 \par tokens:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "page.rtf";
-
-    // When loading that file:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"page.rtf");
 
     // Then make sure we get exactly two paragraphs:
-    uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XEnumerationAccess> xText(xTextDocument->getText(), uno::UNO_QUERY);
     uno::Reference<container::XEnumeration> xParagraphs = xText->createEnumeration();
     xParagraphs->nextElement();
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx b/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx
index 4479a0c3cbd3..6b9cf301b918 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx
@@ -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/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -20,44 +19,22 @@ using namespace ::com::sun::star;
 namespace
 {
 /// Tests for writerfilter/source/rtftok/rtfdispatchvalue.cxx.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public UnoApiTest
 {
-private:
-    uno::Reference<lang::XComponent> mxComponent;
-
 public:
-    void setUp() override;
-    void tearDown() override;
-    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+    Test()
+        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+    {
+    }
 };
 
-void Test::setUp()
-{
-    test::BootstrapFixture::setUp();
-
-    mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
-
 CPPUNIT_TEST_FIXTURE(Test, testFollowStyle)
 {
     // Given a file with \snext:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "follow-style.rtf";
-
-    // When loading that file:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"follow-style.rtf");
 
     // Then make sure we set the follow of the para style correctly:
-    uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(getComponent(),
+    uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(mxComponent,
                                                                          uno::UNO_QUERY);
     uno::Reference<container::XNameAccess> xStyleFamilies
         = xStyleFamiliesSupplier->getStyleFamilies();
@@ -77,14 +54,11 @@ CPPUNIT_TEST_FIXTURE(Test, testFollowStyle)
 CPPUNIT_TEST_FIXTURE(Test, testNegativePageBorder)
 {
     // Given a document with a top margin and a border which has more spacing than the margin:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "negative-page-border.rtf";
-
-    // When loading that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"negative-page-border.rtf");
 
     // Then make sure that the border distance is negative, so it can appear at the correct
     // position:
-    uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(getComponent(),
+    uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(mxComponent,
                                                                          uno::UNO_QUERY);
     uno::Reference<container::XNameAccess> xStyleFamilies
         = xStyleFamiliesSupplier->getStyleFamilies();
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx b/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx
index f33f0f0e58be..cade6c2d35ae 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx
@@ -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/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
@@ -25,45 +24,23 @@ using namespace ::com::sun::star;
 namespace
 {
 /// Tests for writerfilter/source/rtftok/rtfdocumentimpl.cxx.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public UnoApiTest
 {
-private:
-    uno::Reference<lang::XComponent> mxComponent;
-
 public:
-    void setUp() override;
-    void tearDown() override;
-    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+    Test()
+        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+    {
+    }
 };
 
-void Test::setUp()
-{
-    test::BootstrapFixture::setUp();
-
-    mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
-
 CPPUNIT_TEST_FIXTURE(Test, testPicwPich)
 {
     // Given a document with a WMF file where picwgoal and picscalex is provided, so picw is not
     // relevant:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "picw-pich.rtf";
-
-    // When loading that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"picw-pich.rtf");
 
     // Then make sure the graphic's preferred size is correct:
-    uno::Reference<drawing::XDrawPageSupplier> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<drawing::XDrawPageSupplier> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<drawing::XDrawPage> xDrawPage = xTextDocument->getDrawPage();
     uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY);
     uno::Reference<graphic::XGraphic> xGraphic;
@@ -80,13 +57,10 @@ CPPUNIT_TEST_FIXTURE(Test, testPicwPich)
 CPPUNIT_TEST_FIXTURE(Test, testCharHiddenInTable)
 {
     // Given a document with a table, and a hidden \line in it:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "char-hidden-intbl.rtf";
-
-    // When loading that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"char-hidden-intbl.rtf");
 
     // Then make sure that line is indeed hidden:
-    uno::Reference<text::XTextTablesSupplier> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<text::XTextTablesSupplier> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xTables(xTextDocument->getTextTables(), uno::UNO_QUERY);
     uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0), uno::UNO_QUERY);
     uno::Reference<container::XEnumerationAccess> xCell(xTable->getCellByName("B1"),
@@ -106,13 +80,10 @@ CPPUNIT_TEST_FIXTURE(Test, testCharHiddenInTable)
 CPPUNIT_TEST_FIXTURE(Test, testDuplicatedImage)
 {
     // Given a document with 2 images:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "duplicated-image.rtf";
-
-    // When importing that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"duplicated-image.rtf");
 
     // Then make sure no duplicated images are created:
-    uno::Reference<drawing::XDrawPageSupplier> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<drawing::XDrawPageSupplier> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<drawing::XDrawPage> xDrawPage = xTextDocument->getDrawPage();
     // Without the accompanying fix in place, this test would have failed with:
     // - Expected: 2
@@ -124,13 +95,10 @@ CPPUNIT_TEST_FIXTURE(Test, testDuplicatedImage)
 CPPUNIT_TEST_FIXTURE(Test, testOldParaNumLeftMargin)
 {
     // Given a document with 3 paragraphs, the third one with a left indent:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "old-para-num-left-margin.rtf";
-
-    // When importing that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"old-para-num-left-margin.rtf");
 
     // Then make sure that the third paragraph has a left indent:
-    uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XEnumerationAccess> xText(xTextDocument->getText(), uno::UNO_QUERY);
     uno::Reference<container::XEnumeration> xParagraphs = xText->createEnumeration();
     xParagraphs->nextElement();
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
index 74af1dcf17ab..273e63c10ec3 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
@@ -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/beans/XPropertySet.hpp>
@@ -21,39 +20,19 @@ using namespace ::com::sun::star;
 namespace
 {
 /// Tests for writerfilter/source/rtftok/rtfsdrimport.cxx.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public UnoApiTest
 {
-private:
-    uno::Reference<lang::XComponent> mxComponent;
-
 public:
-    void setUp() override;
-    void tearDown() override;
-    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+    Test()
+        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+    {
+    }
 };
 
-void Test::setUp()
-{
-    test::BootstrapFixture::setUp();
-
-    mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
-
 CPPUNIT_TEST_FIXTURE(Test, testPictureInTextframe)
 {
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "picture-in-textframe.rtf";
-    getComponent() = loadFromDesktop(aURL);
-    uno::Reference<drawing::XDrawPageSupplier> xTextDocument(getComponent(), uno::UNO_QUERY);
+    loadFromURL(u"picture-in-textframe.rtf");
+    uno::Reference<drawing::XDrawPageSupplier> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<drawing::XDrawPage> xDrawPage = xTextDocument->getDrawPage();
     uno::Reference<beans::XPropertySet> xInnerShape(xDrawPage->getByIndex(1), uno::UNO_QUERY);
     text::TextContentAnchorType eAnchorType = text::TextContentAnchorType_AT_PARAGRAPH;
@@ -70,13 +49,10 @@ CPPUNIT_TEST_FIXTURE(Test, testWatermark)
 {
     // Given a document with a picture watermark, and the "washout" checkbox is ticked on the Word
     // UI:
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "watermark.rtf";
-
-    // When loading that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"watermark.rtf");
 
     // Then make sure the watermark effect is not lost on import:
-    uno::Reference<drawing::XDrawPageSupplier> xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+    uno::Reference<drawing::XDrawPageSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPagesSupplier->getDrawPage();
     uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY);
     drawing::ColorMode eMode{};
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
index abb0a19f4727..6bd3a62f19ef 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
@@ -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/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -20,39 +19,19 @@ using namespace ::com::sun::star;
 namespace
 {
 /// Tests for writerfilter/source/rtftok/rtfsprm.cxx.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public UnoApiTest
 {
-private:
-    uno::Reference<lang::XComponent> mxComponent;
-
 public:
-    void setUp() override;
-    void tearDown() override;
-    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+    Test()
+        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+    {
+    }
 };
 
-void Test::setUp()
-{
-    test::BootstrapFixture::setUp();
-
-    mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
-
 CPPUNIT_TEST_FIXTURE(Test, testLeftMarginDedup)
 {
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "left-margin-dedup.rtf";
-    getComponent() = loadFromDesktop(aURL);
-    uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY);
+    loadFromURL(u"left-margin-dedup.rtf");
+    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XEnumerationAccess> xText(xTextDocument->getText(), uno::UNO_QUERY);
     uno::Reference<container::XEnumeration> xParagraphs = xText->createEnumeration();
     uno::Reference<beans::XPropertySet> xParagraph(xParagraphs->nextElement(), uno::UNO_QUERY);
diff --git a/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx b/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx
index 530e9bb7245a..9ba3821d92a6 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx
@@ -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/text/XTextDocument.hpp>
@@ -18,44 +17,22 @@ using namespace ::com::sun::star;
 namespace
 {
 /// Tests for writerfilter/source/rtftok/rtftokenizer.cxx.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public UnoApiTest
 {
-private:
-    uno::Reference<lang::XComponent> mxComponent;
-
 public:
-    void setUp() override;
-    void tearDown() override;
-    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+    Test()
+        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+    {
+    }
 };
 
-void Test::setUp()
-{
-    test::BootstrapFixture::setUp();
-
-    mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
-
 CPPUNIT_TEST_FIXTURE(Test, testInvalidHex)
 {
     // Given a document with a markup like "\'3?":
-    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "invalid-hex.rtf";
-
-    // When load that document:
-    getComponent() = loadFromDesktop(aURL);
+    loadFromURL(u"invalid-hex.rtf");
 
     // Then make sure the result matches Word, rather than just refusing to import the document:
-    uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("xřx"), xTextDocument->getText()->getString());
 }
 }