summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/qa/complex/api_internal/api.lst1
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnotes.csv4
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXFootnotes.java110
-rw-r--r--sw/qa/api/SwXFootnotes.cxx98
-rw-r--r--sw/qa/unoapi/sw_2.sce1
6 files changed, 40 insertions, 175 deletions
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 080b808d825b..7dfab8feb3af 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -145,7 +145,6 @@ job209=sw.SwXEndnoteProperties
job211=sw.SwXFieldMaster
job212=sw.SwXFootnote
job213=sw.SwXFootnoteProperties
-job214=sw.SwXFootnotes
job215=sw.SwXFootnoteText
job216=sw.SwXFrames
job217=sw.SwXHeadFootText
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index a11c799ab852..3a9d0503cba8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1101,7 +1101,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sw/SwXFieldMaster \
qadevOOo/tests/java/mod/_sw/SwXFootnote \
qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties \
- qadevOOo/tests/java/mod/_sw/SwXFootnotes \
qadevOOo/tests/java/mod/_sw/SwXFootnoteText \
qadevOOo/tests/java/mod/_sw/SwXFrames \
qadevOOo/tests/java/mod/_sw/SwXHeadFootText \
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnotes.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnotes.csv
deleted file mode 100644
index c9749ef355c5..000000000000
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnotes.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"SwXFootnotes";"com::sun::star::container::XIndexAccess";"getCount()"
-"SwXFootnotes";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"SwXFootnotes";"com::sun::star::container::XElementAccess";"getElementType()"
-"SwXFootnotes";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java
deleted file mode 100644
index d62e2097125f..000000000000
--- a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sw;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XFootnote;
-import com.sun.star.text.XFootnotesSupplier;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.text.Footnotes</code>.<p>
- * Object implements the following interfaces :
- * <ul>
- * <li> <code>com::sun::star::container::XIndexAccess</code></li>
- * <li> <code>com::sun::star::container::XElementAccess</code></li>
- * </ul> <p>
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurrently.
- * @see com.sun.star.container.XIndexAccess
- * @see com.sun.star.container.XElementAccess
- * @see ifc.container._XIndexAccess
- * @see ifc.container._XElementAccess
- */
-public class SwXFootnotes extends TestCase {
- XTextDocument xTextDoc;
-
- /**
- * Creates text document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
- log.println( "creating a textdocument" );
- xTextDoc = SOF.createTextDoc( null );
- }
-
- /**
- * Disposes text document.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println( " disposing xTextDoc " );
- util.DesktopTools.closeDoc(xTextDoc);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Creates an instance of the service
- * <code>com.sun.star.text.Footnote</code>. Then inserts created Footnote
- * to the text, and finally gets all footnotes of text document
- * through <code>XFootnotesSupplier</code> interface.
- */
- @Override
- public TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log ) throws Exception {
- XFootnotesSupplier oInterface = null;
- XInterface oObj = null;
-
- log.println( "Creating a test environment" );
- XMultiServiceFactory msf = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc);
- log.println("creating a footnote");
- XFootnote oFootnote;
-
- oFootnote = UnoRuntime.queryInterface(XFootnote.class,
- msf.createInstance("com.sun.star.text.Footnote"));
-
- XText oText = xTextDoc.getText();
- XTextCursor oCursor = oText.createTextCursor();
-
- log.println("inserting the footnote into text document");
- oText.insertTextContent(oCursor, oFootnote, false);
- oInterface = UnoRuntime.queryInterface(XFootnotesSupplier.class, xTextDoc);
- oObj = oInterface.getFootnotes();
-
- log.println( "creating a new environment for Footnotes object" );
- TestEnvironment tEnv = new TestEnvironment(oObj);
- return tEnv;
- }
-
-} // finish class SwXFootnote
-
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: */
diff --git a/sw/qa/unoapi/sw_2.sce b/sw/qa/unoapi/sw_2.sce
index 047870b5ef98..24df90b14ca9 100644
--- a/sw/qa/unoapi/sw_2.sce
+++ b/sw/qa/unoapi/sw_2.sce
@@ -22,7 +22,6 @@
-o sw.SwXFootnote
-o sw.SwXFootnoteProperties
-o sw.SwXFootnoteText
--o sw.SwXFootnotes
-o sw.SwXFrames
-o sw.SwXHeadFootText
-o sw.SwXLineNumberingProperties
generated by cgit (git 2.34.1) at 2024-06-18 12:20:23 +0000