summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2019-03-12 22:55:34 +0000
committerJens Carl <j.carl43@gmx.de>2019-03-13 06:38:53 +0100
commit4ad3b5cdf416a8541a7188f67c7ab7fc0a93b94e (patch)
tree26e3cf35eba65ef44e28b59083b1377b85f17f7b /qadevOOo
parentbea44e5c1b982d05314b72452b94fe288071a496 (diff)
tdf#45904 Move XNameReplace Java tests to C++
Move XNameReplace Java tests to C++ for ScStyleFamilyObj. Fixes i#23594 by creating a new "com.sun.star.style.CellStyle" rather then using an existing one. Change-Id: Ie42e627020aff475173af5bc014bc28d7a11ec56 Reviewed-on: https://gerrit.libreoffice.org/69140 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv1
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java171
3 files changed, 0 insertions, 173 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9e5265f3e632..805ddeca0e38 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -970,7 +970,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScModelObj \
qadevOOo/tests/java/mod/_sc/ScShapeObj \
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
- qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \
qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
deleted file mode 100644
index 10e3d65acd85..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamilyObj.csv
+++ /dev/null
@@ -1 +0,0 @@
-"ScStyleFamilyObj";"com::sun::star::container::XNameReplace#optional";"replaceByName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
deleted file mode 100644
index ea8b06aabc3a..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
+++ /dev/null
@@ -1,171 +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.container.XNameContainer;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.style.XStyleFamiliesSupplier;
-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.style.StyleFamily</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XNameContainer</code></li>
-* <li> <code>com::sun::star::container::XNameAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* <li> <code>com::sun::star::container::XIndexAccess</code></li>
-* <li> <code>com::sun::star::container::XNameReplace</code></li>
-* </ul>
-* @see com.sun.star.style.StyleFamily
-* @see com.sun.star.container.XNameContainer
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XElementAccess
-* @see com.sun.star.container.XIndexAccess
-* @see com.sun.star.container.XNameReplace
-* @see ifc.container._XNameContainer
-* @see ifc.container._XNameAccess
-* @see ifc.container._XElementAccess
-* @see ifc.container._XIndexAccess
-* @see ifc.container._XNameReplace
-*/
-public class ScStyleFamilyObj extends TestCase {
- private XSpreadsheetDocument xSpreadsheetDoc = 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" );
- 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 the collection of style families from the document
- * using the interface <code>XStyleFamiliesSupplier</code>.
- * Obtains style family with index 0 from the collection.
- * Creates the two instance of the service <code>com.sun.star.style.CellStyle</code>.
- * One of the instance uses for inserting of new style to the obtained style
- * family that is the instance of the service
- * <code>com.sun.star.style.StyleFamily</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'SecondInstance'</code> for
- * {@link ifc.container._XNameContainer}(the second created instance of
- * the service <code>com.sun.star.style.CellStyle</code>)</li>
- * <li> <code>'XNameReplaceINDEX'</code> for
- * {@link ifc.container._XNameContainer}(the number of the current
- * running threads multiplied by two)</li>
- * <li> <code>'INSTANCE1', ..., 'INSTANCEN'</code> for
- * {@link ifc.container._XNameContainer}(the created instances of
- * the service <code>com.sun.star.style.CellStyle</code>)</li>
- * </ul>
- * @see com.sun.star.style.CellStyle
- */
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) throws Exception {
-
- // creation of testobject here
- // first we write what we are intend to do to log file
- log.println( "creating a test environment" );
-
- XNameAccess oStyleFamilyNameAccess = null;
- // create testobject here
- log.println("getting style");
- XStyleFamiliesSupplier oStyleFamiliesSupplier = UnoRuntime.queryInterface(
- XStyleFamiliesSupplier.class, xSpreadsheetDoc);
-
- XNameAccess oStyleFamilies = oStyleFamiliesSupplier.getStyleFamilies();
- XIndexAccess oStyleFamiliesIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oStyleFamilies);
- oStyleFamilyNameAccess = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),
- oStyleFamiliesIndexAccess.getByIndex(0));
-
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
- XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc);
-
- XInterface oInstance = (XInterface)
- SOF.createInstance(xComp,"com.sun.star.style.CellStyle");
-
- // insert a Style which can be replaced by name
- XNameContainer oContainer = UnoRuntime.queryInterface(
- XNameContainer.class, oStyleFamilyNameAccess);
- oContainer.insertByName("ScStyleFamilyObj", oInstance);
-
- TestEnvironment tEnv = new TestEnvironment(oStyleFamilyNameAccess);
-
- oInstance = (XInterface)
- SOF.createInstance(xComp, "com.sun.star.style.CellStyle");
-
- //second instance for insertByName in XNameContainer
- tEnv.addObjRelation("SecondInstance", oInstance);
-
- int THRCNT = 1;
- if ((String)tParam.get("THRCNT") != null) {
- THRCNT = Integer.parseInt((String)tParam.get("THRCNT"));
- }
-
- log.println( "adding XNameReplaceINDEX as mod relation to environment" );
- tEnv.addObjRelation("XNameReplaceINDEX", Integer.toString(2*THRCNT));
-
- // INSTANCEn : _XNameContainer; _XNameReplace
- log.println( "adding INSTANCEn as mod relation to environment" );
- for (int n = 1; n < 2*(THRCNT+1) ;n++ ) {
- log.println( "adding INSTANCE" + n +
- " as mod relation to environment" );
- tEnv.addObjRelation("INSTANCE" + n, SOF.createInstance(
- xComp,"com.sun.star.style.CellStyle"));
- }
- // NAMEREPLACE : _XNameReplace
- log.println("adding NAMEREPLACE as mod relation to environment");
- String cName = "ScStyleFamilyObj";
- tEnv.addObjRelation("NAMEREPLACE", cName);
-
- return tEnv;
- } // finish method getTestEnvironment
-
-} // finish class ScStyleFamilyObj
-