summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2017-10-19 08:19:39 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-10-29 23:44:31 +0100
commita0b7cd137aac7529b328c813b011166a78074cb4 (patch)
treefcc63e82bfbbebef27e4c1a4b589117d9f4b6328 /qadevOOo
parent7ff9b44d5d2fc2b641fd28d8878d27051cfd8d25 (diff)
tdf#45904: Move Java _XSheetOperation tests to C++
Change-Id: I5aaeebd074882bb05a78e6d4057162e1da61d673 Reviewed-on: https://gerrit.libreoffice.org/43539 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.csv2
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv2
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv2
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv2
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java95
6 files changed, 0 insertions, 104 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 93e01587192f..a6ebf3502b72 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -628,7 +628,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \
qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor \
qadevOOo/tests/java/ifc/sheet/_XSheetLinkable \
- qadevOOo/tests/java/ifc/sheet/_XSheetOperation \
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 1ed7325b2fca..b58f89f320a8 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -108,8 +108,6 @@
"ScCellCursorObj";"com::sun::star::style::ParagraphProperties";"ParaUserDefinedAttributes#optional"
"ScCellCursorObj";"com::sun::star::style::ParagraphProperties";"NumberingIsNumber#optional"
"ScCellCursorObj";"com::sun::star::style::ParagraphProperties";"ParaIsConnectBorder#optional"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetOperation";"computeFunction()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetOperation";"clearContents()"
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharHeightComplex"
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharWeightComplex"
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontNameComplex"
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 71f5f2647995..a44495862bf6 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -103,8 +103,6 @@
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaUserDefinedAttributes#optional"
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"NumberingIsNumber#optional"
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaIsConnectBorder#optional"
-"ScCellRangeObj";"com::sun::star::sheet::XSheetOperation";"computeFunction()"
-"ScCellRangeObj";"com::sun::star::sheet::XSheetOperation";"clearContents()"
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesComplex";"CharHeightComplex"
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesComplex";"CharWeightComplex"
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
index cfe1f3bfef3b..927dfc3ce333 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
@@ -107,8 +107,6 @@
"ScCellRangesObj";"com::sun::star::style::ParagraphProperties";"ParaUserDefinedAttributes#optional"
"ScCellRangesObj";"com::sun::star::style::ParagraphProperties";"NumberingIsNumber#optional"
"ScCellRangesObj";"com::sun::star::style::ParagraphProperties";"ParaIsConnectBorder#optional"
-"ScCellRangesObj";"com::sun::star::sheet::XSheetOperation";"computeFunction()"
-"ScCellRangesObj";"com::sun::star::sheet::XSheetOperation";"clearContents()"
"ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharHeightComplex"
"ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharWeightComplex"
"ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontNameComplex"
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 8f7c54adaa3d..16ddec448d96 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -104,8 +104,6 @@
"ScTableSheetObj";"com::sun::star::style::ParagraphProperties";"ParaUserDefinedAttributes#optional"
"ScTableSheetObj";"com::sun::star::style::ParagraphProperties";"NumberingIsNumber#optional"
"ScTableSheetObj";"com::sun::star::style::ParagraphProperties";"ParaIsConnectBorder#optional"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOperation";"computeFunction()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOperation";"clearContents()"
"ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharHeightComplex"
"ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharWeightComplex"
"ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontNameComplex"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java b/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java
deleted file mode 100644
index e01ac2e5fd62..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java
+++ /dev/null
@@ -1,95 +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.CellFlags;
-import com.sun.star.sheet.GeneralFunction;
-import com.sun.star.sheet.XSheetOperation;
-
-/**
-* Testing <code>com.sun.star.sheet.XSheetOperation</code>
-* interface methods :
-* <ul>
-* <li><code> computeFunction()</code></li>
-* <li><code> clearContents()</code></li>
-* </ul> <p>
-* @see com.sun.star.sheet.XSheetOperation
-*/
-public class _XSheetOperation extends MultiMethodTest {
-
- public XSheetOperation oObj = null;
-
- /**
- * Test clears formula and value contents, calls the method
- * <code>computeFunction</code> and checks returned value. <p>
- * Has <b> OK </b> status if returned value is equal to zero
- * and no exceptions were thrown. <p>
- */
- public void _clearContents() {
- boolean result = true;
- double resultVal = -1;
-
- log.println("Testing clearContents() ...");
-
- int allFlags;
- allFlags = CellFlags.VALUE | CellFlags.FORMULA;
-
- oObj.clearContents (allFlags) ;
-
- try {
- resultVal = oObj.computeFunction(GeneralFunction.SUM);
- result &= (resultVal == 0.0) || (resultVal == 0);
- } catch (com.sun.star.uno.Exception e) {
- result &= false ;
- log.println(
- "Exception occurred while checking results of method");
- e.printStackTrace(log);
- }
-
- tRes.tested("clearContents()", result);
-
- } // finished clearContents
-
- /**
- * Test calls the method and checks returned value. <p>
- * Has <b> OK </b> status if returned value is equal or greater than zero
- * and no exceptions were thrown. <p>
- */
- public void _computeFunction() {
-
- log.println("Testing computeFunction() ...");
- double resultVal = -1;
- boolean result = true;
-
- try {
- resultVal = oObj.computeFunction (GeneralFunction.COUNT) ;
- result = resultVal >= 0;
- } catch (com.sun.star.uno.Exception e) {
- result = false;
- log.println("Exception occurred in method computeFunction.");
- e.printStackTrace(log);
- }
-
- tRes.tested("computeFunction()", result);
- } // finished computeFunction
-
-} // finished class _XSheetOperation
-