summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2017-09-03 08:04:24 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-10-09 01:15:49 +0200
commitf3c6264d1e8a599ddfb23f6dc9a9dd2e42885c19 (patch)
treef6cb952b89b8ac3fa7e7d90b146f9052101d7b81 /qadevOOo
parent46fdca1e7d64fc1bb0305a683b185f11a44c25eb (diff)
tdf#45904: Move _XAreaLinks Java to C++
This allows to re-activate the test and fixes #i84701. Change-Id: Ifd295e9521a04e88a68aa96fad8f9e8e32f927fa Reviewed-on: https://gerrit.libreoffice.org/41855 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv2
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java98
3 files changed, 0 insertions, 101 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index f29279109c4a..fb9e160cde8e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -584,7 +584,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
qadevOOo/tests/java/ifc/sheet/_TableValidation \
qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
- qadevOOo/tests/java/ifc/sheet/_XAreaLinks \
qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
qadevOOo/tests/java/ifc/sheet/_XCalculatable \
qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
index 67a7cb9178da..f88bd91a2c70 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
@@ -1,7 +1,5 @@
"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getCount()"
"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScAreaLinksObj";"com::sun::star::sheet::XAreaLinks";"insertAtPosition()"
-"ScAreaLinksObj";"com::sun::star::sheet::XAreaLinks";"removeByIndex()"
"ScAreaLinksObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAreaLinksObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScAreaLinksObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java b/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java
deleted file mode 100644
index 07b64b6a0b18..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XAreaLinks.java
+++ /dev/null
@@ -1,98 +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 ifc.sheet;
-
-import com.sun.star.sheet.XAreaLinks;
-import com.sun.star.table.CellAddress;
-import lib.MultiMethodTest;
-
-/**
-* Testing <code>com.sun.star.sheet.XAreaLinks</code>
-* interface methods :
-* <ul>
-* <li><code> insertAtPosition()</code></li>
-* <li><code> removeByIndex()</code></li>
-* </ul> <p>
-* Test is <b> NOT </b> multithread compliant. <p>
-* @see com.sun.star.sheet.XAreaLinks
-*/
-public class _XAreaLinks extends MultiMethodTest {
-
- public XAreaLinks oObj = null;
-
- /**
- * Inserts a new link into collection. Checks number of links
- * before and after method call. <p>
- * Has <b>OK</b> status if after method call number of
- * links increased by 1.
- */
- public void _insertAtPosition(){
- boolean bResult = true ;
- int cnt = 0;
-
- cnt = oObj.getCount() ;
- CellAddress addr = new CellAddress ((short) 1,2,3) ;
- String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc");
- oObj.insertAtPosition (addr, aSourceArea, "a2:b5", "", "") ;
-
- if (bResult) {
- int new_cnt = oObj.getCount() ;
-
- if (cnt + 1 != new_cnt) {
- bResult = false ;
- log.println("Number of links before insertAtPosition() call was " + cnt +
- ", after call is " + new_cnt) ;
- }
- }
-
- tRes.tested("insertAtPosition()", bResult) ;
- }
-
-
- /**
- * Removes a link from collection. Checks number of links
- * before and after method call. <p>
- * Has <b>OK</b> status if after method call number of
- * links decreases by 1. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> insertAtPosition </code> : to have at least one link. </li>
- * </ul>
- */
- public void _removeByIndex(){
- requiredMethod("insertAtPosition()") ;
-
- boolean bResult = true ;
- int lcnt = 0;
-
- lcnt = oObj.getCount() ;
- oObj.removeByIndex(0) ;
-
- int new_lcnt = oObj.getCount() ;
- if (lcnt - 1 != new_lcnt) {
- bResult = false ;
- log.println(" # Number of links before removeByIndex() call was " +
- lcnt + ", after call is " + new_lcnt) ;
- }
- tRes.tested("removeByIndex()", bResult) ;
- }
-
-} //EOC _XAreaLinks
-
-