summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2017-12-01 06:22:30 +0000
committerJens Carl <j.carl43@gmx.de>2017-12-05 07:54:07 +0100
commit958d8d316dbda970dc31d5b060f8d317db0516ff (patch)
tree55a95ff0fcf6ce95b15b39cc49fa389883c7746c /qadevOOo
parent9a06b99d2f53bd8d0a9ab0936efed9924a2abb88 (diff)
tdf#45904 Move _XRecentFunctions Java tests to C++
Fix for #i84761. Change-Id: I3ea608ce60ecc274bc2af9eb1d8117372b663a6f Reviewed-on: https://gerrit.libreoffice.org/45637 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk2
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv3
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java158
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java112
4 files changed, 0 insertions, 275 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d7476b028d5a..775cdb348625 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -605,7 +605,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XFormulaQuery \
qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \
qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
- qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \
qadevOOo/tests/java/ifc/sheet/_XScenario \
qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
qadevOOo/tests/java/ifc/style/_CharacterProperties \
@@ -1070,7 +1069,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScModelObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangeObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
- qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj \
qadevOOo/tests/java/mod/_sc/ScScenariosObj \
qadevOOo/tests/java/mod/_sc/ScShapeObj \
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv
deleted file mode 100644
index 67bf2d9a2a5c..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScRecentFunctionsObj.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"ScRecentFunctionsObj";"com::sun::star::sheet::XRecentFunctions";"getRecentFunctionIds()"
-"ScRecentFunctionsObj";"com::sun::star::sheet::XRecentFunctions";"setRecentFunctionIds()"
-"ScRecentFunctionsObj";"com::sun::star::sheet::XRecentFunctions";"getMaxRecentFunctions()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java b/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java
deleted file mode 100644
index 3ca88e281f68..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java
+++ /dev/null
@@ -1,158 +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 java.util.Random;
-
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.sheet.XRecentFunctions;
-
-/**
-* Testing <code>com.sun.star.sheet.XRecentFunctions</code>
-* interface methods :
-* <ul>
-* <li><code> getRecentFunctionIds()</code></li>
-* <li><code> setRecentFunctionIds()</code></li>
-* <li><code> getMaxRecentFunctions()</code></li>
-* </ul> <p>
-* This test needs the following object relations :
-* <ul>
-* <li> <code>'FUNCTIONLIST'</code> (of type <code>XNameAccess</code>):
-* to have the set of available functions </li>
-* <ul> <p>
-* @see com.sun.star.sheet.XRecentFunctions
-*/
-public class _XRecentFunctions extends MultiMethodTest {
-
- public XRecentFunctions oObj = null;
- int iMaxNumber = 0;
-
- /**
- * Test calls the method, checks returned value and stores it. <p>
- * Has <b> OK </b> status if returned value isn't equal to zero. <p>
- */
- public void _getMaxRecentFunctions() {
-
- iMaxNumber = oObj.getMaxRecentFunctions();
- log.println("Maximum recent functions : " + iMaxNumber);
-
- tRes.tested("getMaxRecentFunctions()", iMaxNumber != 0);
- }
-
- /**
- * Test calls the method and checks returned value. <p>
- * Has <b> OK </b> status if returned value isn't null, if length of returned
- * array is equal or less to the maximum number of functions and obtained
- * array doesn't contain equal functions. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getMaxRecentFunctions() </code> : to have the maximum number
- * of recent functions </li>
- * </ul>
- */
- public void _getRecentFunctionIds() {
- requiredMethod("getMaxRecentFunctions()");
-
- boolean bResult = true;
- int[] IDs = null;
- int iNumber = 0;
-
- IDs = oObj.getRecentFunctionIds();
- iNumber = IDs.length;
- bResult &= (iNumber <= iMaxNumber);
- log.println("Now there are " + iNumber + " recent functions");
- if (bResult) {
- for (int i = 0; i < iNumber - 1; i++)
- for (int j = i + 1; j < iNumber; j++) {
- bResult &= (IDs[i] != IDs[j]);
- }
- }
-
- tRes.tested("getRecentFunctionIds()", bResult);
- }
-
- /**
- * Test gets the set of available functions, sets empty list of recent
- * functions, sets list of maximum size. <p>
- * Has <b> OK </b> status if length of recent function list is equal to zero
- * after list was set to empty, if length of list is equal to maximum size
- * after list was set to its maximum size and no exception were thrown. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getMaxRecentFunctions() </code> : to have the maximum number
- * of recent functions </li>
- * </ul>
- */
- public void _setRecentFunctionIds() {
- requiredMethod("getMaxRecentFunctions()");
-
- boolean bResult = true;
- int[] IDs = new int[0];
- XNameAccess functionList = null;
-
- log.println("First, get the set of available functions.");
- functionList = (XNameAccess)tEnv.getObjRelation("FUNCTIONLIST");
- if (functionList == null) throw new StatusException(Status.failed
- ("Relation 'FUNCTIONLIST' not found"));
-
- log.println("Now trying to set empty list.");
- oObj.setRecentFunctionIds(IDs);
- bResult &= (oObj.getRecentFunctionIds().length == 0);
-
- log.println("Now trying to set list of maximum size.");
- String[] names = functionList.getElementNames();
- Random rnd = new Random();
-
- IDs = new int[iMaxNumber];
- int startIdx = rnd.nextInt(names.length - iMaxNumber - 1) + 1;
-
- try {
- for (int i = startIdx; i < startIdx + iMaxNumber; i++) {
- PropertyValue[] propVals = (PropertyValue[])
- functionList.getByName(names[i]);
- for (int j = 0; j < propVals.length; j++) {
- String propName = propVals[j].Name;
- if (propName.equals("Id")) {
- IDs[i - startIdx] =
- ((Integer)propVals[j].Value).intValue();
- break;
- }
- }
- }
- } catch(com.sun.star.lang.WrappedTargetException e) {
- e.printStackTrace(log);
- bResult = false;
- } catch(com.sun.star.container.NoSuchElementException e) {
- e.printStackTrace(log);
- bResult = false;
- }
-
- oObj.setRecentFunctionIds(IDs);
- bResult &= (oObj.getRecentFunctionIds().length == iMaxNumber);
-
- tRes.tested("setRecentFunctionIds()", bResult);
- }
-
-}
-
diff --git a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java
deleted file mode 100644
index bcce14359251..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java
+++ /dev/null
@@ -1,112 +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 mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.sheet.RecentFunctions</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::sheet::XRecentFunctions</code></li>
-* </ul>
-* @see com.sun.star.sheet.RecentFunctions
-* @see com.sun.star.sheet.XRecentFunctions
-* @see ifc.sheet._XRecentFunctions
-*/
-public class ScRecentFunctionsObj extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
- log.println( "creating a Spreadsheet document" );
- xSheetDoc = SOF.createCalcDoc(null);
- }
-
- /**
- * Disposes Spreadsheet document.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println( " disposing xSheetDoc " );
- XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ;
- util.DesktopTools.closeDoc(oComp);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Creates an instance of the service
- * <code>com.sun.star.sheet.RecentFunctions</code> and an instance of the
- * service <code>com.sun.star.sheet.FunctionDescriptions</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'FUNCTIONLIST'</code> for
- * {@link ifc.sheet._XRecentFunctions}(the second created instance)</li>
- * </ul>
- */
- @Override
- public TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log ) throws Exception {
-
- XInterface oObj = null;
- XInterface allFunctions = null;
-
- // creation of testobject here
- // first we write what we are intend to do to log file
- log.println( "Creating a test environment" );
-
- log.println("Getting test object ") ;
- XMultiServiceFactory oDocMSF = Param.getMSF();
- oObj = (XInterface)oDocMSF.createInstance(
- "com.sun.star.sheet.RecentFunctions");
- allFunctions = (XInterface)oDocMSF.createInstance(
- "com.sun.star.sheet.FunctionDescriptions");
-
- log.println("Creating object - " +
- ((oObj == null) ? "FAILED" : "OK"));
-
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- // Other parameters required for interface tests
- XNameAccess NA = UnoRuntime.queryInterface(XNameAccess.class, allFunctions);
- tEnv.addObjRelation("FUNCTIONLIST", NA);
-
- return tEnv;
- }
-
-}
-
-