framework/qa/complex/api_internal/api.lst
| 1
qadevOOo/Jar_OOoRunner.mk
| 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetLinksEnumeration.csv
| 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
| 108 ----------
sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk
| 43 +++
sc/Module_sc.mk
| 1
sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
| 102 +++++++++
sc/qa/unoapi/sc_5.sce
| 1
8 files changed, 146 insertions(+), 113 deletions(-)
New commits:
commit cd52e2775773f3628177da4551d9f18e83740910
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sun Nov 18 03:51:29 2018 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sun Nov 18 08:05:35 2018 +0100
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_SheetLinksEnumeration.
Change-Id: I19bd376cc7921c9dcb7b08394c9c299c336921e3
Reviewed-on: https://gerrit.libreoffice.org/63511
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index eaf424757aa0..0e842eed2d31 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -101,7 +101,6 @@ job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
job108=sc.ScIndexEnumeration_LabelRangesEnumeration
job109=sc.ScIndexEnumeration_NamedRangesEnumeration
job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration
-job112=sc.ScIndexEnumeration_SheetLinksEnumeration
job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration
job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4f33139ccedf..65743536f489 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1000,7 +1000,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration \
- qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetLinksEnumeration.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetLinksEnumeration.csv
deleted file mode 100644
index 5fdf9c037db7..000000000000
---
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetLinksEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_SheetLinksEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_SheetLinksEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git
a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
deleted file mode 100644
index ec1cdb149ca4..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
+++ /dev/null
@@ -1,108 +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.container.XEnumerationAccess;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSheetLinkable;
-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_SheetLinksEnumeration 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);
- }
-
- @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" );
- XSpreadsheet oSheet = null;
-
- log.println("Getting test object ") ;
- XSpreadsheets oSheets = xSheetDoc.getSheets() ;
- XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
-
- XSheetLinkable SL = UnoRuntime.queryInterface(XSheetLinkable.class,
oSheet);
-
- // creating link.
- String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc");
- SL.link(aSourceArea, "Sheet1", "", "",
- com.sun.star.sheet.SheetLinkMode.VALUE);
-
- // Getting links.
- XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class,
xSheetDoc);
-
- Object links = docProps.getPropertyValue("SheetLinks");
-
- oObj = UnoRuntime.queryInterface(XInterface.class, links);
-
- 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_sheetlinksenumeration.mk
b/sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk
new file mode 100644
index 000000000000..b726147dcb59
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.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_sheetlinksenumeration))
+
+$(eval $(call
gb_CppunitTest_use_external,sc_indexenumeration_sheetlinksenumeration,boost_headers))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,sc_indexenumeration_sheetlinksenumeration,
\
+ sc/qa/extras/scindexenumeration_sheetlinksenumeration \
+))
+
+$(eval $(call
gb_CppunitTest_use_libraries,sc_indexenumeration_sheetlinksenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call
gb_CppunitTest_set_include,sc_indexenumeration_sheetlinksenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call
gb_CppunitTest_use_sdk_api,sc_indexenumeration_sheetlinksenumeration))
+
+$(eval $(call
gb_CppunitTest_use_ure,sc_indexenumeration_sheetlinksenumeration))
+$(eval $(call
gb_CppunitTest_use_vcl,sc_indexenumeration_sheetlinksenumeration))
+
+$(eval $(call
gb_CppunitTest_use_components,sc_indexenumeration_sheetlinksenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call
gb_CppunitTest_use_configuration,sc_indexenumeration_sheetlinksenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4feef0c91f9c..89e54a241cf3 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -138,6 +138,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_indexenumeration_datapilottablesenumeration \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
CppunitTest_sc_indexenumeration_scenariosenumeration \
+ CppunitTest_sc_indexenumeration_sheetlinksenumeration \
CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \
CppunitTest_sc_indexenumeration_tablecolumnsenumeration \
CppunitTest_sc_indexenumeration_tablerowsenumeration \
diff --git a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
new file mode 100644
index 000000000000..460d79aa1bdf
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
@@ -0,0 +1,102 @@
+/* -*- 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/PropertyValue.hpp>
+#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/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/SheetLinkMode.hpp>
+#include <com/sun/star/sheet/XSheetLinkable.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScIndexEnumeration_SheetLinksEnumeration : public CalcUnoApiTest, public
apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_SheetLinksEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_SheetLinksEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_SheetLinksEnumeration::ScIndexEnumeration_SheetLinksEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface>
ScIndexEnumeration_SheetLinksEnumeration::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);
+
+ uno::Reference<sheet::XSheetLinkable> xSL(xSheet0, uno::UNO_QUERY_THROW);
+ xSL->link("ScIndexEnumeration_SheetLinksEnumeration.ods", "Sheet1", "", "",
+ sheet::SheetLinkMode_VALUE);
+
+ uno::Reference<beans::XPropertySet> xPropertySet(xDoc,
uno::UNO_QUERY_THROW);
+ uno::Reference<container::XNameAccess> xSheetLinks;
+ CPPUNIT_ASSERT(xPropertySet->getPropertyValue("SheetLinks") >>=
xSheetLinks);
+
+ uno::Reference<container::XEnumerationAccess> xEA(xSheetLinks,
uno::UNO_QUERY_THROW);
+
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_SheetLinksEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_SheetLinksEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SheetLinksEnumeration);
+
+} // 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_5.sce b/sc/qa/unoapi/sc_5.sce
index 96c98b8886d9..09b55f2bb0a7 100644
--- a/sc/qa/unoapi/sc_5.sce
+++ b/sc/qa/unoapi/sc_5.sce
@@ -21,7 +21,6 @@
-o sc.ScIndexEnumeration_LabelRangesEnumeration
-o sc.ScIndexEnumeration_NamedRangesEnumeration
-o sc.ScIndexEnumeration_SheetCellRangesEnumeration
--o sc.ScIndexEnumeration_SheetLinksEnumeration
-o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
-o sc.ScIndexEnumeration_SpreadsheetsEnumeration
-o sc.ScIndexEnumeration_SubTotalFieldsEnumeration
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
