1 files changed, 40 insertions, 58 deletions
diff --git a/sw/qa/api/SwXFootnotes.cxx b/sw/qa/api/SwXFootnotes.cxx
index 5b704500dda0..c04e2be384a4 100644
--- a/sw/qa/api/SwXFootnotes.cxx
+++ b/sw/qa/api/SwXFootnotes.cxx
@@ -7,19 +7,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/bootstrapfixture.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xindexaccess.hxx>
-#include <unotest/macros_test.hxx>
 
 #include <com/sun/star/frame/Desktop.hpp>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XFootnote.hpp>
 #include <com/sun/star/text/XFootnotesSupplier.hpp>
+#include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/text/XText.hpp>
 
 #include <comphelper/processfactory.hxx>
 
@@ -29,72 +28,55 @@ using namespace css::uno;
 namespace
 {
 /**
- * Initial tests for SwXFootnotesText.
+ * Initial tests for SwXFootnotes.
  */
-class SwXFootnotesText final : public test::BootstrapFixture,
-                               public unotest::MacrosTest,
-                               public apitest::XElementAccess,
-                               public apitest::XIndexAccess
+class SwXFootnotes final : public UnoApiTest,
+                           public apitest::XElementAccess,
+                           public apitest::XIndexAccess
 {
 public:
-    SwXFootnotesText();
-    virtual void setUp() override;
-    void tearDown() override;
+    SwXFootnotes()
+        : UnoApiTest("")
+        , XElementAccess(cppu::UnoType<text::XFootnote>::get())
+        , XIndexAccess(1)
+    {
+    }
 
-    Reference<XInterface> init() override;
+    virtual void setUp() override
+    {
+        UnoApiTest::setUp();
+        mxDesktop.set(frame::Desktop::create(mxComponentContext));
+        mxComponent = loadFromDesktop("private:factory/swriter");
+        CPPUNIT_ASSERT(mxComponent.is());
+    }
 
-    CPPUNIT_TEST_SUITE(SwXFootnotesText);
-    CPPUNIT_TEST(testGetElementType);
-    CPPUNIT_TEST(testHasElements);
-    CPPUNIT_TEST(testGetCount);
-    CPPUNIT_TEST(testGetByIndex);
-    CPPUNIT_TEST_SUITE_END();
+    Reference<XInterface> init() override
+    {
+        Reference<text::XTextDocument> xTextDocument(mxComponent, UNO_QUERY_THROW);
+        Reference<lang::XMultiServiceFactory> xMSF(mxComponent, UNO_QUERY_THROW);
 
-private:
-    Reference<lang::XComponent> component_;
-};
+        Reference<text::XFootnote> xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
+                                             UNO_QUERY_THROW);
 
-SwXFootnotesText::SwXFootnotesText()
-    : XElementAccess(cppu::UnoType<text::XFootnote>::get())
-    , XIndexAccess(1)
-{
-}
+        Reference<text::XText> xText = xTextDocument->getText();
+        Reference<text::XTextCursor> xCursor = xText->createTextCursor();
 
-void SwXFootnotesText::setUp()
-{
-    test::BootstrapFixture::setUp();
-    mxDesktop.set(
-        frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
-}
+        xText->insertTextContent(xCursor, xFootnote, false);
 
-void SwXFootnotesText::tearDown()
-{
-    if (component_.is())
-        component_->dispose();
+        Reference<text::XFootnotesSupplier> xSupplier(xTextDocument, UNO_QUERY_THROW);
 
-    test::BootstrapFixture::tearDown();
-}
-
-Reference<XInterface> SwXFootnotesText::init()
-{
-    component_ = loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
-    Reference<text::XTextDocument> xTextDocument(component_, UNO_QUERY_THROW);
-    Reference<lang::XMultiServiceFactory> xMSF(component_, UNO_QUERY_THROW);
-
-    Reference<text::XFootnote> xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
-                                         UNO_QUERY_THROW);
-
-    Reference<text::XText> xText = xTextDocument->getText();
-    Reference<text::XTextCursor> xCursor = xText->createTextCursor();
-
-    xText->insertTextContent(xCursor, xFootnote, false);
-
-    Reference<text::XFootnotesSupplier> xSupplier(xTextDocument, UNO_QUERY_THROW);
+        return Reference<XInterface>(xSupplier->getFootnotes(), UNO_QUERY_THROW);
+    }
 
-    return Reference<XInterface>(xSupplier->getFootnotes(), UNO_QUERY_THROW);
-}
+    CPPUNIT_TEST_SUITE(SwXFootnotes);
+    CPPUNIT_TEST(testGetElementType);
+    CPPUNIT_TEST(testHasElements);
+    CPPUNIT_TEST(testGetCount);
+    CPPUNIT_TEST(testGetByIndex);
+    CPPUNIT_TEST_SUITE_END();
+};
 
-CPPUNIT_TEST_SUITE_REGISTRATION(SwXFootnotesText);
+CPPUNIT_TEST_SUITE_REGISTRATION(SwXFootnotes);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */