diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-11-01 20:58:09 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2017-11-03 04:08:41 +0100 |
commit | 6bddeb4de19685c1ce1a3c1f9bd32cffb6b14bc6 (patch) | |
tree | 55be13f2e5d6932a88582b1f453f9efb3b518f8c /qadevOOo | |
parent | 2416d69ad4fa26b65d5b05a8575ac96af6b2c9a9 (diff) |
tdf#45904 Move Java _XSheetConditionalEntry tests to C++
Change-Id: I51924e69183260ba0eba94c3a14bde252c24cc18
Reviewed-on: https://gerrit.libreoffice.org/44182
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
4 files changed, 0 insertions, 240 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index e85731f3f3a9..4af94611e1b9 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -622,7 +622,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer \ qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges \ qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries \ - qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry \ qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ @@ -1103,7 +1102,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \ qadevOOo/tests/java/mod/_sc/ScTableColumnObj \ qadevOOo/tests/java/mod/_sc/ScTableColumnsObj \ - qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry \ qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat \ qadevOOo/tests/java/mod/_sc/ScTableRowObj \ qadevOOo/tests/java/mod/_sc/ScTableRowsObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv deleted file mode 100644 index 5de029653f0c..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetConditionalEntry";"getStyleName()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetConditionalEntry";"setStyleName()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java deleted file mode 100644 index 42fb687287f1..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java +++ /dev/null @@ -1,66 +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 com.sun.star.sheet.XSheetConditionalEntry; - -/** -* Testing <code>com.sun.star.sheet.XSheetConditionalEntry</code> -* interface methods : -* <ul> -* <li><code> getStyleName()</code></li> -* <li><code> setStyleName()</code></li> -* </ul> <p> -* @see com.sun.star.sheet.XSheetConditionalEntry -*/ -public class _XSheetConditionalEntry extends MultiMethodTest { - - public XSheetConditionalEntry oObj = null; - public String StyleName = 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 _getStyleName() { - StyleName = oObj.getStyleName(); - tRes.tested("getStyleName()", StyleName != null); - } - - /** - * Test sets new value of style name, gets current style name and compares - * returned value with value that was stored by method <code>getStyleName() - * </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> getStyleName() </code> : to have current style name </li> - * </ul> - */ - public void _setStyleName() { - requiredMethod("getStyleName()"); - oObj.setStyleName("Heading"); - tRes.tested("setStyleName()", !StyleName.equals(oObj.getStyleName())); - } - -} // finish class _XSheetConditionalEntry - - diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java deleted file mode 100644 index 5bed10b5e414..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java +++ /dev/null @@ -1,170 +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 util.utils; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.ConditionOperator; -import com.sun.star.sheet.XSheetConditionalEntries; -import com.sun.star.sheet.XSheetConditionalEntry; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.table.CellAddress; -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.TableConditionalEntry</code>. <p> -* Object implements the following interfaces : -* <ul> -* <li> <code>com::sun::star::sheet::XSheetConditionalEntry</code></li> -* <li> <code>com::sun::star::sheet::XSheetCondition</code></li> -* </ul> -* @see com.sun.star.sheet.TableConditionalEntry -* @see com.sun.star.sheet.XSheetConditionalEntry -* @see com.sun.star.sheet.XSheetCondition -* @see ifc.sheet._XSheetConditionalEntry -* @see ifc.sheet._XSheetCondition -*/ -public class ScTableConditionalEntry extends TestCase { - private XSpreadsheetDocument xSpreadsheetDoc = 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" ); - 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. Fills some cells of the spreadsheet. Retrieves value of the property - * <code>'ConditionalFormat'</code> that is the collection of the conditions - * of a conditional format. Adds new conditional entry to the collection - * using the interface <code>XSheetConditionalEntries</code>. Sets new value - * of the property <code>'ConditionalFormat'</code>. Obtains the conditional - * entry with index 0 that is the instance of the service - * <code>com.sun.star.sheet.TableConditionalEntry</code>. - * @see com.sun.star.sheet.XSheetConditionalEntries - * @see com.sun.star.sheet.TableConditionalEntry - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - XInterface oObj = null; - 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)); - - log.println("filling some cells"); - try { - oSheet.getCellByPosition(5, 5).setValue(15); - oSheet.getCellByPosition(1, 4).setValue(10); - oSheet.getCellByPosition(2, 0).setValue(-5.15); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception occurred while filling cells"); - e.printStackTrace(log); - } - - Object CFormat = null; - XPropertySet Props = null; - - Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet); - CFormat = Props.getPropertyValue("ConditionalFormat"); - if (utils.isVoid(CFormat)) { - log.println("Property 'ConditionalFormat' is void"); - } - - XSheetConditionalEntries xSCE = UnoRuntime.queryInterface(XSheetConditionalEntries.class, CFormat); - xSCE.addNew(Conditions()); - Props.setPropertyValue("ConditionalFormat", xSCE); - oObj = (XSheetConditionalEntry) AnyConverter.toObject( - new Type(XSheetConditionalEntry.class),xSCE.getByIndex(0)); - - log.println("creating a new environment for object"); - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } // finish method getTestEnvironment - - /** - * Returns the array of the property values that was filled by condition - * values. - */ - protected PropertyValue[] Conditions() { - PropertyValue[] con = new PropertyValue[5]; - CellAddress ca = new CellAddress(); - ca.Column = 1; - ca.Row = 5; - ca.Sheet = 0; - con[0] = new PropertyValue(); - con[0].Name = "StyleName"; - con[0].Value = "Result2"; - con[1] = new PropertyValue(); - con[1].Name = "Formula1"; - con[1].Value = "$Sheet1.$B$5"; - con[2] = new PropertyValue(); - con[2].Name = "Formula2"; - con[2].Value = ""; - con[3] = new PropertyValue(); - con[3].Name = "Operator"; - con[3].Value = ConditionOperator.EQUAL; - con[4] = new PropertyValue(); - con[4].Name = "SourcePosition"; - con[4].Value = ca; - return con; - } - -} // finish class ScTableConditionalEntry - |