diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-09-02 04:34:39 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-08 21:05:27 +0200 |
commit | 4867bbdd99e3d5262621fa761d852d849b7365ab (patch) | |
tree | 85d94724e8379b8f3291841d729730b8c8255a1f /qadevOOo | |
parent | d7a22815e8e7e52702afc3ff418a859194a1af68 (diff) |
tdf#45904: Move _XSubTotalField Java tests to C++
Change-Id: I64528c4e315247583e185bc3ab0defbc22bd8726
Reviewed-on: https://gerrit.libreoffice.org/41826
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 2 | ||||
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv | 4 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java | 108 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java | 126 |
4 files changed, 0 insertions, 240 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index c2abc57550ab..f29279109c4a 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -635,7 +635,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable \ qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor \ - qadevOOo/tests/java/ifc/sheet/_XSubTotalField \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \ @@ -1112,7 +1111,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj \ qadevOOo/tests/java/mod/_sc/ScStyleObj \ qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \ - qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj \ qadevOOo/tests/java/mod/_sc/ScTableColumnObj \ qadevOOo/tests/java/mod/_sc/ScTableColumnsObj \ qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv deleted file mode 100644 index a25bff1dcdd0..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv +++ /dev/null @@ -1,4 +0,0 @@ -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"getGroupColumn()" -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"setGroupColumn()" -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"getSubTotalColumns()" -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"setSubTotalColumns()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java deleted file mode 100644 index 57fcb485b37d..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java +++ /dev/null @@ -1,108 +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 java.util.Arrays; - -import com.sun.star.sheet.GeneralFunction; -import com.sun.star.sheet.SubTotalColumn; -import com.sun.star.sheet.XSubTotalField; - -/** -* Testing <code>com.sun.star.sheet.XSubTotalField</code> -* interface methods : -* <ul> -* <li><code> getGroupColumn()</code></li> -* <li><code> setGroupColumn()</code></li> -* <li><code> getSubTotalColumns()</code></li> -* <li><code> setSubTotalColumns()</code></li> -* </ul> <p> -* @see com.sun.star.sheet.XSubTotalField -*/ -public class _XSubTotalField extends MultiMethodTest { - - public XSubTotalField oObj = null; - public int GroupColumn = 0; - public SubTotalColumn[] STColumns = null; - - /** - * Test calls the method, stores and checks returned value. <p> - * Has <b> OK </b> status if returned value isn't equal to zero. <p> - */ - public void _getGroupColumn() { - GroupColumn = oObj.getGroupColumn(); - tRes.tested("getGroupColumn()", GroupColumn != 0); - } // end of getGroupColumn - - /** - * Test calls the method, stores and checks returned value. <p> - * Has <b> OK </b> status if returned value isn't null. <p> - */ - public void _getSubTotalColumns() { - STColumns = oObj.getSubTotalColumns(); - tRes.tested("getSubTotalColumns()", STColumns != null); - } // end of getSubTotalColumns - - /** - * Test sets new value of the column by which entries are grouped, - * gets the current value and compares - * returned value with value that was stored by method - * <code>getGroupColumn()</code>. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getGroupColumn() </code> : to have the current column by - * which entries are grouped </li> - * </ul> - */ - public void _setGroupColumn() { - requiredMethod("getGroupColumn()"); - oObj.setGroupColumn(2); - tRes.tested("setGroupColumn()", GroupColumn != oObj.getGroupColumn()); - } // end of getGroupColumn - - /** - * Test sets new value using method, gets the current value and compares - * returned value with value that was stored by method - * <code>getSubTotalColumns()</code>. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getSubTotalColumns() </code> : to have the current value</li> - * </ul> - */ - public void _setSubTotalColumns() { - requiredMethod("getSubTotalColumns()"); - SubTotalColumn[] columns = new SubTotalColumn[2]; - SubTotalColumn column = new SubTotalColumn(); - column.Column=2; - column.Function=GeneralFunction.AVERAGE; - columns[0]=column; - columns[1]=STColumns[0]; - oObj.setSubTotalColumns(columns); - tRes.tested( - "setSubTotalColumns()", - !Arrays.equals(STColumns, oObj.getSubTotalColumns()) ); - } // end of getSubTotalColumns - -} // finish class _XSubTotalField - - diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java deleted file mode 100644 index 59bbe97ba5bc..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java +++ /dev/null @@ -1,126 +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.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.GeneralFunction; -import com.sun.star.sheet.SubTotalColumn; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.sheet.XSubTotalCalculatable; -import com.sun.star.sheet.XSubTotalDescriptor; -import com.sun.star.sheet.XSubTotalField; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -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.SubTotalField</code>. <p> -* Object implements the following interfaces : -* <ul> -* <li> <code>com::sun::star::sheet::XSubTotalField</code></li> -* </ul> -* @see com.sun.star.sheet.SubTotalField -* @see com.sun.star.sheet.XSubTotalField -* @see ifc.sheet._XSubTotalField -*/ -public class ScSubTotalFieldObj extends TestCase { - private XSpreadsheetDocument xSpreadsheetDoc; - - /** - * Creates Spreadsheet document. - */ - @Override - public void initialize( TestParameters Param, PrintWriter log ) throws Exception { - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); - - log.println("creating a spreadsheetdocument"); - xSpreadsheetDoc = SOF.createCalcDoc(null); - } - - /** - * Disposes Spreadsheet document. - */ - @Override - protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xSheetDoc " ); - XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; - util.DesktopTools.closeDoc(oComp); - } - - /** - * Creating a TestEnvironment for the interfaces to be tested. - * Retrieves a collection of spreadsheets from the document and takes one of - * them. Creates a subtotal descriptor using the interface - * <code>XSubTotalCalculatable</code>. Adds a subtotal field definition to - * the descriptor. Obtains the subtotal field with index 0 from the - * collection. The obtained subtotal field is the instance of the service - * <code>com.sun.star.sheet.SubTotalField</code>. - * @see com.sun.star.sheet.XSubTotalCalculatable - * @see com.sun.star.sheet.SubTotalField - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - log.println("getting sheets"); - XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - - log.println("getting a sheet"); - XSpreadsheet oSheet = null; - XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); - oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type (XSpreadsheet.class),oIndexAccess.getByIndex(0)); - - XSubTotalCalculatable xSTC = UnoRuntime.queryInterface(XSubTotalCalculatable.class, oSheet); - - XSubTotalDescriptor xSTD = xSTC.createSubTotalDescriptor(true); - - SubTotalColumn[] columns = new SubTotalColumn[1]; - SubTotalColumn column = new SubTotalColumn(); - column.Column = 5; - column.Function = GeneralFunction.SUM; - columns[0] = column; - xSTD.addNew(columns, 1); - - XIndexAccess oDescIndex = UnoRuntime.queryInterface(XIndexAccess.class, xSTD); - - XInterface oObj = null; - - oObj = ( XSubTotalField ) AnyConverter.toObject( - new Type(XSubTotalField.class),oDescIndex.getByIndex(0)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - return tEnv; - - } // finish method getTestEnvironment - -} // finish class ScSubTotalFieldObj - |