[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 10 00:30:35 UTC 2018
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv | 2
qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java | 139 ----------
sc/qa/unoapi/sc_6.sce | 1
5 files changed, 144 deletions(-)
New commits:
commit bf4fc97131147d25b18d088023262c977f0b2787
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Fri Nov 9 14:43:04 2018 -0800
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Sat Nov 10 01:28:27 2018 +0100
tdf#45904: Remove/disable obsolete _XNamed tests
The _XNamed tests are already written in C++ since commit
bbfddc1b3b673fe2bd25c2c382ca95cd8f6f28a8 for ScNamedRangeObj.
Change-Id: Ief17cea92c8b2ee42ef44da35f7a02ca07b099b6
Reviewed-on: https://gerrit.libreoffice.org/63224
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 3f89f85de88d..16f62d91d653 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -117,7 +117,6 @@ job118=sc.ScIndexEnumeration_TableColumnsEnumeration
job119=sc.ScIndexEnumeration_TableConditionalEntryEnumeration
job120=sc.ScIndexEnumeration_TextFieldEnumeration
job122=sc.ScLabelRangesObj
-job123=sc.ScNamedRangeObj
job125=sc.ScScenariosObj
job126=sc.ScSheetLinkObj
job127=sc.ScSheetLinksObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index afa06001eeab..3991a157096f 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1019,7 +1019,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration \
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \
qadevOOo/tests/java/mod/_sc/ScModelObj \
- qadevOOo/tests/java/mod/_sc/ScNamedRangeObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
qadevOOo/tests/java/mod/_sc/ScScenariosObj \
qadevOOo/tests/java/mod/_sc/ScShapeObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv
deleted file mode 100644
index fbed879b91b9..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScNamedRangeObj";"com::sun::star::container::XNamed";"getName()"
-"ScNamedRangeObj";"com::sun::star::container::XNamed";"setName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
deleted file mode 100644
index e8e2afff28d5..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
+++ /dev/null
@@ -1,139 +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.beans.XPropertySet;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XNamedRanges;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.CellRangeAddress;
-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.NamedRange</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XNamed</code></li>
-* <li> <code>com::sun::star::sheet::XNamedRange</code></li>
-* <li> <code>com::sun::star::sheet::XCellRangeReferrer</code></li>
-* </ul>
-* @see com.sun.star.sheet.NamedRange
-* @see com.sun.star.container.XNamed
-* @see com.sun.star.sheet.XNamedRange
-* @see com.sun.star.sheet.XCellRangeReferrer
-* @see ifc.container._XNamed
-* @see ifc.sheet._XNamedRange
-* @see ifc.sheet._XCellRangeReferrer
-*/
-public class ScNamedRangeObj 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);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Retrieves a collection of spreadsheets from a document
- * and takes one of them. Obtains the value of the property
- * <code>'NamedRanges'</code> that is the collection of named ranges.
- * Creates and adds new range to the collection. This new range is the instance of the
- * service <code>com.sun.star.sheet.NamedRange</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'DATAAREA'</code> for
- * {@link ifc.sheet._XCellRangeReferrer} (the cell range address of the
- * created range) </li>
- * </ul>
- */
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
-
- XInterface oObj = null;
-
- // creation of testobject here
- // first we write what we are intend to do to log file
- log.println( "Creating a test environment" );
-
- log.println("Getting test object ") ;
-
- // Getting named ranges.
- XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
-
- Object ranges = docProps.getPropertyValue("NamedRanges");
-
- XNamedRanges xNamedRanges = UnoRuntime.queryInterface(XNamedRanges.class, ranges);
-
- CellRangeAddress DataArea = new CellRangeAddress((short)0, 0, 0, 1, 1);
- CellAddress base = new CellAddress(DataArea.Sheet,
- DataArea.StartColumn,
- DataArea.StartRow);
-
- if (xNamedRanges.hasByName("ANamedRange")) {
- xNamedRanges.removeByName("ANamedRange");
- }
-
- xNamedRanges.addNewByName("ANamedRange", "A1:B2", base, 0);
-
- CellAddress listOutputPosition = new CellAddress((short)0, 1, 1);
- xNamedRanges.outputList(listOutputPosition);
-
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xNamedRanges.getByName("ANamedRange"));
-
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- // Other parameters required for interface tests
- tEnv.addObjRelation("DATAAREA", DataArea);
-
- return tEnv;
- }
-
-}
-
-
diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce
index dc4a58459443..77864244753c 100644
--- a/sc/qa/unoapi/sc_6.sce
+++ b/sc/qa/unoapi/sc_6.sce
@@ -21,7 +21,6 @@
-o sc.ScIndexEnumeration_TextFieldEnumeration
-o sc.ScLabelRangesObj
-o sc.ScModelObj
--o sc.ScNamedRangeObj
-o sc.ScNamedRangesObj
# -o sc.ScScenariosObj
# -o sc.ScShapeObj
More information about the Libreoffice-commits
mailing list