framework/qa/complex/api_internal/api.lst
| 1
qadevOOo/Jar_OOoRunner.mk
| 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_LabelRangesEnumeration.csv
| 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
| 97 ----------
sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk
| 43 ++++
sc/Module_sc.mk
| 1
sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
| 92 +++++++++
sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
| 1
sc/qa/unoapi/sc_5.sce
| 1
9 files changed, 136 insertions(+), 103 deletions(-)
New commits:
commit 7ff004e8cac9b3e7296da11fc634facdadcd4d59
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sun Nov 18 06:48:48 2018 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sun Nov 18 08:59:30 2018 +0100
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_LabelRangesEnumeration.
Change-Id: I89c24de2323a2507fd5c1639af72c6b7121e77c9
Reviewed-on: https://gerrit.libreoffice.org/63516
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 0e842eed2d31..f0f8e67a1ca7 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -98,7 +98,6 @@ job101=sc.ScIndexEnumeration_CellAnnotationsEnumeration
job102=sc.ScIndexEnumeration_CellAreaLinksEnumeration
job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
-job108=sc.ScIndexEnumeration_LabelRangesEnumeration
job109=sc.ScIndexEnumeration_NamedRangesEnumeration
job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration
job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 65743536f489..e559a5a80e47 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -997,7 +997,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \
- 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_SpreadsheetsEnumeration \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_LabelRangesEnumeration.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_LabelRangesEnumeration.csv
deleted file mode 100644
index 76dffe88c9fd..000000000000
---
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_LabelRangesEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_LabelRangesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_LabelRangesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git
a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
deleted file mode 100644
index 767c4a1be5f6..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
+++ /dev/null
@@ -1,97 +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.lang.XComponent;
-import com.sun.star.sheet.XLabelRanges;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-public class ScIndexEnumeration_LabelRangesEnumeration extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws
Exception {
- // get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
- log.println( "creating a sheetdocument" );
- 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" );
-
- log.println("Getting test object ") ;
- XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class,
xSheetDoc);
- Object ranges = docProps.getPropertyValue("ColumnLabelRanges");
- XLabelRanges lRanges = UnoRuntime.queryInterface(XLabelRanges.class,
ranges);
-
- log.println("Adding at least one element for ElementAccess interface");
- CellRangeAddress aRange2 = new CellRangeAddress((short)0, 0, 1, 0, 6);
- CellRangeAddress aRange1 = new CellRangeAddress((short)0, 0, 0, 0, 1);
- lRanges.addNew(aRange1, aRange2);
-
- oObj = lRanges;
-
- log.println("creating a new environment for object");
- 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;
- } // finish method getTestEnvironment
-
-}
-
diff --git a/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk
b/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk
new file mode 100644
index 000000000000..810faae072ef
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.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_labelrangesenumeration))
+
+$(eval $(call
gb_CppunitTest_use_external,sc_indexenumeration_labelrangesenumeration,boost_headers))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,sc_indexenumeration_labelrangesenumeration,
\
+ sc/qa/extras/scindexenumeration_labelrangesenumeration \
+))
+
+$(eval $(call
gb_CppunitTest_use_libraries,sc_indexenumeration_labelrangesenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call
gb_CppunitTest_set_include,sc_indexenumeration_labelrangesenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call
gb_CppunitTest_use_sdk_api,sc_indexenumeration_labelrangesenumeration))
+
+$(eval $(call
gb_CppunitTest_use_ure,sc_indexenumeration_labelrangesenumeration))
+$(eval $(call
gb_CppunitTest_use_vcl,sc_indexenumeration_labelrangesenumeration))
+
+$(eval $(call
gb_CppunitTest_use_components,sc_indexenumeration_labelrangesenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call
gb_CppunitTest_use_configuration,sc_indexenumeration_labelrangesenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 89e54a241cf3..44a1b3a46650 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \
CppunitTest_sc_indexenumeration_datapilottablesenumeration \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
+ CppunitTest_sc_indexenumeration_labelrangesenumeration \
CppunitTest_sc_indexenumeration_scenariosenumeration \
CppunitTest_sc_indexenumeration_sheetlinksenumeration \
CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \
diff --git a/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
b/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
new file mode 100644
index 000000000000..16ecba28da57
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
@@ -0,0 +1,92 @@
+/* -*- 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/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XLabelRanges.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/table/CellRangeAddress.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_LabelRangesEnumeration : public CalcUnoApiTest,
+ public apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_LabelRangesEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_LabelRangesEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_LabelRangesEnumeration::ScIndexEnumeration_LabelRangesEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface>
ScIndexEnumeration_LabelRangesEnumeration::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ uno::Reference<beans::XPropertySet> xPropertySet(xDoc,
uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XLabelRanges> xLR;
+ CPPUNIT_ASSERT(xPropertySet->getPropertyValue("ColumnLabelRanges") >>=
xLR);
+
+ xLR->addNew(table::CellRangeAddress(0, 0, 1, 0, 6),
table::CellRangeAddress(0, 0, 0, 0, 1));
+
+ uno::Reference<container::XEnumerationAccess> xEA(xLR,
uno::UNO_QUERY_THROW);
+
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_LabelRangesEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_LabelRangesEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_LabelRangesEnumeration);
+
+} // 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 09b55f2bb0a7..41b9b126171d 100644
--- a/sc/qa/unoapi/sc_5.sce
+++ b/sc/qa/unoapi/sc_5.sce
@@ -18,7 +18,6 @@
-o sc.ScIndexEnumeration_DataPilotItemsEnumeration
-o sc.ScIndexEnumeration_DatabaseRangesEnumeration
-o sc.ScIndexEnumeration_FunctionDescriptionEnumeration
--o sc.ScIndexEnumeration_LabelRangesEnumeration
-o sc.ScIndexEnumeration_NamedRangesEnumeration
-o sc.ScIndexEnumeration_SheetCellRangesEnumeration
-o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
commit 986217f02de979b84c62843ae93db120e267abac
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sun Nov 18 06:58:25 2018 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sun Nov 18 08:59:18 2018 +0100
Bin obsolete header
Change-Id: I0a9ffcb8e49f60882fa944fdbc69225286ac3d44
Reviewed-on: https://gerrit.libreoffice.org/63515
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
index 460d79aa1bdf..a0c25262ca83 100644
--- a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
@@ -10,7 +10,6 @@
#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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
