diff options
author | Jens Carl <j.carl43@gmx.de> | 2018-06-13 05:51:11 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2018-06-13 17:53:30 +0200 |
commit | 600987b415e537362125b4445ab7132535e6e1e1 (patch) | |
tree | d032d3fda7e2c8d4987ceb5963bf21e3b0f40302 /qadevOOo | |
parent | 0554e74260ee684d0859d655e42da8ad6eefd4a9 (diff) |
tdf#45904 Move remaining _XCellRangeReferrer Java tests to C++
Move remaining _XCellRangeReferrer tests to C++ and partly fix #i84656.
Change-Id: I77cc8550888f460a6ae265816907a19a81cbe871
Reviewed-on: https://gerrit.libreoffice.org/55732
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
6 files changed, 0 insertions, 98 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 409785f35ef8..7718aa632156 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -565,7 +565,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \ qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \ qadevOOo/tests/java/ifc/sheet/_XCellRangeData \ - qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer \ qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \ qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \ qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv index a57801a581af..34f6a5e984dc 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv @@ -1,7 +1,6 @@ "ScDatabaseRangeObj";"com::sun::star::util::XRefreshable#optional";"refresh()" "ScDatabaseRangeObj";"com::sun::star::util::XRefreshable#optional";"addRefreshListener()" "ScDatabaseRangeObj";"com::sun::star::util::XRefreshable#optional";"removeRefreshListener()" -"ScDatabaseRangeObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()" "ScDatabaseRangeObj";"com::sun::star::container::XNamed";"getName()" "ScDatabaseRangeObj";"com::sun::star::container::XNamed";"setName()" "ScDatabaseRangeObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv index a022a86eb032..fbed879b91b9 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv @@ -1,3 +1,2 @@ -"ScNamedRangeObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()" "ScNamedRangeObj";"com::sun::star::container::XNamed";"getName()" "ScNamedRangeObj";"com::sun::star::container::XNamed";"setName()" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv index 35e1186c0e10..e3774a311576 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv @@ -12,7 +12,6 @@ "ScTabViewObj";"com::sun::star::sheet::XEnhancedMouseClickBroadcaster#optional";"removeEnhancedMouseClickHandler()" "ScTabViewObj";"com::sun::star::ui::XContextMenuInterception#optional";"registerContextMenuInterceptor()" "ScTabViewObj";"com::sun::star::ui::XContextMenuInterception#optional";"releaseContextMenuInterceptor()" -"ScTabViewObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()" "ScTabViewObj";"com::sun::star::container::XElementAccess";"getElementType()" "ScTabViewObj";"com::sun::star::container::XElementAccess";"hasElements()" "ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"startRangeSelection()" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv index 1e7c4d6bb130..fb9eba91fcf4 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv @@ -1,4 +1,3 @@ -"ScViewPaneObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()" "ScViewPaneObj";"com::sun::star::view::XControlAccess#optional";"getControl()" "ScViewPaneObj";"com::sun::star::view::XFormLayerAccess#optional";"getFromController()" "ScViewPaneObj";"com::sun::star::view::XFormLayerAccess#optional";"isFormDesignMode()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java deleted file mode 100644 index c5ca5ea5f8d2..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java +++ /dev/null @@ -1,93 +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 lib.MultiMethodTest; -import lib.Status; -import lib.StatusException; - -import com.sun.star.sheet.XCellRangeAddressable; -import com.sun.star.sheet.XCellRangeReferrer; -import com.sun.star.table.CellRangeAddress; -import com.sun.star.table.XCellRange; -import com.sun.star.uno.UnoRuntime; - -/** -* Testing <code>com.sun.star.sheet.XCellRangeReferrer</code> -* interface methods : -* <ul> -* <li><code> getReferredCells() </code></li> -* </ul> <p> -* This test needs the following object relations : -* <ul> -* <li> <code>'DATAAREA'</code> (of type <code>CellRangeAddress</code>): -* to have cell range address </li> -* <ul> <p> -* @see com.sun.star.sheet.XCellRangeReferrer -* @see com.sun.star.table.CellRangeAddress -*/ -public class _XCellRangeReferrer extends MultiMethodTest { - - public XCellRangeReferrer oObj = null; - - /** - * Test calls the method and compares cell range address of returned cell range - * with cell range address gotten by relation <code>'DATAAREA'</code>. <p> - * Has <b> OK </b> status if all fields of cell range addresses are equal. <p> - */ - public void _getReferredCells() { - boolean bResult = true; - - CellRangeAddress oldCRA = (CellRangeAddress) - tEnv.getObjRelation("DATAAREA"); - if (oldCRA == null) throw new StatusException(Status.failed - ("Relation 'DATAAREA' not found")); - - XCellRange cr = oObj.getReferredCells(); - - if (cr == null) { - log.println("getReferredCells returned NULL."); - tRes.tested("getReferredCells()", false); - return; - } - log.println(cr.toString()); - - XCellRangeAddressable xCRA = UnoRuntime.queryInterface(XCellRangeAddressable.class, cr); - - CellRangeAddress objCRA = xCRA.getRangeAddress(); - - log.println("The named range was 'ANamedRange A1:B2'"); - log.println("Expected CellRangeAddress: (" + oldCRA.Sheet + - "," + oldCRA.StartColumn + "," + oldCRA.StartRow + "," + - oldCRA.EndColumn + "," + objCRA.EndRow + ")"); - log.println("CellRangeAddress gotten: (" + objCRA.Sheet + "," - + objCRA.StartColumn + "," + objCRA.StartRow + "," + - objCRA.EndColumn + "," + objCRA.EndRow + ")"); - - bResult &= objCRA.EndColumn == oldCRA.EndColumn; - bResult &= objCRA.EndRow == oldCRA.EndRow; - bResult &= objCRA.Sheet == oldCRA.Sheet; - bResult &= objCRA.StartColumn == oldCRA.StartColumn; - bResult &= objCRA.StartRow == oldCRA.StartRow; - - tRes.tested("getReferredCells()", bResult); - } -} - - |