[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 17 23:53:09 UTC 2019
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv | 1
qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java | 149 ----------
sc/qa/extras/scddelinksobj.cxx | 5
sc/qa/unoapi/sc_3.sce | 1
6 files changed, 5 insertions(+), 153 deletions(-)
New commits:
commit cda562cedef53a6e54be2d9512a1347776046dfe
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Thu Jan 17 22:58:32 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Fri Jan 18 00:52:37 2019 +0100
tdf#45904 Move XEnumerationAccess Java test to C++
Move XEnumerationAccess Java test to C++ for ScDDELinksObj.
Change-Id: I91d8ea1b51cde36996847371a03406b899e23d79
Reviewed-on: https://gerrit.libreoffice.org/66559
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 28698eb8fa4e..c52e866b14a0 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -80,7 +80,6 @@ job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
job90=sc.ScDataPilotFieldObj
job91=sc.ScDataPilotFieldsObj
-job94=sc.ScDDELinksObj
job95=sc.ScDrawPagesObj
job96=sc.ScFilterDescriptorBase
job98=sc.ScHeaderFieldObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index e657d66f882e..6af59eb7f706 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -974,7 +974,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
- qadevOOo/tests/java/mod/_sc/ScDDELinksObj \
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
qadevOOo/tests/java/mod/_sc/ScDrawPageObj \
qadevOOo/tests/java/mod/_sc/ScDrawPagesObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv
deleted file mode 100644
index ce5281f4c2ea..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv
+++ /dev/null
@@ -1 +0,0 @@
-"ScDDELinksObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java
deleted file mode 100644
index 9fb7f59614e9..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java
+++ /dev/null
@@ -1,149 +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 util.utils;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-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.DDELinks</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XNameAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* </ul>
-* The following files used by this test :
-* <ul>
-* <li><b> ScDDELinksObj.ods </b> : the predefined testdocument </li>
-* </ul> <p>
-* @see com.sun.star.sheet.DDELinks
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.container._XNameAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScDDELinksObj extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
- static XComponent oDoc = 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 and testdocument.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println( " disposing xSheetDoc " );
- XComponent oComp = UnoRuntime.
- queryInterface(XComponent.class, xSheetDoc) ;
- util.DesktopTools.closeDoc(oComp);
- util.DesktopTools.closeDoc(oDoc);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Disposes the testdocument if it was loaded already.
- * Creates an instance of the <code>com.sun.star.frame.Desktop</code>
- * and loads the predefined testdocument. Retrieves a collection of
- * spreadsheets from a document and takes one of them. Sets specific formula
- * to some cells in the spreadsheet(the formula specify DDE links to the
- * testdocument). Retrieves the collection of DDE links in the document.
- * The retrieved collection of DDE link is the instance of the service
- * <code>com.sun.star.sheet.DDELinks</code>.
- * @see com.sun.star.frame.Desktop
- * @see com.sun.star.sheet.DDELinks
- */
- @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" );
-
- // create testobject here
-
- XMultiServiceFactory oMSF = Param.getMSF();
-
- // load the predefined testdocument
- String testdoc = utils.getFullTestURL("ScDDELinksObj.ods");
- oDoc = SOfficeFactory.getFactory(oMSF).loadDocument(testdoc);
-
- log.println("getting sheets");
- XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
-
- log.println("getting a sheet");
- XSpreadsheet oSheet = null;
- XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
-
- testdoc = utils.getFullTestDocName("ScDDELinksObj.ods");
- log.println("filling some cells");
- oSheet.getCellByPosition(5, 5).setFormula(
- "=DDE(\"soffice\";\""+testdoc+"\";\"Sheet1.A1\"");
- oSheet.getCellByPosition(1, 4).setFormula(
- "=DDE(\"soffice\";\""+testdoc+"\";\"Sheet1.A1\"");
- oSheet.getCellByPosition(2, 0).setFormula(
- "=DDE(\"soffice\";\""+testdoc+"\";\"Sheet1.A1\"");
-
- log.println("Getting test object ") ;
-
- // Getting named ranges.
- XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
- oObj = (XInterface)AnyConverter.toObject(
- new Type(XInterface.class),docProps.getPropertyValue("DDELinks"));
- log.println("Creating object - " +
- ((oObj == null) ? "FAILED" : "OK"));
-
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- return tEnv;
- }
-
-}
-
-
diff --git a/sc/qa/extras/scddelinksobj.cxx b/sc/qa/extras/scddelinksobj.cxx
index 095882cb5ba1..667c1b180243 100644
--- a/sc/qa/extras/scddelinksobj.cxx
+++ b/sc/qa/extras/scddelinksobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/container/xnameaccess.hxx>
@@ -37,6 +38,7 @@ namespace sc_apitest
{
class ScDDELinksObj : public CalcUnoApiTest,
public apitest::XElementAccess,
+ public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XNameAccess
{
@@ -53,6 +55,9 @@ public:
CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
diff --git a/sc/qa/unoapi/sc_3.sce b/sc/qa/unoapi/sc_3.sce
index 953875a3f94d..f663451e8d5a 100644
--- a/sc/qa/unoapi/sc_3.sce
+++ b/sc/qa/unoapi/sc_3.sce
@@ -21,4 +21,3 @@
-o sc.ScCellTextCursor
-o sc.ScChartObj
-o sc.ScChartsObj
--o sc.ScDDELinksObj
More information about the Libreoffice-commits
mailing list