From fdb520825339a8618cd41b0d972b98155039b9e7 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Thu, 15 Nov 2018 13:25:54 -0800 Subject: tdf#45904 Move XEnumeration Java tests to C++ Move XEnumeration Java tests for ScIndexEnumeration_TableRowsEnumeration to C++. Also improved the overall run time of the test by limiting the range to enumerate over for reasons mentioned in fdo#45337. Change-Id: Id8eb998242cacf61bb472a0c130f38482c95db1c Reviewed-on: https://gerrit.libreoffice.org/63444 Tested-by: Jenkins Reviewed-by: Jens Carl --- qadevOOo/Jar_OOoRunner.mk | 1 - ...ice.ScIndexEnumeration_TableRowsEnumeration.csv | 2 - .../ScIndexEnumeration_TableRowsEnumeration.java | 98 ---------------------- 3 files changed, 101 deletions(-) delete mode 100644 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv delete mode 100644 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java (limited to 'qadevOOo') diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index ef5d60294bd8..12f0796db58a 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -1010,7 +1010,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration \ - qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration \ qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \ qadevOOo/tests/java/mod/_sc/ScModelObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv deleted file mode 100644 index 67398487b882..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScIndexEnumeration_TableRowsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScIndexEnumeration_TableRowsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java deleted file mode 100644 index 3dda6ce59d47..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java +++ /dev/null @@ -1,98 +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.XEnumerationAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.table.XColumnRowRange; -import com.sun.star.table.XTableRows; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -public class ScIndexEnumeration_TableRowsEnumeration extends TestCase { - private XSpreadsheetDocument xSheetDoc = null; - - /** - * Creates Spreadsheet document. - */ - @Override - protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); - log.println( "creating a Spreadsheet document" ); - 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); - } - - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - XInterface oObj = null; - - log.println("getting row"); - XSpreadsheet xSpreadsheet = null; - - XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); - XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); - xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), - oNames.getByName(oNames.getElementNames()[0])); - - XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - - XTableRows oRows = oColumnRowRange.getRows(); - oObj = oRows; - - log.println("creating a new environment for object"); - - XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj); - - oObj = ea.createEnumeration(); - - log.println("ImplementationName: "+util.utils.getImplName(oObj)); - // creating test environment - TestEnvironment tEnv = new TestEnvironment( oObj ); - - tEnv.addObjRelation("ENUM",ea); - - return tEnv; - } -} - -- cgit