summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2017-09-14 07:10:41 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-10-29 22:08:44 +0100
commit80003831041fcd718d2dddc9b6409ff50b48facf (patch)
tree091dd77e9306f6cb3d8326b1019c8464fae5d335 /qadevOOo
parenta060947e8c1538cedae5dee6b2a4e7a15d434d66 (diff)
tdf#45904 Move _XSubTotalCalculatable Java tests to C++
Change-Id: I18199a9cc79e6a109c8de0026b37a67f85cf778a Reviewed-on: https://gerrit.libreoffice.org/42265 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-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.ScCellCursorObj.csv3
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv3
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv3
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java117
5 files changed, 0 insertions, 127 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 14c2ee32d281..4aa239d98ce0 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -632,7 +632,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XSheetPageBreak \
qadevOOo/tests/java/ifc/sheet/_XSpreadsheet \
qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
- qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable \
qadevOOo/tests/java/ifc/style/_CharacterProperties \
qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \
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 3ce35d7a5460..1ed7325b2fca 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -141,9 +141,6 @@
"ScCellCursorObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
"ScCellCursorObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
"ScCellCursorObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
-"ScCellCursorObj";"com::sun::star::sheet::XSubTotalCalculatable";"createSubTotalDescriptor()"
-"ScCellCursorObj";"com::sun::star::sheet::XSubTotalCalculatable";"applySubTotals()"
-"ScCellCursorObj";"com::sun::star::sheet::XSubTotalCalculatable";"removeSubTotals()"
"ScCellCursorObj";"com::sun::star::sheet::SheetCellRange";"Position"
"ScCellCursorObj";"com::sun::star::sheet::SheetCellRange";"Size"
"ScCellCursorObj";"com::sun::star::sheet::SheetCellRange";"ConditionalFormat"
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 396876793189..71f5f2647995 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -136,9 +136,6 @@
"ScCellRangeObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
"ScCellRangeObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
"ScCellRangeObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
-"ScCellRangeObj";"com::sun::star::sheet::XSubTotalCalculatable";"createSubTotalDescriptor()"
-"ScCellRangeObj";"com::sun::star::sheet::XSubTotalCalculatable";"applySubTotals()"
-"ScCellRangeObj";"com::sun::star::sheet::XSubTotalCalculatable";"removeSubTotals()"
"ScCellRangeObj";"com::sun::star::sheet::SheetCellRange";"Position"
"ScCellRangeObj";"com::sun::star::sheet::SheetCellRange";"Size"
"ScCellRangeObj";"com::sun::star::sheet::SheetCellRange";"ConditionalFormat"
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 776469521bec..db2a2b9225bc 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -167,9 +167,6 @@
"ScTableSheetObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
"ScTableSheetObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
"ScTableSheetObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
-"ScTableSheetObj";"com::sun::star::sheet::XSubTotalCalculatable";"createSubTotalDescriptor()"
-"ScTableSheetObj";"com::sun::star::sheet::XSubTotalCalculatable";"applySubTotals()"
-"ScTableSheetObj";"com::sun::star::sheet::XSubTotalCalculatable";"removeSubTotals()"
"ScTableSheetObj";"com::sun::star::sheet::SheetCellRange";"Position"
"ScTableSheetObj";"com::sun::star::sheet::SheetCellRange";"Size"
"ScTableSheetObj";"com::sun::star::sheet::SheetCellRange";"ConditionalFormat"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java
deleted file mode 100644
index b84798e995a6..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java
+++ /dev/null
@@ -1,117 +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.SubTotalColumn;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSubTotalCalculatable;
-import com.sun.star.sheet.XSubTotalDescriptor;
-import com.sun.star.uno.UnoRuntime;
-
-
-public class _XSubTotalCalculatable extends MultiMethodTest {
- public XSubTotalCalculatable oObj;
- protected XSubTotalDescriptor desc;
- protected XSpreadsheet oSheet;
-
- @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 _applySubTotals() {
- requiredMethod("createSubTotalDescriptor()");
-
- boolean res = true;
-
- try {
- oSheet.getCellByPosition(0, 0).setFormula("first");
- oSheet.getCellByPosition(1, 0).setFormula("second");
- oSheet.getCellByPosition(0, 3).setFormula("");
- oSheet.getCellByPosition(0, 1).setValue(5);
- oSheet.getCellByPosition(0, 2).setValue(5);
- oSheet.getCellByPosition(1, 1).setValue(17);
- oSheet.getCellByPosition(1, 2).setValue(25);
- oObj.applySubTotals(desc, true);
-
- String formula = oSheet.getCellByPosition(0, 3).getFormula();
- String expected = "=SUBTOTAL(9;$A$2:$A$3)";
- res = formula.equals(expected);
-
- if (!res) {
- log.println("getting: " + formula);
- log.println("expected: " + expected);
- }
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Couldn't fill cells" + e.getLocalizedMessage());
- res = false;
- }
-
- tRes.tested("applySubTotals()", res);
- }
-
- public void _createSubTotalDescriptor() {
- desc = oObj.createSubTotalDescriptor(true);
-
- SubTotalColumn[] columns = new SubTotalColumn[1];
- columns[0] = new SubTotalColumn();
- columns[0].Column = 0;
- columns[0].Function = com.sun.star.sheet.GeneralFunction.SUM;
- desc.addNew(columns, 0);
- tRes.tested("createSubTotalDescriptor()", true);
- }
-
- public void _removeSubTotals() {
- requiredMethod("applySubTotals()");
-
- boolean res = true;
-
- try {
- oObj.removeSubTotals();
-
- String formula = oSheet.getCellByPosition(0, 3).getFormula();
- String expected = "";
- res = formula.equals(expected);
-
- if (!res) {
- log.println("getting: " + formula);
- log.println("expected: " + expected);
- }
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Couldn't get cell" + e.getLocalizedMessage());
- }
-
- tRes.tested("removeSubTotals()", res);
- }
-} \ No newline at end of file