diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-10-29 06:24:22 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-29 23:45:34 +0100 |
commit | bbfec269bda9906eae66b207987d53bbea969eec (patch) | |
tree | 3ec79cc3da81129f9c5b133e62332103c6c6722c /qadevOOo | |
parent | ba93d6aeb73cba64f037a0bd88d96fedb90f3f2f (diff) |
tdf#45904: Move Java _XSheetFilterable test to C++
Change-Id: Ib94aeb98c9c659118800b2dcc327c44a77d5fcc6
Reviewed-on: https://gerrit.libreoffice.org/44019
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'qadevOOo')
5 files changed, 0 insertions, 134 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 796fc0805945..570a69d29e79 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -624,7 +624,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSheetCondition \ qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries \ qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry \ - qadevOOo/tests/java/ifc/sheet/_XSheetFilterable \ qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ 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 b58f89f320a8..3b19776b3b04 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv @@ -29,8 +29,6 @@ "ScCellCursorObj";"com::sun::star::util::XSearchable";"findNext()" "ScCellCursorObj";"com::sun::star::table::XColumnRowRange";"getColumns()" "ScCellCursorObj";"com::sun::star::table::XColumnRowRange";"getRows()" -"ScCellCursorObj";"com::sun::star::sheet::XSheetFilterable";"createFilterDescriptor()" -"ScCellCursorObj";"com::sun::star::sheet::XSheetFilterable";"filter()" "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"CharHeightAsian" "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"CharWeightAsian" "ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"CharFontNameAsian" 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 a44495862bf6..9f539f5bbf10 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv @@ -29,8 +29,6 @@ "ScCellRangeObj";"com::sun::star::util::XSearchable";"findNext()" "ScCellRangeObj";"com::sun::star::table::XColumnRowRange";"getColumns()" "ScCellRangeObj";"com::sun::star::table::XColumnRowRange";"getRows()" -"ScCellRangeObj";"com::sun::star::sheet::XSheetFilterable";"createFilterDescriptor()" -"ScCellRangeObj";"com::sun::star::sheet::XSheetFilterable";"filter()" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharHeightAsian" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharWeightAsian" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharFontNameAsian" 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 89344e1ff08a..b3ea64aca54d 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv @@ -29,8 +29,6 @@ "ScTableSheetObj";"com::sun::star::util::XSearchable";"findNext()" "ScTableSheetObj";"com::sun::star::table::XColumnRowRange";"getColumns()" "ScTableSheetObj";"com::sun::star::table::XColumnRowRange";"getRows()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetFilterable";"createFilterDescriptor()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetFilterable";"filter()" "ScTableSheetObj";"com::sun::star::style::CharacterPropertiesAsian";"CharHeightAsian" "ScTableSheetObj";"com::sun::star::style::CharacterPropertiesAsian";"CharWeightAsian" "ScTableSheetObj";"com::sun::star::style::CharacterPropertiesAsian";"CharFontNameAsian" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java deleted file mode 100644 index 793635b0cf22..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java +++ /dev/null @@ -1,127 +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.beans.XPropertySet; -import com.sun.star.sheet.TableFilterField; -import com.sun.star.sheet.XSheetFilterDescriptor; -import com.sun.star.sheet.XSheetFilterable; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.table.XColumnRowRange; -import com.sun.star.table.XTableRows; -import com.sun.star.uno.UnoRuntime; - - -public class _XSheetFilterable extends MultiMethodTest { - public XSheetFilterable oObj; - protected XSpreadsheet oSheet; - protected XSheetFilterDescriptor desc; - - @Override - protected void before() { - oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); - - if (oSheet == null) { - log.println("Object relation oSheet is missing"); - log.println("Trying to query the needed Interface"); - oSheet = UnoRuntime.queryInterface( - XSpreadsheet.class, tEnv.getTestObject()); - - if (oSheet == null) { - throw new StatusException(Status.failed( - "Object relation oSheet is missing")); - } - } - } - - public void _createFilterDescriptor() { - desc = oObj.createFilterDescriptor(true); - - TableFilterField[] tff = new TableFilterField[2]; - tff[0] = new TableFilterField(); - tff[0].IsNumeric = true; - tff[0].Field = 0; - tff[0].NumericValue = 2; - tff[0].Operator = com.sun.star.sheet.FilterOperator.GREATER_EQUAL; - tff[1] = new TableFilterField(); - tff[1].IsNumeric = false; - tff[1].Field = 1; - tff[1].StringValue = "C"; - tff[1].Operator = com.sun.star.sheet.FilterOperator.LESS; - desc.setFilterFields(tff); - tRes.tested("createFilterDescriptor()", true); - } - - public void _filter() { - boolean res = true; - - try { - oSheet.getCellByPosition(0, 0).setValue(1); - oSheet.getCellByPosition(0, 1).setValue(2); - oSheet.getCellByPosition(0, 2).setValue(3); - oSheet.getCellByPosition(1, 0).setFormula("A"); - oSheet.getCellByPosition(1, 1).setFormula("D"); - oSheet.getCellByPosition(1, 2).setFormula("B"); - oObj.filter(desc); - - XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface( - XColumnRowRange.class, - oSheet); - XTableRows oRows = oColumnRowRange.getRows(); - XPropertySet rowProp = UnoRuntime.queryInterface( - XPropertySet.class, - oRows.getByIndex(0)); - boolean locRes = ((Boolean) rowProp.getPropertyValue("IsVisible")).booleanValue(); - - if (locRes) { - log.println("Row 1 should be invisible after filter()"); - res &= false; - } else { - res &= true; - } - - rowProp = UnoRuntime.queryInterface( - XPropertySet.class, oRows.getByIndex(1)); - locRes = ((Boolean) rowProp.getPropertyValue("IsVisible")).booleanValue(); - - if (locRes) { - log.println("Row 2 should be invisible after filter()"); - res &= false; - } else { - res &= true; - } - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("couldn't fill cells " + e.getLocalizedMessage()); - res = false; - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("problems getting Property 'isVisible' " + - e.getLocalizedMessage()); - res = false; - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("problems getting Property 'isVisible' " + - e.getLocalizedMessage()); - res = false; - } - - tRes.tested("filter()", res); - } -} |