summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2019-03-03 04:37:07 +0000
committerJens Carl <j.carl43@gmx.de>2019-03-03 19:46:33 +0100
commit167c5f9affd16ae5ece851de9e53f197d3036d93 (patch)
tree5992343021aefdd4b952bae9698758bce2791526 /qadevOOo
parent33048db2b4f7fd6bc7055effe11ee37cf7045c46 (diff)
tdf#45904 Move XTextRange Java tests to C++
Move XTextRange Java tests to C++ for ScAnnotationObj (also fixes i109517). Change-Id: Id7e45d9f1159b45fb267cb28dc875b62eae12e24 Reviewed-on: https://gerrit.libreoffice.org/68634 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv5
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java138
3 files changed, 0 insertions, 144 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d74a31d909db..9a2f09514ed5 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -948,7 +948,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell \
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable \
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet \
- qadevOOo/tests/java/mod/_sc/ScAnnotationObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \
qadevOOo/tests/java/mod/_sc/ScAreaLinkObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv
deleted file mode 100644
index 324d74dc0ac1..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"ScAnnotationObj";"com::sun::star::text::XTextRange";"getText()"
-"ScAnnotationObj";"com::sun::star::text::XTextRange";"getStart()"
-"ScAnnotationObj";"com::sun::star::text::XTextRange";"getEnd()"
-"ScAnnotationObj";"com::sun::star::text::XTextRange";"getString()"
-"ScAnnotationObj";"com::sun::star::text::XTextRange";"setString()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
deleted file mode 100644
index 26306312d075..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
+++ /dev/null
@@ -1,138 +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._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSheetAnnotation;
-import com.sun.star.sheet.XSheetAnnotationAnchor;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.XCell;
-import com.sun.star.table.XCellRange;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-
-/**
-* Test for object which represents some text annotation
-* anchored to some cell in spreadsheet (implement
-* <code>com.sun.star.sheet.CellAnnotation</code>).<p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::text::XSimpleText</code></li>
-* <li> <code>com::sun::star::text::XTextRange</code></li>
-* <li> <code>com::sun::star::sheet::XSheetAnnotation</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see com.sun.star.sheet.CellAnnotation
-* @see com.sun.star.text.XSimpleText
-* @see com.sun.star.text.XTextRange
-* @see com.sun.star.sheet.XSheetAnnotation
-* @see ifc.text._XSimpleText
-* @see ifc.text._XTextRange
-* @see ifc.sheet._XSheetAnnotation
-*/
-public class ScAnnotationObj extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * Creates a spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
- log.println( "creating a Spreadsheet document" );
- xSheetDoc = SOF.createCalcDoc(null);
- }
-
- /**
- * Disposes a spreadsheet document.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println( " disposing xSheetDoc " );
- XComponent oComp = UnoRuntime.queryInterface
- (XComponent.class, xSheetDoc) ;
- util.DesktopTools.closeDoc(oComp);
- }
-
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Retrieves a collection of spreadsheets from a document,
- * and takes one them. Then a single cell is retrieved, and
- * using its <code>com.sun.star.sheet.XSheetAnnotationAnchor</code>
- * interface an annotation is got.
- * Object relations created :
- * <ul>
- * <li> <code>'CELLPOS'</code> for
- * {@link ifc.sheet._XSheetAnnotation} (of <code>
- * com.sun.star.table.CellAddress</code> type) which
- * contains the annotation cell address.</li>
- * </ul>
- */
- @Override
- public TestEnvironment createTestEnvironment
- ( TestParameters Param, PrintWriter log )
- throws Exception {
-
- // creation of testobject here
- // first we write what we are intend to do to log file
- log.println( "Creating a test environment" );
-
- CellAddress cellPos = new CellAddress((short)0, 1, 2);
-
- log.println("Getting test object ") ;
-
- XSpreadsheetDocument xArea = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xSheetDoc);
- XSpreadsheets oSheets = xArea.getSheets();
-
- XIndexAccess XAccess = UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XCell oCell = null;
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),XAccess.getByIndex(cellPos.Sheet));
- XCellRange oCRange = UnoRuntime.queryInterface(XCellRange.class, oSheet);
- oCell = oCRange.getCellByPosition(cellPos.Column, cellPos.Row);
-
- XSheetAnnotationAnchor oAnnoA = UnoRuntime.queryInterface(XSheetAnnotationAnchor.class, oCell);
- XSheetAnnotation oAnno = oAnnoA.getAnnotation();
-
- TestEnvironment tEnv = new TestEnvironment( oAnno );
-
- tEnv.addObjRelation("CELLPOS", cellPos);
-
- // Other parameters required for interface tests
-
- return tEnv;
- }
-
-} // finish class ScAnnotationObj
-
-