[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 15 01:05:53 UTC 2018
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DDELinksEnumeration.csv | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java | 127 ----------
sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk | 43 +++
sc/Module_sc.mk | 1
sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx | 101 +++++++
sc/qa/unoapi/sc_3.sce | 1
8 files changed, 145 insertions(+), 132 deletions(-)
New commits:
commit f559951fcbdb09a20647eedd342d0a40467eadcd
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Wed Nov 14 14:58:38 2018 -0800
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Thu Nov 15 02:05:27 2018 +0100
tdf#45904 Move XEnumeration tests to C++
Move XEnumeration Java tests to C++ for
ScIndexEnumeration_DDELinksEnumeration.
Change-Id: I586fbd67f6c862f529461265536e68fea84b8c17
Reviewed-on: https://gerrit.libreoffice.org/63394
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 30f27b5ac21c..5e1bce8e72ed 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -99,7 +99,6 @@ job102=sc.ScIndexEnumeration_CellAreaLinksEnumeration
job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
job104=sc.ScIndexEnumeration_DataPilotFieldsEnumeration
job105=sc.ScIndexEnumeration_DataPilotTablesEnumeration
-job106=sc.ScIndexEnumeration_DDELinksEnumeration
job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
job108=sc.ScIndexEnumeration_LabelRangesEnumeration
job109=sc.ScIndexEnumeration_NamedRangesEnumeration
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 59d57b1a2f66..80b91408cf64 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -998,7 +998,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration \
- qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DDELinksEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DDELinksEnumeration.csv
deleted file mode 100644
index 1b617c83d18e..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DDELinksEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_DDELinksEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_DDELinksEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
deleted file mode 100644
index 16b0e5188704..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
+++ /dev/null
@@ -1,127 +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.XEnumerationAccess;
-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;
-
-public class ScIndexEnumeration_DDELinksEnumeration 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);
- }
-
- @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"));
-
- XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj);
-
- oObj = ea.createEnumeration();
-
- log.println("ImplementationName: "+util.utils.getImplName(oObj));
- // creating test environment
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- tEnv.addObjRelation("ENUM",ea);
-
- return tEnv;
- }
-
-}
-
-
diff --git a/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk b/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk
new file mode 100644
index 000000000000..bb116f6d2927
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_indexenumeration_ddelinksenumeration))
+
+$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_ddelinksenumeration,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_ddelinksenumeration, \
+ sc/qa/extras/scindexenumeration_ddelinksenumeration \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_ddelinksenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_ddelinksenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_ddelinksenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_ddelinksenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_ddelinksenumeration))
+
+$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_ddelinksenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_ddelinksenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 0d5e5103cf61..5d81f2c0d46e 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_functiondescriptionobj \
CppunitTest_sc_functionlistobj \
CppunitTest_sc_headerfootercontentobj \
+ CppunitTest_sc_indexenumeration_ddelinksenumeration \
CppunitTest_sc_importdescriptorbaseobj \
CppunitTest_sc_labelrangeobj \
CppunitTest_sc_labelrangesobj \
diff --git a/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx b/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx
new file mode 100644
index 000000000000..0347459c4fca
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumeration.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <rtl/string.hxx>
+#include <sal/types.h>
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScIndexEnumeration_DDELinksEnumeration : public CalcUnoApiTest, public apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_DDELinksEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_DDELinksEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_DDELinksEnumeration::ScIndexEnumeration_DDELinksEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_DDELinksEnumeration::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
+
+ xSheet0->getCellByPosition(5, 5)->setFormula(
+ "=DDE(\"soffice\";\"ScDDELinksObj.ods\";\"Sheet1.A1\"");
+ xSheet0->getCellByPosition(1, 4)->setFormula(
+ "=DDE(\"soffice\";\"ScDDELinksObj.ods\";\"Sheet1.A1\"");
+ xSheet0->getCellByPosition(2, 0)->setFormula(
+ "=DDE(\"soffice\";\"ScDDELinksObj.ods\";\"Sheet1.A1\"");
+
+ uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
+
+ uno::Reference<container::XEnumerationAccess> xEA(xPropertySet->getPropertyValue("DDELinks"),
+ uno::UNO_QUERY_THROW);
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_DDELinksEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_DDELinksEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DDELinksEnumeration);
+
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sc/qa/unoapi/sc_3.sce b/sc/qa/unoapi/sc_3.sce
index a32b6e907168..bc5b7d4d075f 100644
--- a/sc/qa/unoapi/sc_3.sce
+++ b/sc/qa/unoapi/sc_3.sce
@@ -24,4 +24,3 @@
-o sc.ScChartsObj
-o sc.ScDDELinkObj
-o sc.ScDDELinksObj
--o sc.ScIndexEnumeration_DDELinksEnumeration
More information about the Libreoffice-commits
mailing list