From 6d9f68e47a1984fe310293ea2318e314f4a18bb2 Mon Sep 17 00:00:00 2001 From: anfanite396 Date: Thu, 17 Aug 2023 16:45:43 +0530 Subject: tdf#45904: Remove old SwXBookmark Java test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If17818329b805a03b975e105ea97f7c6cc16d1a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155767 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- framework/qa/complex/api_internal/api.lst | 1 - qadevOOo/Jar_OOoRunner.mk | 1 - .../sw/com.sun.star.comp.office.SwXBookmark.csv | 10 -- qadevOOo/tests/java/mod/_sw/SwXBookmark.java | 101 --------------------- sw/qa/api/SwXBookmark.cxx | 96 ++++++++------------ sw/qa/unoapi/sw_1.sce | 1 - 6 files changed, 37 insertions(+), 173 deletions(-) delete mode 100644 qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXBookmark.csv delete mode 100644 qadevOOo/tests/java/mod/_sw/SwXBookmark.java diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index 209b3ad1bcb8..6e1d1cbe8d65 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -139,7 +139,6 @@ job200=sw.SwAccessibleTableCellView job201=sw.SwAccessibleTextFrameView job202=sw.SwAccessibleTextGraphicObject job203=sw.SwXBodyText -job204=sw.SwXBookmark job206=sw.SwXCell job207=sw.SwXDocumentIndexes job208=sw.SwXDocumentIndexMark diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 52cccbc05110..a539bc96c16a 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -1094,7 +1094,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry \ qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup \ qadevOOo/tests/java/mod/_sw/SwXBodyText \ - qadevOOo/tests/java/mod/_sw/SwXBookmark \ qadevOOo/tests/java/mod/_sw/SwXCell \ qadevOOo/tests/java/mod/_sw/SwXCellRange \ qadevOOo/tests/java/mod/_sw/SwXChapterNumbering \ diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXBookmark.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXBookmark.csv deleted file mode 100644 index 5508d6f1bd0a..000000000000 --- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXBookmark.csv +++ /dev/null @@ -1,10 +0,0 @@ -"SwXBookmark";"com::sun::star::lang::XComponent";"dispose()" -"SwXBookmark";"com::sun::star::lang::XComponent";"addEventListener()" -"SwXBookmark";"com::sun::star::lang::XComponent";"removeEventListener()" -"SwXBookmark";"com::sun::star::text::TextContent";"AnchorType#optional" -"SwXBookmark";"com::sun::star::text::TextContent";"AnchorTypes#optional" -"SwXBookmark";"com::sun::star::text::TextContent";"TextWrap#optional" -"SwXBookmark";"com::sun::star::container::XNamed";"getName()" -"SwXBookmark";"com::sun::star::container::XNamed";"setName()" -"SwXBookmark";"com::sun::star::text::XTextContent";"attach()" -"SwXBookmark";"com::sun::star::text::XTextContent";"getAnchor()" diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java deleted file mode 100644 index 034a64b8e827..000000000000 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java +++ /dev/null @@ -1,101 +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.XTextContent; -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 - * com.sun.star.text.Bookmark.

- * Object implements the following interfaces : - *

