tdf#45904 Move _DataPilotItem Java tests to C++

Change-Id: Ia20630f4cc187bd6f1a47bb6d747fda3c8b39e86
Reviewed-on: https://gerrit.libreoffice.org/41551Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

include/test/sheet/datapilotitem.hxx

+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_DATAPILOTITEM_HXX
+#define INCLUDED_TEST_SHEET_DATAPILOTITEM_HXX
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <test/testdllapi.hxx>
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST DataPilotItem
+{
+public:
+    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+
+    void testProperties();
+
+protected:
+    ~DataPilotItem() {}
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_DATAPILOTITEM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

qadevOOo/Jar_OOoRunner.mk

@@ -564,7 +564,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer \
     qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster \
     qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor \
-    qadevOOo/tests/java/ifc/sheet/_DataPilotItem \
     qadevOOo/tests/java/ifc/sheet/_DocumentSettings \
     qadevOOo/tests/java/ifc/sheet/_FunctionDescription \
     qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings \

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

-"ScDataPilotItemObj";"com::sun::star::sheet::DataPilotItem";"ShowDetail"
-"ScDataPilotItemObj";"com::sun::star::sheet::DataPilotItem";"IsHidden"
 "ScDataPilotItemObj";"com::sun::star::container::XNamed";"getName()"
 "ScDataPilotItemObj";"com::sun::star::container::XNamed";"setName()"
 "ScDataPilotItemObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"

qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java

-/*
- * 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 ifc.sheet;
-
-import lib.MultiPropertyTest;
-
-
-public class _DataPilotItem extends MultiPropertyTest {
-}
\ No newline at end of file

sc/CppunitTest_sc_datapilotitemobj.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_datapilotitemobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_datapilotitemobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotitemobj, \
+    sc/qa/extras/scdatapilotitemobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotitemobj, \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    for \
+    forui \
+    i18nlangtag \
+    msfilter \
+    oox \
+    sal \
+    salhelper \
+    sax \
+    sb \
+    sc \
+    sfx \
+    sot \
+    subsequenttest \
+    svl \
+    svt \
+    svx \
+    svxcore \
+	test \
+    tk \
+    tl \
+    ucbhelper \
+	unotest \
+    utl \
+    vbahelper \
+    vcl \
+    xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_datapilotitemobj,\
+    -I$(SRCDIR)/sc/source/ui/inc \
+    -I$(SRCDIR)/sc/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilotitemobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_datapilotitemobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotitemobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_datapilotitemobj,\
+    basic/util/sb \
+    comphelper/util/comphelp \
+    configmgr/source/configmgr \
+    dbaccess/util/dba \
+    filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
+    forms/util/frm \
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    oox/util/oox \
+    package/source/xstor/xstor \
+    package/util/package2 \
+    sax/source/expatwrap/expwrap \
+    scripting/source/basprov/basprov \
+    scripting/util/scriptframe \
+    sc/util/sc \
+    sc/util/scd \
+    sc/util/scfilt \
+    $(call gb_Helper_optional,SCRIPTING, \
+	    sc/util/vbaobj) \
+    sfx2/util/sfx \
+    sot/util/sot \
+    svl/source/fsstor/fsstorage \
+    toolkit/util/tk \
+    ucb/source/core/ucb1 \
+    ucb/source/ucp/file/ucpfile1 \
+    ucb/source/ucp/tdoc/ucptdoc1 \
+    unotools/util/utl \
+    unoxml/source/rdf/unordf \
+    unoxml/source/service/unoxml \
+    uui/util/uui \
+    xmloff/util/xo \
+	svtools/util/svt \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotitemobj))
+
+# vim: set noet sw=4 ts=4:

sc/Module_sc.mk

@@ -128,6 +128,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 	CppunitTest_sc_cellcursorobj \
 	CppunitTest_sc_tabviewobj \
 	CppunitTest_sc_arealinkobj \
+	CppunitTest_sc_datapilotitemobj \
 ))
 
 $(eval $(call gb_Module_add_perfcheck_targets,sc,\

sc/qa/extras/scdatapilotitemobj.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/sheet/datapilotitem.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <com/sun/star/sheet/GeneralFunction.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
+#include <com/sun/star/sheet/XDataPilotField.hpp>
+#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
+#include <com/sun/star/sheet/XDataPilotTables.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;
+
+namespace sc_apitest {
+
+#define NUMBER_OF_TESTS 1
+
+class ScDataPilotItemObj : public CalcUnoApiTest, public apitest::DataPilotItem
+{
+public:
+    virtual void setUp() override;
+    virtual void tearDown() override;
+    virtual uno::Reference< uno::XInterface > init() override;
+
+    ScDataPilotItemObj();
+
+    CPPUNIT_TEST_SUITE(ScDataPilotItemObj);
+
+    // DataPilotItem
+    CPPUNIT_TEST(testProperties);
+
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    static sal_Int32 nTest;
+    static sal_Int32 nMaxFieldIndex;
+    static uno::Reference< lang::XComponent > mxComponent;
+};
+
+sal_Int32 ScDataPilotItemObj::nTest = 0;
+sal_Int32 ScDataPilotItemObj::nMaxFieldIndex = 6;
+uno::Reference< lang::XComponent > ScDataPilotItemObj::mxComponent;
+
+ScDataPilotItemObj::ScDataPilotItemObj()
+     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference< uno::XInterface > ScDataPilotItemObj::init()
+{
+    table::CellRangeAddress sCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, nMaxFieldIndex - 1);
+    table::CellAddress sCellAddress(0, 7, 8);
+
+    // create calc document
+    if (!mxComponent.is())
+        mxComponent = loadFromDesktop("private:factory/scalc");
+
+    uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW);
+    CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+    // we need to sheets
+    uno::Reference< sheet::XSpreadsheets > xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+    xSheets->insertNewByName("Some Sheet", 0);
+
+    uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), uno::UNO_QUERY_THROW);
+    uno::Reference< sheet::XSpreadsheet > xSheet1( xIndex->getByIndex(0), uno::UNO_QUERY_THROW);
+    uno::Reference< sheet::XSpreadsheet > xSheet2( xIndex->getByIndex(1), uno::UNO_QUERY_THROW);
+
+    for (auto i = 1; i < nMaxFieldIndex; i++)
+    {
+        xSheet1->getCellByPosition(i, 0)->setFormula(OUString("Col" + OUString::number(i)));
+        xSheet1->getCellByPosition(0, 1)->setFormula(OUString("Row" + OUString::number(i)));
+        xSheet2->getCellByPosition(i, 0)->setFormula(OUString("Col" + OUString::number(i)));
+        xSheet2->getCellByPosition(0, 1)->setFormula(OUString("Row" + OUString::number(i)));
+    }
+
+    for (auto i = 1; i < nMaxFieldIndex; i++)
+        for (auto j = 1; j < nMaxFieldIndex; j++)
+        {
+            xSheet1->getCellByPosition(i, j)->setValue(i * (j + 2));
+            xSheet2->getCellByPosition(i, j)->setValue(i * (j + 2));
+        }
+
+    xSheet1->getCellByPosition(1,5);
+    xSheet1->getCellByPosition(sCellAddress.Column, sCellAddress.Row + 3);
+
+    uno::Reference< sheet::XDataPilotTablesSupplier > xDPTS(xSheet1, uno::UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
+    uno::Reference< sheet::XDataPilotDescriptor > xDPD = xDPT->createDataPilotDescriptor();
+    xDPD->setSourceRange(sCellRangeAddress);
+
+    uno::Reference< beans::XPropertySet > xDataPilotFieldProp(xDPD->getDataPilotFields()->getByIndex(0), uno::UNO_QUERY_THROW);
+    uno::Any aGF; aGF <<= sheet::GeneralFunction_SUM;
+    xDataPilotFieldProp->setPropertyValue("Function", aGF);
+    uno::Any aDPFO; aDPFO <<= sheet::DataPilotFieldOrientation_DATA;
+    xDataPilotFieldProp->setPropertyValue("Orientation", aDPFO);
+
+    if (xDPT->hasByName("DataPilotTable"))
+        xDPT->removeByName("DataPilotTable");
+
+    xIndex = xDPD->getDataPilotFields();
+
+    xDPT->insertNewByName("DataPilotTable", sCellAddress, xDPD);
+    uno::Reference< sheet::XDataPilotField > xDPF(xIndex->getByIndex(0), uno::UNO_QUERY_THROW);
+    return xDPF->getItems();
+}
+
+void ScDataPilotItemObj::setUp()
+{
+    nTest++;
+    CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
+    CalcUnoApiTest::setUp();
+}
+
+void ScDataPilotItemObj::tearDown()
+{
+    if (nTest == NUMBER_OF_TESTS)
+    {
+        closeDocument(mxComponent);
+        mxComponent.clear();
+    }
+
+    CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotItemObj);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

test/Library_subsequenttest.mk

@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/sheet/cellproperties \
 	test/source/sheet/databaserange \
 	test/source/sheet/datapilotfield \
+	test/source/sheet/datapilotitem \
 	test/source/sheet/xarealink \
 	test/source/sheet/xcelladdressable \
 	test/source/sheet/xcellrangedata \

test/source/sheet/datapilotitem.cxx

+/* -*- 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/sheet/datapilotitem.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <iostream>
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+
+namespace apitest {
+
+void DataPilotItem::testProperties()
+{
+    uno::Reference< container::XIndexAccess > xIA(init(), UNO_QUERY_THROW);
+    uno::Reference< beans::XPropertySet > xItem(xIA->getByIndex(0), UNO_QUERY_THROW);
+
+
+    const OUString propNameIS("IsHidden");
+
+    bool bIsHidden = true;
+    CPPUNIT_ASSERT(xItem->getPropertyValue(propNameIS) >>= bIsHidden);
+    CPPUNIT_ASSERT_MESSAGE("Default IsHidden already changed", !bIsHidden);
+
+    uno::Any aNewIsHidden;
+    aNewIsHidden <<= false;
+    xItem->setPropertyValue(propNameIS, aNewIsHidden);
+    CPPUNIT_ASSERT(xItem->getPropertyValue(propNameIS) >>= bIsHidden);
+    CPPUNIT_ASSERT_MESSAGE("Value of IsHidden wasn't changed", !bIsHidden);
+
+
+    const OUString propNameSD("ShowDetail");
+
+    bool bShowDetail = false;
+    CPPUNIT_ASSERT(xItem->getPropertyValue(propNameSD) >>= bShowDetail);
+    CPPUNIT_ASSERT_MESSAGE("Default ShowDetail already changed", bShowDetail);
+
+    uno::Any aNewShowDetail;
+    aNewShowDetail <<= true;
+    xItem->setPropertyValue(propNameSD, aNewShowDetail);
+    CPPUNIT_ASSERT(xItem->getPropertyValue(propNameSD) >>= bShowDetail);
+    CPPUNIT_ASSERT_MESSAGE("Value of ShowDetail wasn't changed", bShowDetail);
+
+
+    const OUString propNameP("Position");
+
+    sal_Int32 nPosition = 42;
+    CPPUNIT_ASSERT(xItem->getPropertyValue(propNameP) >>= nPosition);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Position already changed", sal_Int32(0), nPosition);
+
+    // FIXME: This throws somehow a com.sun.star.lang.IllegalArgumentException
+    //uno::Any aNewPosition;
+    //aNewPosition <<= static_cast<sal_Int32>(42);
+    //xItem->setPropertyValue(propNameP, aNewPosition);
+    //CPPUNIT_ASSERT(xItem->getPropertyValue(propNameP) >>= nPosition);
+    //CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of Position wasn't changed", sal_Int32(42), nPosition);
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */