summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2019-04-24 21:04:10 +0000
committerJens Carl <j.carl43@gmx.de>2019-04-25 01:21:49 +0200
commit7c88700b74346d58084b48656f1c7e28f891cf09 (patch)
tree99196c23486641cc280819af3e119d729c795ca0 /qadevOOo
parent47e094c3b14f19fe719d4de56f1f14606efe4885 (diff)
tdf#45904 Move TableColumn Java tests to C++
Move TableColumn Java tests to C++ for ScTableColumnObj. Change-Id: I3f17fa1f25c2676124b56c384364e36736fac849 Reviewed-on: https://gerrit.libreoffice.org/71261 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk2
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv4
-rw-r--r--qadevOOo/tests/java/ifc/table/_TableColumn.java64
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java135
4 files changed, 0 insertions, 205 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d235320fd5d7..4c12f9aa9994 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -582,7 +582,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier \
qadevOOo/tests/java/ifc/system/_XSystemShellExecute \
qadevOOo/tests/java/ifc/table/_CellProperties \
- qadevOOo/tests/java/ifc/table/_TableColumn \
qadevOOo/tests/java/ifc/table/_XAutoFormattable \
qadevOOo/tests/java/ifc/table/_XCellRange \
qadevOOo/tests/java/ifc/table/_XTableChart \
@@ -967,7 +966,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScShapeObj \
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
- qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
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.ScTableColumnObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
deleted file mode 100644
index 5a12a914c4c4..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"Width"
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"OptimalWidth"
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"IsVisible"
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"IsStartOfNewPage"
diff --git a/qadevOOo/tests/java/ifc/table/_TableColumn.java b/qadevOOo/tests/java/ifc/table/_TableColumn.java
deleted file mode 100644
index b94a29017a22..000000000000
--- a/qadevOOo/tests/java/ifc/table/_TableColumn.java
+++ /dev/null
@@ -1,64 +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.table;
-
-import lib.MultiPropertyTest;
-import util.ValueComparer;
-
-import com.sun.star.table.XCellRange;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Testing <code>com.sun.star.table.TableColumn</code>
-* service properties :
-* <ul>
-* <li><code> Width</code></li>
-* <li><code> OptimalWidth</code></li>
-* <li><code> IsVisible</code></li>
-* <li><code> IsStartOfNewPage</code></li>
-* </ul> <p>
-* Properties testing is automated by <code>lib.MultiPropertyTest</code>.
-* @see com.sun.star.table.TableColumn
-*/
-public class _TableColumn extends MultiPropertyTest {
-
- public void _OptimalWidth() {
- boolean res = false;
- try {
- XInterface tObject = tEnv.getTestObject();
- XCellRange aRange = UnoRuntime.queryInterface(XCellRange.class, tObject);
- aRange.getCellByPosition(0,0).setFormula("That's a pretty long text");
- Object width_before = oObj.getPropertyValue("Width");
- log.println("Before setting to optimal width: "+width_before);
- oObj.setPropertyValue("OptimalWidth", Boolean.TRUE);
- Object width_after = oObj.getPropertyValue("Width");
- log.println("After setting to optimal width: "+width_after);
- res = ! ValueComparer.equalValue(width_before,width_after);
- } catch (Exception e) {
- res = false;
- e.printStackTrace(log);
- }
-
- tRes.tested("OptimalWidth",res );
- }
-
-} //finish class _TableColumn
-
-
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
deleted file mode 100644
index 4a21e8d034d1..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
+++ /dev/null
@@ -1,135 +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.XTableColumns;
-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.table.TableColumn</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XNamed</code></li>
-* <li> <code>com::sun::star::table::TableColumn</code></li>
-* <li> <code>com::sun::star::table::XCellRange</code></li>
-* <li> <code>com::sun::star::beans::XPropertySet</code></li>
-* </ul>
-* @see com.sun.star.container.XNamed
-* @see com.sun.star.table.TableColumn
-* @see com.sun.star.table.XCellRange
-* @see com.sun.star.beans.XPropertySet
-* @see ifc.container._XNamed
-* @see ifc.table._TableColumn
-* @see ifc.table._XCellRange
-* @see ifc.beans._XPropertySet
-*/
-public class ScTableColumnObj 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 columns in the range using the interface
- * <code>XColumnRowRange</code>. Retrieves the column with index 10 that is
- * the instance of the service <code>com.sun.star.table.TableColumn</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'setName'</code> for
- * {@link ifc.container._XNamed} </li>
- * <li> <code>'ValidRange'</code> for
- * {@link ifc.table._XCellRange} </li>
- * </ul>
- * @see com.sun.star.table.XColumnRowRange
- * @see com.sun.star.table.TableColumn
- */
- @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);
- XTableColumns oColumns = oColumnRowRange.getColumns();
- XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oColumns);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oIndexAccess.getByIndex(10));
-
- log.println("creating a new environment for object");
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- // a valid Range for XCellRange
- tEnv.addObjRelation("ValidRange","K1:K1");
-
- //since TableColumnsNames are fixed XNamed::setName() should always be OK
- tEnv.addObjRelation("setName",Boolean.TRUE);
- return tEnv;
- }
-}
-
-