diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-12-11 20:26:42 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2017-12-12 02:32:46 +0100 |
commit | 68f7d89cecc74e1df649e0691676178db544f913 (patch) | |
tree | cb1613f6fd14db4756742f306a728b662347498d /qadevOOo | |
parent | 3f614f431475e1bf3bb3bbeac59b0681309628b7 (diff) |
tdf#45904 Move _XConsolidationDescriptor Java tests to C++
Change-Id: Ib3e3722c1a4799ebb0cbb78f458abd6b967d6ba1
Reviewed-on: https://gerrit.libreoffice.org/46263
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
4 files changed, 0 insertions, 366 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index abd1b2efdf3e..4e378ebc4b0e 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -594,7 +594,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer \ qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \ qadevOOo/tests/java/ifc/sheet/_XConsolidatable \ - qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor \ qadevOOo/tests/java/ifc/sheet/_XDDELink \ qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \ qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \ @@ -1013,7 +1012,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScCellTextCursor \ qadevOOo/tests/java/mod/_sc/ScChartObj \ qadevOOo/tests/java/mod/_sc/ScChartsObj \ - qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor \ qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \ qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj \ qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv deleted file mode 100644 index b63ae7188675..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv +++ /dev/null @@ -1,12 +0,0 @@ -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getFunction()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setFunction()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getSources()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setSources()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getStartOutputPosition()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setStartOutputPosition()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getUseColumnHeaders()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setUseColumnHeaders()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getUseRowHeaders()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setUseRowHeaders()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getInsertLinks()" -"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setInsertLinks()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java deleted file mode 100644 index ed82b68b21c8..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java +++ /dev/null @@ -1,253 +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 util.ValueComparer; - -import com.sun.star.sheet.GeneralFunction; -import com.sun.star.sheet.XConsolidationDescriptor; -import com.sun.star.table.CellAddress; -import com.sun.star.table.CellRangeAddress; - -/** -* Testing <code>com.sun.star.sheet.XConsolidationDescriptor</code> -* interface methods : -* <ul> -* <li><code> getFunction()</code></li> -* <li><code> setFunction()</code></li> -* <li><code> getSources()</code></li> -* <li><code> setSources()</code></li> -* <li><code> getStartOutputPosition()</code></li> -* <li><code> setStartOutputPosition()</code></li> -* <li><code> getUseColumnHeaders()</code></li> -* <li><code> setUseColumnHeaders()</code></li> -* <li><code> getUseRowHeaders()</code></li> -* <li><code> setUseRowHeaders()</code></li> -* <li><code> getInsertLinks()</code></li> -* <li><code> setInsertLinks()</code></li> -* </ul> <p> -* @see com.sun.star.sheet.XConsolidationDescriptor -*/ -public class _XConsolidationDescriptor extends MultiMethodTest { - - public XConsolidationDescriptor oObj = null; - public GeneralFunction aFunction = null; - public boolean insertLinks = false; - public boolean useColumnHeaders = false; - public boolean useRowHeaders = false; - public CellRangeAddress[] CRaddr = null; - public CellAddress addr = null; - - /** - * Test calls the method, stores and checks returned value. <p> - * Has <b> OK </b> status if returned value isn't null. <p> - */ - public void _getFunction() { - aFunction = oObj.getFunction(); - tRes.tested("getFunction()", aFunction != null ); - } - - /** - * Test calls the method and stores returned value. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _getInsertLinks() { - insertLinks = oObj.getInsertLinks(); - tRes.tested("getInsertLinks()", true); - } - - /** - * Test calls the method and stores returned value. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _getSources() { - CRaddr = oObj.getSources(); - tRes.tested("getSources()", true); - } - - /** - * Test calls the method and stores returned value. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _getStartOutputPosition() { - addr = oObj.getStartOutputPosition(); - tRes.tested("getStartOutputPosition()", true); - } - - /** - * Test calls the method and stores returned value. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _getUseColumnHeaders() { - useColumnHeaders = oObj.getUseColumnHeaders(); - tRes.tested("getUseColumnHeaders()", true); - } - - /** - * Test calls the method and stores returned value. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _getUseRowHeaders() { - useRowHeaders = oObj.getUseRowHeaders(); - tRes.tested("getUseRowHeaders()", true); - } - - /** - * Test sets the new current function, gets current function - * and compare function gotten by method <code>getFunction()</code> with - * function that was set. <p> - * Has <b> OK </b> status if the functions aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getFunction() </code> : to have current value of - * the function by which the ranges are consolidated </li> - * </ul> - */ - public void _setFunction() { - requiredMethod("getFunction()"); - GeneralFunction aFunction2 = null; - if (aFunction.equals(GeneralFunction.SUM)) { - aFunction2 = GeneralFunction.COUNT; - } - else { - aFunction2 = GeneralFunction.SUM; - } - oObj.setFunction(aFunction2); - aFunction2 = oObj.getFunction(); - tRes.tested("setFunction()", !aFunction.equals(aFunction2)); - } - - /** - * Test sets property to value that negative to the current value - * and compares returned value with value that was set. <p> - * Has <b> OK </b> status if returned value isn't equal to value that was - * stored by method <code>getInsertLinks()</code>. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getInsertLinks() </code> : to have current value of - * this property </li> - * </ul> - */ - public void _setInsertLinks() { - requiredMethod("getInsertLinks()"); - oObj.setInsertLinks( !insertLinks ); - boolean insertLinks2 = oObj.getInsertLinks(); - tRes.tested("setInsertLinks()", insertLinks != insertLinks2); - } - - /** - * Test sets new cell ranges and compares cell ranges gotten by method - * <code>getSources()</code> with the cell range that was set. <p> - * Has <b> OK </b> status if returned value isn't equal to value that was - * stored by method <code>getSources()</code>. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getSources() </code> : to have the cell ranges which - * are consolidated </li> - * </ul> - */ - public void _setSources() { - requiredMethod("getSources()"); - oObj.setSources(newCRaddr()); - CellRangeAddress[] CRaddr2 = oObj.getSources(); - tRes.tested("setSources()",!ValueComparer.equalValue(CRaddr, CRaddr2)); - } - - /** - * Test sets new cell address for start output position and compares - * cell address gotten by method <code>getStartOutputPosition()</code> - * with the cell address that was set. <p> - * Has <b> OK </b> status if returned value isn't equal to value that was - * stored by method <code>getStartOutputPosition()</code>. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getStartOutputPosition() </code> : to have the cell address - * of start output position </li> - * </ul> - */ - public void _setStartOutputPosition() { - requiredMethod("getStartOutputPosition()"); - CellAddress addr2 = new CellAddress(); - addr2.Column = addr.Column + 1; - addr2.Row = addr.Row + 1; - oObj.setStartOutputPosition(addr2); - tRes.tested("setStartOutputPosition()", - !ValueComparer.equalValue(addr, addr2)); - } - - /** - * Test sets property to value that negative to the current value - * and compares returned value with value that was set. <p> - * Has <b> OK </b> status if returned value isn't equal to value that was - * stored by method <code>getUseColumnHeaders()</code>. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getUseColumnHeaders() </code> : to have current value of - * this property </li> - * </ul> - */ - public void _setUseColumnHeaders() { - requiredMethod("getUseColumnHeaders()"); - oObj.setUseColumnHeaders( !useColumnHeaders ); - boolean uCH = oObj.getUseColumnHeaders(); - tRes.tested("setUseColumnHeaders()", useColumnHeaders != uCH); - } - - /** - * Test sets property to value that negative to the current value - * and compares returned value with value that was set. <p> - * Has <b> OK </b> status if returned value isn't equal to value that was - * stored by method <code>getUseRowHeaders()</code>. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getUseRowHeaders() </code> : to have current value of - * this property </li> - * </ul> - */ - public void _setUseRowHeaders() { - requiredMethod("getUseRowHeaders()"); - oObj.setUseRowHeaders(!useRowHeaders); - boolean uRH = oObj.getUseRowHeaders(); - tRes.tested("setUseRowHeaders()", useRowHeaders != uRH ); - } - - /** - * Constructs new cell range addresses using old cell range addresses. - * @return new cell range addresses - */ - public CellRangeAddress[] newCRaddr() { - - CellRangeAddress[] back = new CellRangeAddress[1]; - - CellRangeAddress cra1 = new CellRangeAddress(); - cra1.EndColumn=5; - cra1.EndRow=5; - cra1.Sheet=(short)0; - cra1.StartColumn=1; - cra1.StartRow=1; - back[0]=cra1; - - return back; - } - - -} // finish class _XConsolidationDescriptor - - diff --git a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java deleted file mode 100644 index 896db757b9c4..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java +++ /dev/null @@ -1,99 +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.lang.XComponent; -import com.sun.star.sheet.XConsolidatable; -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.ConsolidationDescriptor</code>. <p> -* Object implements the following interfaces : -* <ul> -* <li> <code>com::sun::star::sheet::XConsolidationDescriptor</code></li> -* </ul> -* @see com.sun.star.sheet.ConsolidationDescriptor -* @see com.sun.star.sheet.XConsolidationDescriptor -* @see ifc.sheet._XConsolidationDescriptor -*/ -public class ScConsolidationDescriptor 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. Creates consolidation description using - * the interface <code>XConsolidatable</code>. - * This description is the instance of the service - * <code>com.sun.star.sheet.ConsolidationDescriptor</code>. - * @see com.sun.star.sheet.ConsolidationDescriptor - * @see com.sun.star.sheet.XConsolidatable - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - - XInterface oObj = null; - - // creation of testobject here - // first we write what we are intend to do to log file - log.println( "creating a test environment" ); - - XConsolidatable xConsolidate = UnoRuntime.queryInterface(XConsolidatable.class, xSheetDoc); - - oObj = xConsolidate.createConsolidationDescriptor(true); - // create testobject here - log.println("creating a new environment for object"); - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } // finish method getTestEnvironment - -} // finish class ScConsolidationDescriptor - |