diff options
author | Jens Carl <j.carl43@gmx.de> | 2019-01-24 08:49:21 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2019-01-24 22:02:07 +0100 |
commit | b5d2ebb76e763457a8c8f07b26d542295e82e192 (patch) | |
tree | c95262454d86abbc80b14eb98d11456fe9024c65 /qadevOOo | |
parent | df984a465cad0af7ab77257efe5181a8a3348dcf (diff) |
tdf#45904 Move XTableChart Java tests to C++
Move XTableChart Java tests to C++ for ScChartObj.
Change-Id: I007d484357b5743a4283e9aa41bc6d203d312379
Reviewed-on: https://gerrit.libreoffice.org/66842
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv | 6 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScChartObj.java | 234 |
3 files changed, 0 insertions, 241 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 2828744ee90e..8a8374069326 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -962,7 +962,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScCellRangesObj \ qadevOOo/tests/java/mod/_sc/ScCellSearchObj \ qadevOOo/tests/java/mod/_sc/ScCellTextCursor \ - qadevOOo/tests/java/mod/_sc/ScChartObj \ qadevOOo/tests/java/mod/_sc/ScChartsObj \ qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \ qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv deleted file mode 100644 index 921ae1ef8e1b..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScChartObj.csv +++ /dev/null @@ -1,6 +0,0 @@ -"ScChartObj";"com::sun::star::table::XTableChart";"getHasColumnHeaders()" -"ScChartObj";"com::sun::star::table::XTableChart";"setHasColumnHeaders()" -"ScChartObj";"com::sun::star::table::XTableChart";"getHasRowHeaders()" -"ScChartObj";"com::sun::star::table::XTableChart";"setHasRowHeaders()" -"ScChartObj";"com::sun::star::table::XTableChart";"getRanges()" -"ScChartObj";"com::sun::star::table::XTableChart";"setRanges()" diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java deleted file mode 100644 index d768ceb61128..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java +++ /dev/null @@ -1,234 +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.awt.Rectangle; -import com.sun.star.container.XIndexAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.XCellRangeAddressable; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.table.CellRangeAddress; -import com.sun.star.table.XCell; -import com.sun.star.table.XCellRange; -import com.sun.star.table.XTableChart; -import com.sun.star.table.XTableCharts; -import com.sun.star.table.XTableChartsSupplier; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; - -/** -* Test for object which is represented by service -* <code>com.sun.star.table.TableChart</code>. <p> -* Object implements the following interfaces : -* <ul> -* <li> <code>com::sun::star::container::XNamed</code></li> -* <li> <code>com::sun::star::table::XTableChart</code></li> -* <li> <code>com::sun::star::document::XEmbeddedObjectSupplier</code></li> -* </ul> -* @see com.sun.star.table.TableChart -* @see com.sun.star.container.XNamed -* @see com.sun.star.table.XTableChart -* @see com.sun.star.document.XEmbeddedObjectSupplier -* @see ifc.container._XNamed -* @see ifc.table._XTableChart -* @see ifc.document._XEmbeddedObjectSupplier -*/ -public class ScChartObj extends TestCase { - private XSpreadsheetDocument xSheetDoc = null; - - /** - * Creates Spreadsheet document. - */ - @Override - protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); - log.println( "creating a sheetdocument" ); - 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. - * Retrieves a collection of spreadsheets from a document - * and takes one of them. Inserts some values into the cells of the same cell - * range address. Adds the chart that using the data from the cells of this - * cell range address. New chart is the instance of - * the service <code>com.sun.star.table.TableChart</code>. - * Object relations created : - * <ul> - * <li> <code>'setName'</code> for - * {@link ifc.container._XNamed}(the method <code>setName</code> must - * not be tested)</li> - * </ul> - * @see com.sun.star.container.XNamed - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - XSpreadsheet oSheet=null; - - log.println("Getting spreadsheet") ; - XSpreadsheets oSheets = xSheetDoc.getSheets() ; - XIndexAccess oIndexSheets = UnoRuntime.queryInterface(XIndexAccess.class, oSheets); - oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0)); - - log.println("Creating the Header") ; - - insertIntoCell(1,0,"JAN",oSheet,""); - insertIntoCell(2,0,"FEB",oSheet,""); - insertIntoCell(3,0,"MAR",oSheet,""); - insertIntoCell(4,0,"APR",oSheet,""); - insertIntoCell(5,0,"MAI",oSheet,""); - insertIntoCell(6,0,"JUN",oSheet,""); - insertIntoCell(7,0,"JUL",oSheet,""); - insertIntoCell(8,0,"AUG",oSheet,""); - insertIntoCell(9,0,"SEP",oSheet,""); - insertIntoCell(10,0,"OCT",oSheet,""); - insertIntoCell(11,0,"NOV",oSheet,""); - insertIntoCell(12,0,"DEC",oSheet,""); - insertIntoCell(13,0,"SUM",oSheet,""); - - log.println("Fill the lines"); - - insertIntoCell(0,1,"Smith",oSheet,""); - insertIntoCell(1,1,"42",oSheet,"V"); - insertIntoCell(2,1,"58.9",oSheet,"V"); - insertIntoCell(3,1,"-66.5",oSheet,"V"); - insertIntoCell(4,1,"43.4",oSheet,"V"); - insertIntoCell(5,1,"44.5",oSheet,"V"); - insertIntoCell(6,1,"45.3",oSheet,"V"); - insertIntoCell(7,1,"-67.3",oSheet,"V"); - insertIntoCell(8,1,"30.5",oSheet,"V"); - insertIntoCell(9,1,"23.2",oSheet,"V"); - insertIntoCell(10,1,"-97.3",oSheet,"V"); - insertIntoCell(11,1,"22.4",oSheet,"V"); - insertIntoCell(12,1,"23.5",oSheet,"V"); - insertIntoCell(13,1,"=SUM(B2:M2)",oSheet,""); - - insertIntoCell(0,2,"Jones",oSheet,""); - insertIntoCell(1,2,"21",oSheet,"V"); - insertIntoCell(2,2,"40.9",oSheet,"V"); - insertIntoCell(3,2,"-57.5",oSheet,"V"); - insertIntoCell(4,2,"-23.4",oSheet,"V"); - insertIntoCell(5,2,"34.5",oSheet,"V"); - insertIntoCell(6,2,"59.3",oSheet,"V"); - insertIntoCell(7,2,"27.3",oSheet,"V"); - insertIntoCell(8,2,"-38.5",oSheet,"V"); - insertIntoCell(9,2,"43.2",oSheet,"V"); - insertIntoCell(10,2,"57.3",oSheet,"V"); - insertIntoCell(11,2,"25.4",oSheet,"V"); - insertIntoCell(12,2,"28.5",oSheet,"V"); - insertIntoCell(13,2,"=SUM(B3:M3)",oSheet,""); - - insertIntoCell(0,3,"Brown",oSheet,""); - insertIntoCell(1,3,"31.45",oSheet,"V"); - insertIntoCell(2,3,"-20.9",oSheet,"V"); - insertIntoCell(3,3,"-117.5",oSheet,"V"); - insertIntoCell(4,3,"23.4",oSheet,"V"); - insertIntoCell(5,3,"-114.5",oSheet,"V"); - insertIntoCell(6,3,"115.3",oSheet,"V"); - insertIntoCell(7,3,"-171.3",oSheet,"V"); - insertIntoCell(8,3,"89.5",oSheet,"V"); - insertIntoCell(9,3,"41.2",oSheet,"V"); - insertIntoCell(10,3,"71.3",oSheet,"V"); - insertIntoCell(11,3,"25.4",oSheet,"V"); - insertIntoCell(12,3,"38.5",oSheet,"V"); - insertIntoCell(13,3,"=SUM(A4:L4)",oSheet,""); - - // insert a chart - - Rectangle oRect = new Rectangle(500, 3000, 25000, 11000); - - XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); - XCellRange myRange = oRange.getCellRangeByName("A1:N4"); - XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); - CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); - - CellRangeAddress[] oAddr = new CellRangeAddress[1]; - oAddr[0] = myAddr; - XTableChartsSupplier oSupp = UnoRuntime.queryInterface(XTableChartsSupplier.class, oSheet); - - log.println("Insert Chart"); - - XTableCharts oCharts = oSupp.getCharts(); - oCharts.addNewByName("ScChartObj", oRect, oAddr, true, true); - - // get the TableChart - XTableChart oChart = null; - XNameAccess names = (XNameAccess) AnyConverter.toObject( - new Type(XNameAccess.class),UnoRuntime.queryInterface( - XNameAccess.class, oCharts)); - - oChart = (XTableChart) AnyConverter.toObject( - new Type(XTableChart.class),names.getByName("ScChartObj")); - - log.println("creating a new environment for object"); - TestEnvironment tEnv = new TestEnvironment(oChart); - - //adding ObjRelation 'setName' for 'XNamed' - tEnv.addObjRelation("setName", Boolean.TRUE); - - return tEnv; - } - - /** - * Inserts a value or a formula in the cell of the spreasheet. - * @param CellX is the column index of the cell - * @param CellY is the row index of the cell - * @param theValue string representation of the value - * @param TT1 specify the spreadsheet, the interface - * <code>com.sun.star.sheet.XSpreadsheet</code> - * @param flag if it's equal to <code>'V'</code> then the method inserts - * a double-value in the cell else it inserts a formula in the cell - */ - public static void insertIntoCell( - int CellX, int CellY, String theValue, XSpreadsheet TT1, String flag) - throws com.sun.star.lang.IndexOutOfBoundsException { - XCell oCell = TT1.getCellByPosition(CellX, CellY); - - if (flag.equals("V")) { - oCell.setValue(Float.parseFloat(theValue)); - } else { - oCell.setFormula(theValue); - } - } // end of insertIntoCell -} - |