tdf#45904 Move XEnumeration Java tests to C++

Move XEnumeration Java tests to C++
for ScIndexEnumeration_DataPilotItemsEnumeration.
It's also the last test in the group JunitTest_sc_unoapi_5,
we finally could remove that target from the Makefile.

Change-Id: I560c1ca691f0019ac4da99bde3c599b4ba22fb68
Reviewed-on: https://gerrit.libreoffice.org/63690
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>

qadevOOo/Jar_OOoRunner.mk

@@ -992,7 +992,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
     qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
     qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
-    qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
     qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \
     qadevOOo/tests/java/mod/_sc/ScModelObj \
     qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \

qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotItemsEnumeration.csv

-"ScIndexEnumeration_DataPilotItemsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_DataPilotItemsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"

sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk

+# -*- 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_datapilotitemsenumeration))
+
+$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_datapilotitemsenumeration,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_datapilotitemsenumeration, \
+	sc/qa/extras/scindexenumeration_datapilotitemsenumeration \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_datapilotitemsenumeration, \
+	cppu \
+	sal \
+	subsequenttest \
+	test \
+	unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_datapilotitemsenumeration,\
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_datapilotitemsenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_datapilotitemsenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_datapilotitemsenumeration))
+
+$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_datapilotitemsenumeration,\
+    $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_datapilotitemsenumeration))
+
+# vim: set noet sw=4 ts=4:

sc/JunitTest_sc_unoapi_5.mk

-# -*- 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_JunitTest_JunitTest,sc_unoapi_5))
-
-$(eval $(call gb_JunitTest_set_unoapi_test_defaults,sc_unoapi_5))
-
-# vim: set noet sw=4 ts=4:

sc/Module_sc.mk

@@ -98,7 +98,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 	JunitTest_sc_unoapi_2 \
 	JunitTest_sc_unoapi_3 \
 	JunitTest_sc_unoapi_4 \
-	JunitTest_sc_unoapi_5 \
 	JunitTest_sc_unoapi_6 \
 	JunitTest_sc_unoapi_7 \
 	CppunitTest_sc_anchor_test \
@@ -138,6 +137,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 	CppunitTest_sc_indexenumeration_cellarealinksenumeration \
 	CppunitTest_sc_indexenumeration_databaserangesenumeration \
 	CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \
+	CppunitTest_sc_indexenumeration_datapilotitemsenumeration \
 	CppunitTest_sc_indexenumeration_datapilottablesenumeration \
 	CppunitTest_sc_indexenumeration_ddelinksenumeration \
 	CppunitTest_sc_indexenumeration_functiondescriptionenumeration \

sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <com/sun/star/sheet/GeneralFunction.hpp>
+#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
+#include <com/sun/star/sheet/XDataPilotField.hpp>
+#include <com/sun/star/sheet/XDataPilotTables.hpp>
+#include <com/sun/star/sheet/XDataPilotTablesSupplier.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/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+using namespace com::sun::star;
+
+namespace sc_apitest
+{
+const auto nMaxFieldIndex = 6;
+
+class ScIndexEnumeration_DataPilotItemsEnumeration : public CalcUnoApiTest,
+                                                     public apitest::XEnumeration
+{
+public:
+    ScIndexEnumeration_DataPilotItemsEnumeration();
+
+    virtual uno::Reference<uno::XInterface> init() override;
+    virtual void setUp() override;
+    virtual void tearDown() override;
+
+    CPPUNIT_TEST_SUITE(ScIndexEnumeration_DataPilotItemsEnumeration);
+
+    // XEnumeration
+    CPPUNIT_TEST(testHasMoreElements);
+    CPPUNIT_TEST(testNextElement);
+
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_DataPilotItemsEnumeration::ScIndexEnumeration_DataPilotItemsEnumeration()
+    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotItemsEnumeration::init()
+{
+    table::CellRangeAddress aCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, nMaxFieldIndex - 1);
+    table::CellAddress aCellAddress(0, 7, 8);
+
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    CPPUNIT_ASSERT_MESSAGE("no document", xDoc.is());
+    uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+
+    uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+    xSheets->insertNewByName("Some Sheet", 0);
+
+    uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheet> xSheet1(xIA->getByIndex(1), uno::UNO_QUERY_THROW);
+
+    for (auto i = 1; i < nMaxFieldIndex; ++i)
+    {
+        xSheet0->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
+        xSheet0->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
+        xSheet1->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
+        xSheet1->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
+    }
+
+    for (auto i = 1; i < nMaxFieldIndex; ++i)
+    {
+        for (auto j = 1; j < nMaxFieldIndex; ++j)
+        {
+            xSheet0->getCellByPosition(i, j)->setValue(i * (j + 1));
+            xSheet1->getCellByPosition(i, j)->setValue(i * (j + 2));
+        }
+    }
+
+    xSheet0->getCellByPosition(1, 5);
+    xSheet0->getCellByPosition(aCellAddress.Column, aCellAddress.Row + 3);
+
+    uno::Reference<sheet::XDataPilotTablesSupplier> xDPTS(xSheet0, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XDataPilotTables> xDPT(xDPTS->getDataPilotTables(), uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XDataPilotDescriptor> xDPD(xDPT->createDataPilotDescriptor(),
+                                                     uno::UNO_QUERY_THROW);
+
+    xDPD->setSourceRange(aCellRangeAddress);
+
+    uno::Any aValue;
+    uno::Reference<beans::XPropertySet> xPropertySet(xDPD->getDataPilotFields()->getByIndex(0),
+                                                     uno::UNO_QUERY_THROW);
+    aValue <<= sheet::DataPilotFieldOrientation_DATA;
+    xPropertySet->setPropertyValue("Orientation", aValue);
+    aValue <<= sheet::GeneralFunction_SUM;
+    xPropertySet->setPropertyValue("Function", aValue);
+
+    xDPT->insertNewByName("DataPilotTable", aCellAddress, xDPD);
+
+    uno::Reference<sheet::XDataPilotField> xDPF(xDPD->getDataPilotFields()->getByIndex(0),
+                                                uno::UNO_QUERY_THROW);
+    uno::Reference<container::XEnumerationAccess> xEA(xDPF->getItems(), uno::UNO_QUERY_THROW);
+    return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_DataPilotItemsEnumeration::setUp()
+{
+    CalcUnoApiTest::setUp();
+    // create a calc document
+    m_xComponent = loadFromDesktop("private:factory/scalc");
+    CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_DataPilotItemsEnumeration::tearDown()
+{
+    closeDocument(m_xComponent);
+    CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DataPilotItemsEnumeration);
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/qa/unoapi/sc_5.sce

-#
-# 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 .
-#
--o sc.ScIndexEnumeration_DataPilotItemsEnumeration