diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-11-08 21:15:09 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2017-11-09 09:32:21 +0100 |
commit | f1c97e9ff63cb6f120e618b3202260e0f8aefa0e (patch) | |
tree | 86f8615a49a91ab7042e8e0b98ab04a8000232f4 /qadevOOo | |
parent | tdf#113428: Fix glyph positions in PDF export (diff) | |
download | core-f1c97e9ff63cb6f120e618b3202260e0f8aefa0e.tar.gz core-f1c97e9ff63cb6f120e618b3202260e0f8aefa0e.zip |
tdf#45904 Move Java _XSheetFilterableEx tests to C++
Convert the Java _XSheetFilterableEx tests to C++ and make changes to
the XSubTotalCalculatable::::testApplyRemoveSubTotals(), because
XSheetFilterableEx::testCreateFilterDescriptorByObject() has to work
with the same sheet.
Change-Id: I89c11bc8f10ec8d2ff4b170aeb9df5a00ca98133
Reviewed-on: https://gerrit.libreoffice.org/44512
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
5 files changed, 0 insertions, 94 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 7faba4235a32..8418c1e65c41 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -618,7 +618,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \ qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \ qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \ - qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv index 4e672f8418af..0e5e6448c72b 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv @@ -117,7 +117,6 @@ "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex" "ScCellCursorObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()" "ScCellCursorObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()" -"ScCellCursorObj";"com::sun::star::sheet::XSheetFilterableEx";"createFilterDescriptorByObject()" "ScCellCursorObj";"com::sun::star::sheet::XArrayFormulaRange";"getArrayFormula()" "ScCellCursorObj";"com::sun::star::sheet::XArrayFormulaRange";"setArrayFormula()" "ScCellCursorObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv index cd2e335c7834..95186af1d9a2 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv @@ -112,7 +112,6 @@ "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex" "ScCellRangeObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()" "ScCellRangeObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()" -"ScCellRangeObj";"com::sun::star::sheet::XSheetFilterableEx";"createFilterDescriptorByObject()" "ScCellRangeObj";"com::sun::star::sheet::XArrayFormulaRange";"getArrayFormula()" "ScCellRangeObj";"com::sun::star::sheet::XArrayFormulaRange";"setArrayFormula()" "ScCellRangeObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv index 1fd3970c58dd..4fbb1a5f92da 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv @@ -124,7 +124,6 @@ "ScTableSheetObj";"com::sun::star::util::XProtectable";"isProtected()" "ScTableSheetObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()" "ScTableSheetObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetFilterableEx";"createFilterDescriptorByObject()" "ScTableSheetObj";"com::sun::star::sheet::XArrayFormulaRange";"getArrayFormula()" "ScTableSheetObj";"com::sun::star::sheet::XArrayFormulaRange";"setArrayFormula()" "ScTableSheetObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java deleted file mode 100644 index 84cdd224904a..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx.java +++ /dev/null @@ -1,90 +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 com.sun.star.sheet.TableFilterField; -import com.sun.star.sheet.XSheetFilterDescriptor; -import com.sun.star.sheet.XSheetFilterable; -import com.sun.star.sheet.XSheetFilterableEx; -import com.sun.star.uno.UnoRuntime; - - -/** - * Interface test for XSheetFilterableEx - * - * methods: - * - * createFilterDescriptorByObject - * - */ -public class _XSheetFilterableEx extends MultiMethodTest { - public XSheetFilterableEx oObj = null; - - /** - * queries a XSheetFilterable from the parent Object and then creates - * a XSheetFilterDescriptor with it. - * Returns OK if the Descriptor isn't null and checkFilterDescriptor returns true - */ - - public void _createFilterDescriptorByObject() { - boolean res = true; - Object parent = tEnv.getTestObject(); - XSheetFilterable aFilterable = UnoRuntime.queryInterface( - XSheetFilterable.class, parent); - XSheetFilterDescriptor desc = oObj.createFilterDescriptorByObject( - aFilterable); - - if (desc != null) { - res &= checkFilterDescriptor(desc); - } else { - log.println("gained XSheetFilterDescriptor is null"); - res &= false; - } - tRes.tested("createFilterDescriptorByObject()",res); - } - - /** - * returns true if the Method getFilterFields() returns a non empty array - * and all Fields can be gained without exception - */ - - public boolean checkFilterDescriptor(XSheetFilterDescriptor desc) { - TableFilterField[] fields = desc.getFilterFields(); - boolean res = true; - - if (fields.length == 0) { - log.println("The gained Descriptor is empty"); - res &= false; - } else { - log.println("Found "+fields.length+" TableFields"); - } - - for (int k = 0; k < fields.length; k++) { - log.println("StringValue(" + k + "): " + fields[k].StringValue); - log.println("IsNumeric(" + k + "): " + fields[k].IsNumeric); - log.println("NumericValue(" + k + "): " + fields[k].NumericValue); - log.println("Field(" + k + "): " + fields[k].Field); - log.println("Connection(" + k + "): " + fields[k].Connection); - log.println("Operator(" + k + "): " + fields[k].Operator); - } - - return res; - } -} |