From eff70347190a6642fd62a9e0b20e4366c39fbc7a Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Mon, 4 Dec 2017 05:52:24 +0000 Subject: tdf#45904 Move _XFunctionDescriptions Java test to C++ Change-Id: Ie2c8e55cabd6adcd523baf2f75c5f2decaf8fe87 Reviewed-on: https://gerrit.libreoffice.org/45772 Tested-by: Jenkins Reviewed-by: Jens Carl --- qadevOOo/Jar_OOoRunner.mk | 1 - .../com.sun.star.comp.office.ScFunctionListObj.csv | 1 - .../java/ifc/sheet/_XFunctionDescriptions.java | 124 --------------------- 3 files changed, 126 deletions(-) delete mode 100644 qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java (limited to 'qadevOOo') diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 775cdb348625..24dd5cd7f8a9 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -603,7 +603,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \ qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \ qadevOOo/tests/java/ifc/sheet/_XFormulaQuery \ - qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \ qadevOOo/tests/java/ifc/sheet/_XRangeSelection \ qadevOOo/tests/java/ifc/sheet/_XScenario \ qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv index a784e0e0f29f..5253ef4dbe6f 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv @@ -5,5 +5,4 @@ "ScFunctionListObj";"com::sun::star::container::XIndexAccess";"getByIndex()" "ScFunctionListObj";"com::sun::star::container::XElementAccess";"getElementType()" "ScFunctionListObj";"com::sun::star::container::XElementAccess";"hasElements()" -"ScFunctionListObj";"com::sun::star::sheet::XFunctionDescriptions";"getById()" "ScFunctionListObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java b/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java deleted file mode 100644 index 20c4240c35bd..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions.java +++ /dev/null @@ -1,124 +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 com.sun.star.beans.PropertyValue; -import com.sun.star.sheet.XFunctionDescriptions; - -/** -* Testing com.sun.star.sheet.XFunctionDescriptions -* interface methods : -*
    -*
  • getById()
    • -*

-* @see com.sun.star.sheet.XFunctionDescriptions -*/ -public class _XFunctionDescriptions extends MultiMethodTest { - - public XFunctionDescriptions oObj = null; - - /** - * Test finds available id, calls method using this id, checks returned - * value and then tries to get description with wrong id.

- * Has OK status if returned value is equal to value obtained by the - * method getByIndex() in first call and exception - * IllegalArgumentException was thrown in second call.

- * @see com.sun.star.lang.IllegalArgumentException - */ - public void _getById() { - boolean bResult = true; - // Finding available id... - - int count = oObj.getCount(); - if (count > 0) { - Random rnd = new Random(); - int nr = rnd.nextInt(count); - - PropertyValue[] PVals = null; - try { - PVals = (PropertyValue[])oObj.getByIndex(nr); - } catch(com.sun.star.lang.WrappedTargetException e) { - e.printStackTrace(log); - tRes.tested("getById()", false); - return; - } catch(com.sun.star.lang.IndexOutOfBoundsException e) { - e.printStackTrace(log); - tRes.tested("getById()", false); - return; - } - - String FName = null; - Integer FId = null; - - for (int i = 0; i < PVals.length; i++) { - if (PVals[i].Name.equals("Name")) - FName = (String)PVals[i].Value; - if (PVals[i].Name.equals("Id")) - FId = (Integer)PVals[i].Value; - } - - log.println("The id of function '" + FName + "' is " + FId); - - PropertyValue[] PVals2 = null; - try { - PVals2 = oObj.getById(FId.intValue()); - } catch(com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace(log); - tRes.tested("getById()", false); - return; - } - - String objFName = null; - Integer objFId = null; - for (int i = 0; i < PVals2.length; i++) { - if (PVals2[i].Name.equals("Name")) - objFName = (String)PVals[i].Value; - if (PVals2[i].Name.equals("Id")) - objFId = (Integer)PVals[i].Value; - } - - log.println("The id of returned function '" + - objFName + "' is " + objFId); - - bResult &= FName.equals(objFName); - bResult &= FId.equals(objFId); - } - - log.println("OK."); - - if (bResult) { - try { - log.println("Now trying to get description with wrong id ... "); - oObj.getById(-1); - bResult = false; - log.println("Exception expected! - FAILED"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Expected exception " + e + " - OK!"); - } - } - - tRes.tested("getById()", bResult); - } -} // finish class _XFunctionDescriptions - - -- cgit