From 6a7350f856e50ce3d091bda9f4f00219b5521333 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Tue, 2 Apr 2019 21:42:28 +0000 Subject: tdf#45904 Move XCellRange Java tests to C++ Move XCellRange Java tests to C++ for ScTableRowObj. Change-Id: I2735779cae777c5af4e622bc1b538df2d8bf70df Reviewed-on: https://gerrit.libreoffice.org/70163 Tested-by: Jenkins Reviewed-by: Jens Carl --- qadevOOo/Jar_OOoRunner.mk | 1 - .../sc/com.sun.star.comp.office.ScTableRowObj.csv | 3 - qadevOOo/tests/java/mod/_sc/ScTableRowObj.java | 124 --------------------- 3 files changed, 128 deletions(-) delete mode 100644 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv delete mode 100644 qadevOOo/tests/java/mod/_sc/ScTableRowObj.java (limited to 'qadevOOo') diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 3815a067b2e8..c9e63df3ac7f 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -969,7 +969,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \ qadevOOo/tests/java/mod/_sc/ScStyleObj \ qadevOOo/tests/java/mod/_sc/ScTableColumnObj \ - qadevOOo/tests/java/mod/_sc/ScTableRowObj \ qadevOOo/tests/java/mod/_sc/ScTableSheetObj \ qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \ qadevOOo/tests/java/mod/_sc/ScTabViewObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv deleted file mode 100644 index 3b6fe9714ae4..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv +++ /dev/null @@ -1,3 +0,0 @@ -"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellByPosition()" -"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()" -"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByName()" diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java deleted file mode 100644 index 6a1434ed74fe..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java +++ /dev/null @@ -1,124 +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.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; - -/** -* Test for object which is represented by service -* com.sun.star.table.TableRow.

-* Object implements the following interfaces : -*

-* @see com.sun.star.table.TableRow -* @see com.sun.star.table.XCellRange -* @see com.sun.star.beans.XPropertySet -* @see ifc.table._TableRow -* @see ifc.table._XCellRange -* @see ifc.beans._XPropertySet -*/ -public class ScTableRowObj 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 the document and takes one of - * them. Obtains the collection of rows using the interface - * XColumnRowRange. Obtains the row with index 6 from the - * collection and this is the instance of the service - * com.sun.star.table.TableRow. - * Object relations created : - * - * @see com.sun.star.table.XColumnRowRange - * @see com.sun.star.table.TableRow - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - XInterface oObj = null; - - // creation of the testobject here - // first we write what we are intend to do to log file - log.println("creating a test environment"); - - 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(); - XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oRows); - oObj = (XInterface) AnyConverter.toObject( - new Type(XInterface.class),oIndexAccess.getByIndex(6)); - - log.println("creating a new environment for object"); - TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("ValidRange","A7:A7"); - return tEnv; - } -} - -- cgit