qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXDocumentIndex.csv | 41 ---
qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java | 118
----------
sw/qa/api/SwXDocumentIndex.cxx | 102
+++-----
sw/qa/unoapi/sw_1.sce | 1
5 files changed, 46 insertions(+), 217 deletions(-)
New commits:
commit bb720ac6aba93256c0ecdd8e50b29e750428ff49
Author: anfanite396 <dipamt1...@gmail.com>
AuthorDate: Thu Aug 17 18:55:12 2023 +0530
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Aug 23 15:30:00 2023 +0200
tdf#45904: Remove old SwXDocumentIndex Java test
Change-Id: Idca41ac1aed35552a749eb62e886c06cec94b3e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155790
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4fcb8728eb98..52cccbc05110 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1098,7 +1098,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sw/SwXCell \
qadevOOo/tests/java/mod/_sw/SwXCellRange \
qadevOOo/tests/java/mod/_sw/SwXChapterNumbering \
- qadevOOo/tests/java/mod/_sw/SwXDocumentIndex \
qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes \
qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark \
qadevOOo/tests/java/mod/_sw/SwXDrawPage \
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXDocumentIndex.csv
b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXDocumentIndex.csv
deleted file mode 100644
index cd591f1205cc..000000000000
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXDocumentIndex.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"Title"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"IsProtected"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleHeading"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel1"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel2#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel3#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel4#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel5#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel6#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel7#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel8#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel9#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleLevel10#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ParaStyleSeparator#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"TextColumns"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"BackGraphic"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"BackGraphicLocation"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"BackColor"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"BackTransparent"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"LevelFormat#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"CreateFromChapter#optional"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"ContentSection"
-"SwXDocumentIndex";"com::sun::star::text::BaseIndex";"HeaderSection"
-"SwXDocumentIndex";"com::sun::star::lang::XComponent";"dispose()"
-"SwXDocumentIndex";"com::sun::star::lang::XComponent";"addEventListener()"
-"SwXDocumentIndex";"com::sun::star::lang::XComponent";"removeEventListener()"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"UseAlphabeticalSeparators#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"UseKeyAsEntry#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"UseCombinedEntries#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"IsCaseSensitive#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"UsePP#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"UseDash#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"UseUpperCase#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"MainEntryCharacterStyleName#optional"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"DocumentIndexMarks"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"Locale"
-"SwXDocumentIndex";"com::sun::star::text::DocumentIndex";"SortAlgorithm"
-"SwXDocumentIndex";"com::sun::star::text::XDocumentIndex";"getServiceName()"
-"SwXDocumentIndex";"com::sun::star::text::XDocumentIndex";"update()"
-"SwXDocumentIndex";"com::sun::star::text::XTextContent";"attach()"
-"SwXDocumentIndex";"com::sun::star::text::XTextContent";"getAnchor()"
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
deleted file mode 100644
index 94ff90072a30..000000000000
--- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
+++ /dev/null
@@ -1,118 +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.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextRange;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.text.DocumentIndex</code>. <p>
- * Object implements the following interfaces :
- * <ul>
- * <li> <code>com::sun::star::lang::XComponent</code></li>
- * <li> <code>com::sun::star::text::XDocumentIndex</code></li>
- * <li> <code>com::sun::star::text::BaseIndex</code></li>
- * <li> <code>com::sun::star::text::XTextContent</code></li>
- * <li> <code>com::sun::star::text::DocumentIndex</code></li>
- * </ul> <p>
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurrently.
- * @see com.sun.star.lang.XComponent
- * @see com.sun.star.text.XDocumentIndex
- * @see com.sun.star.text.BaseIndex
- * @see com.sun.star.text.XTextContent
- * @see com.sun.star.text.DocumentIndex
- * @see ifc.lang._XComponent
- * @see ifc.text._XDocumentIndex
- * @see ifc.text._BaseIndex
- * @see ifc.text._XTextContent
- * @see ifc.text._DocumentIndex
- */
-public class SwXDocumentIndex 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.DocumentIndex</code>, then created document index
- * is inserted to the text of the document as content.
- *
- */
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters tParam,
PrintWriter log) throws Exception {
- XTextContent xTC = null;
- Object instance = null;
-
- SOfficeFactory.getFactory(tParam.getMSF());
- log.println( "creating a test environment" );
- xTC = SOfficeFactory.createIndex(xTextDoc,
"com.sun.star.text.DocumentIndex");
- instance = SOfficeFactory.createIndex(xTextDoc,
"com.sun.star.text.DocumentIndex");
-
- XText oText = xTextDoc.getText();
- XTextCursor oCursor = oText.createTextCursor();
-
- log.println("inserting the Index into text document");
- oText.insertTextContent(oCursor, xTC, false);
-
- TestEnvironment tEnv = new TestEnvironment(xTC);
-
- tEnv.addObjRelation("CONTENT",
UnoRuntime.queryInterface(XTextContent.class,instance));
- oCursor.gotoEnd(false);
- tEnv.addObjRelation("RANGE",
UnoRuntime.queryInterface(XTextRange.class, oCursor));
-
- // relation for XDocumentIndex
- tEnv.addObjRelation("TextDoc", xTextDoc);
-
- return tEnv;
- } // finish method getTestEnvironment
-
-} // finish class SwXDocumentIndex
-
diff --git a/sw/qa/api/SwXDocumentIndex.cxx b/sw/qa/api/SwXDocumentIndex.cxx
index 32fb66921d9c..929bf6e942ee 100644
--- a/sw/qa/api/SwXDocumentIndex.cxx
+++ b/sw/qa/api/SwXDocumentIndex.cxx
@@ -7,14 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/bootstrapfixture.hxx>
-#include <test/lang/xserviceinfo.hxx>
+#include <test/unoapi_test.hxx>
#include <test/lang/xcomponent.hxx>
+#include <test/lang/xserviceinfo.hxx>
#include <test/text/baseindex.hxx>
#include <test/text/textdocumentindex.hxx>
#include <test/text/xdocumentindex.hxx>
#include <test/text/xtextcontent.hxx>
-#include <unotest/macros_test.hxx>
#include <com/sun/star/frame/Desktop.hpp>
@@ -28,36 +27,66 @@
#include <com/sun/star/text/XDocumentIndex.hpp>
using namespace css;
+using namespace css::uno;
namespace
{
/**
* Test for Java API test of file com.sun.star.comp.office.SwXDocumentIndex.csv
*/
-class SwXDocumentIndex final : public test::BootstrapFixture,
- public unotest::MacrosTest,
+class SwXDocumentIndex final : public UnoApiTest,
+ public apitest::XServiceInfo,
public apitest::XDocumentIndex,
public apitest::BaseIndex,
public apitest::TextDocumentIndex,
public apitest::XTextContent,
- public apitest::XServiceInfo,
public apitest::XComponent
{
- uno::Reference<text::XTextDocument> mxTextDocument;
- uno::Reference<text::XTextRange> mxTextRange;
- uno::Reference<text::XTextContent> mxTextContent;
+ Reference<text::XTextDocument> mxTextDocument;
+ Reference<text::XTextRange> mxTextRange;
+ Reference<text::XTextContent> mxTextContent;
public:
- virtual void setUp() override;
- virtual void tearDown() override;
-
+ // SwXDocumentIndex()
+ // : apitest::XServiceInfo("SwXDocumentIndex",
"com.sun.star.text.BaseIndex"){};
SwXDocumentIndex()
- : apitest::XServiceInfo("SwXDocumentIndex",
"com.sun.star.text.BaseIndex"){};
- uno::Reference<uno::XInterface> init() override;
- uno::Reference<text::XTextRange> getTextRange() override;
- uno::Reference<text::XTextContent> getTextContent() override;
+ : UnoApiTest("")
+ , apitest::XServiceInfo("SwXDocumentIndex",
"com.sun.star.text.BaseIndex")
+ {
+ }
+
+ virtual void setUp() override
+ {
+ UnoApiTest::setUp();
+ mxDesktop.set(frame::Desktop::create(mxComponentContext));
+ mxComponent = loadFromDesktop("private:factory/swriter");
+ CPPUNIT_ASSERT(mxComponent.is());
+ }
+
+ Reference<XInterface> init() override
+ {
+ mxTextDocument = Reference<text::XTextDocument>(mxComponent,
UNO_QUERY_THROW);
+ Reference<lang::XMultiServiceFactory> xMSF(mxTextDocument,
UNO_QUERY_THROW);
+ Reference<text::XDocumentIndex> xDocumentIndex(
+ xMSF->createInstance("com.sun.star.text.DocumentIndex"),
UNO_QUERY_THROW);
+
+ auto xText = getTextDocument()->getText();
+ auto xTextCursor = xText->createTextCursor();
+ CPPUNIT_ASSERT(xTextCursor.is());
+ xText->insertTextContent(xTextCursor, xDocumentIndex, false);
+ xTextCursor->gotoEnd(false);
+
+ mxTextRange = Reference<text::XTextRange>(xTextCursor,
UNO_QUERY_THROW);
+ mxTextContent = Reference<text::XTextContent>(
+ xMSF->createInstance("com.sun.star.text.DocumentIndex"),
UNO_QUERY_THROW);
+
+ return xDocumentIndex;
+ }
+
+ Reference<text::XTextRange> getTextRange() override { return mxTextRange;
};
+ Reference<text::XTextContent> getTextContent() override { return
mxTextContent; };
bool isAttachSupported() override { return true; }
- uno::Reference<text::XTextDocument> getTextDocument() override { return
mxTextDocument; }
+ Reference<text::XTextDocument> getTextDocument() override { return
mxTextDocument; }
void triggerDesktopTerminate() override {}
CPPUNIT_TEST_SUITE(SwXDocumentIndex);
@@ -74,45 +103,6 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-void SwXDocumentIndex::setUp()
-{
- test::BootstrapFixture::setUp();
-
- mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxTextDocument = uno::Reference<text::XTextDocument>(
- loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument"),
- uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT(mxTextDocument.is());
-}
-
-void SwXDocumentIndex::tearDown()
-{
- if (mxTextDocument.is())
- mxTextDocument->dispose();
-
- test::BootstrapFixture::tearDown();
-}
-
-uno::Reference<uno::XInterface> SwXDocumentIndex::init()
-{
- uno::Reference<lang::XMultiServiceFactory> xMSF(mxTextDocument,
uno::UNO_QUERY_THROW);
- uno::Reference<text::XDocumentIndex> xDocumentIndex(
- xMSF->createInstance("com.sun.star.text.DocumentIndex"),
uno::UNO_QUERY_THROW);
- auto xText = getTextDocument()->getText();
- auto xTextCursor = xText->createTextCursor();
- CPPUNIT_ASSERT(xTextCursor.is());
- xText->insertTextContent(xTextCursor, xDocumentIndex, false);
- xTextCursor->gotoEnd(false);
- mxTextRange = uno::Reference<text::XTextRange>(xTextCursor,
uno::UNO_QUERY_THROW);
- mxTextContent = uno::Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.DocumentIndex"),
uno::UNO_QUERY_THROW);
- return xDocumentIndex;
-}
-
-uno::Reference<text::XTextRange> SwXDocumentIndex::getTextRange() { return
mxTextRange; }
-
-uno::Reference<text::XTextContent> SwXDocumentIndex::getTextContent() { return
mxTextContent; }
-
CPPUNIT_TEST_SUITE_REGISTRATION(SwXDocumentIndex);
}
diff --git a/sw/qa/unoapi/sw_1.sce b/sw/qa/unoapi/sw_1.sce
index b1880d188860..69d989ffcf2f 100644
--- a/sw/qa/unoapi/sw_1.sce
+++ b/sw/qa/unoapi/sw_1.sce
@@ -41,6 +41,5 @@
-o sw.SwXCell
-o sw.SwXCellRange
-o sw.SwXChapterNumbering
--o sw.SwXDocumentIndex
-o sw.SwXDocumentIndexMark
-o sw.SwXDocumentIndexes