- * This object test is NOT designed to be run in several - * threads concurrently. - * @see com.sun.star.container.XNamed - * @see com.sun.star.lang.XComponent - * @see com.sun.star.text.XTextContent - * @see com.sun.star.text.TextContent - * @see ifc.container._XNamed - * @see ifc.lang._XComponent - * @see ifc.text._XTextContent - * @see ifc.text._TextContent - */ -public class SwXBookmark 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. After creating - * a bookmark, it is inserted to the text document. - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); - XInterface oObj = null; - Object instance = null; - log.println( "creating a test environment" ); - oObj = SOfficeFactory.createBookmark( xTextDoc ); - SOfficeFactory.insertTextContent( xTextDoc, (XTextContent) oObj ); - instance = SOF.createInstance(xTextDoc,"com.sun.star.text.Bookmark"); - log.println( "creating a new environment for bodytext object" ); - TestEnvironment tEnv = new TestEnvironment( oObj ); - - util.dbg.printInterfaces((XInterface) instance); - - tEnv.addObjRelation("CONTENT", UnoRuntime.queryInterface(XTextContent.class,instance)); - tEnv.addObjRelation("RANGE", xTextDoc.getText().createTextCursor()); - return tEnv; - } // finish method getTestEnvironment - - -} // finish class SwXBookmark - diff --git a/sw/qa/api/SwXBookmark.cxx b/sw/qa/api/SwXBookmark.cxx index 185e0b53f1db..ca6c02d81f8b 100644 --- a/sw/qa/api/SwXBookmark.cxx +++ b/sw/qa/api/SwXBookmark.cxx @@ -7,11 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include #include #include -#include #include @@ -28,22 +27,48 @@ namespace /** * Initial tests for SwXBookmark. */ -class SwXBookmark final : public test::BootstrapFixture, - public unotest::MacrosTest, +class SwXBookmark final : public UnoApiTest, public apitest::XComponent, public apitest::XNamed, public apitest::XTextContent { public: - SwXBookmark(); - virtual void setUp() override; - void tearDown() override; - - Reference init() override; - Reference getTextRange() override; - Reference getTextContent() override; + SwXBookmark() + : UnoApiTest("") + , XNamed("Bookmark") + { + } + + virtual void setUp() override + { + UnoApiTest::setUp(); + mxDesktop.set(frame::Desktop::create(mxComponentContext)); + mxComponent = loadFromDesktop("private:factory/swriter"); + CPPUNIT_ASSERT(mxComponent.is()); + } + + Reference init() override + { + Reference xTextDocument(mxComponent, UNO_QUERY_THROW); + Reference xMSF(mxComponent, UNO_QUERY_THROW); + + Reference xText = xTextDocument->getText(); + Reference xCursor = xText->createTextCursor(); + + Reference xBookmark(xMSF->createInstance("com.sun.star.text.Bookmark"), + UNO_QUERY_THROW); + + xText->insertTextContent(xCursor, xBookmark, false); + mxTextRange = Reference(xCursor, UNO_QUERY_THROW); + mxTextContent = Reference( + xMSF->createInstance("com.sun.star.text.Bookmark"), UNO_QUERY_THROW); + + return Reference(xBookmark, UNO_QUERY_THROW); + } + + Reference getTextRange() override { return mxTextRange; }; + Reference getTextContent() override { return mxTextContent; }; bool isAttachSupported() override { return true; } - Reference getTextDocument() { return mxTextDocument; } void triggerDesktopTerminate() override { mxDesktop->terminate(); } CPPUNIT_TEST_SUITE(SwXBookmark); @@ -57,57 +82,10 @@ public: CPPUNIT_TEST_SUITE_END(); private: - Reference mxTextDocument; Reference mxTextRange; Reference mxTextContent; }; -SwXBookmark::SwXBookmark() - : XNamed("Bookmark") -{ -} - -void SwXBookmark::setUp() -{ - test::BootstrapFixture::setUp(); - - mxDesktop.set(frame::Desktop::create(mxComponentContext)); - mxTextDocument = Reference( - loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"), - UNO_QUERY_THROW); - CPPUNIT_ASSERT(mxTextDocument.is()); -} - -void SwXBookmark::tearDown() -{ - if (mxTextDocument.is()) - mxTextDocument->dispose(); - - test::BootstrapFixture::tearDown(); -} - -Reference SwXBookmark::init() -{ - Reference xMSF(mxTextDocument, UNO_QUERY_THROW); - - Reference xText = getTextDocument()->getText(); - Reference xCursor = xText->createTextCursor(); - - Reference xBookmark(xMSF->createInstance("com.sun.star.text.Bookmark"), - UNO_QUERY_THROW); - - xText->insertTextContent(xCursor, xBookmark, false); - mxTextRange = Reference(xCursor, UNO_QUERY_THROW); - mxTextContent = Reference( - xMSF->createInstance("com.sun.star.text.Bookmark"), UNO_QUERY_THROW); - - return Reference(xBookmark, UNO_QUERY_THROW); -} - -Reference SwXBookmark::getTextRange() { return mxTextRange; } - -Reference SwXBookmark::getTextContent() { return mxTextContent; } - CPPUNIT_TEST_SUITE_REGISTRATION(SwXBookmark); } diff --git a/sw/qa/unoapi/sw_1.sce b/sw/qa/unoapi/sw_1.sce index 69d989ffcf2f..8d26bee21e7f 100644 --- a/sw/qa/unoapi/sw_1.sce +++ b/sw/qa/unoapi/sw_1.sce @@ -37,7 +37,6 @@ -o sw.SwXAutoTextEntry -o sw.SwXAutoTextGroup -o sw.SwXBodyText --o sw.SwXBookmark -o sw.SwXCell -o sw.SwXCellRange -o sw.SwXChapterNumbering -- cgit