From 7ae358f33f849bf51e810fa8739301307c98bc67 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Tue, 12 Feb 2019 00:43:39 +0000 Subject: [PATCH] tdf#45904 Move XNameAccess Java tests to C++ Move XNameAccess Java tests to C++ for ScDataPilotFieldGroupsObj. Change-Id: Ifa926bd64ac7fc7cd7df080e400ab36e084f1708 Reviewed-on: https://gerrit.libreoffice.org/67703 Tested-by: Jenkins Reviewed-by: Jens Carl --- ....comp.office.ScDataPilotFieldGroupsObj.csv | 3 - sc/CppunitTest_sc_datapilotfieldgroupsobj.mk | 47 +++++ sc/Module_sc.mk | 1 + sc/qa/extras/scdatapilotfieldgroupsobj.cxx | 189 ++++++++++++++++++ 4 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 sc/CppunitTest_sc_datapilotfieldgroupsobj.mk create mode 100644 sc/qa/extras/scdatapilotfieldgroupsobj.cxx diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupsObj.csv index feccada1783b..2305453ed41e 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupsObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupsObj.csv @@ -1,6 +1,3 @@ -"ScDataPilotFieldGroupsObj";"com::sun::star::container::XNameAccess";"getByName()" -"ScDataPilotFieldGroupsObj";"com::sun::star::container::XNameAccess";"getElementNames()" -"ScDataPilotFieldGroupsObj";"com::sun::star::container::XNameAccess";"hasByName()" "ScDataPilotFieldGroupsObj";"com::sun::star::container::XIndexAccess";"getCount()" "ScDataPilotFieldGroupsObj";"com::sun::star::container::XIndexAccess";"getByIndex()" "ScDataPilotFieldGroupsObj";"com::sun::star::container::XElementAccess";"getElementType()" diff --git a/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk b/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk new file mode 100644 index 000000000000..2a539defd0f5 --- /dev/null +++ b/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk @@ -0,0 +1,47 @@ +# -*- 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_datapilotfieldgroupsobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_datapilotfieldgroupsobj,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldgroupsobj, \ + sc/qa/extras/scdatapilotfieldgroupsobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldgroupsobj, \ + comphelper \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldgroupsobj,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldgroupsobj,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldgroupsobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldgroupsobj)) + +$(eval $(call gb_CppunitTest_use_rdb,sc_datapilotfieldgroupsobj,services)) + +$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldgroupsobj)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldgroupsobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index dab7c9f5a81f..15455b6fe7da 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -125,6 +125,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ $(if $(filter-out $(OS),iOS), \ CppunitTest_sc_databaserangeobj) \ CppunitTest_sc_databaserangesobj \ + CppunitTest_sc_datapilotfieldgroupsobj \ CppunitTest_sc_datapilotfieldobj \ CppunitTest_sc_datapilotfieldsobj \ CppunitTest_sc_datapilotitemobj \ diff --git a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx new file mode 100644 index 000000000000..3b504ab85bdd --- /dev/null +++ b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx @@ -0,0 +1,189 @@ +/* -*- 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 +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using namespace css; + +namespace sc_apitest +{ +const auto nMaxFieldIndex = 6; + +class ScDataPilotFieldGroupItemObj : public CalcUnoApiTest, public apitest::XNameAccess +{ +public: + ScDataPilotFieldGroupItemObj(); + + virtual uno::Reference init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScDataPilotFieldGroupItemObj); + + // XNameAccess + CPPUNIT_TEST(testGetByName); + CPPUNIT_TEST(testGetElementNames); + CPPUNIT_TEST(testHasByName); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference m_xComponent; +}; + +ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") + , apitest::XNameAccess("Group1") +{ +} + +uno::Reference ScDataPilotFieldGroupItemObj::init() +{ + table::CellRangeAddress aCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, nMaxFieldIndex - 1); + table::CellAddress aCellAddress(0, 7, 8); + + uno::Reference xDoc(m_xComponent, uno::UNO_QUERY_THROW); + uno::Reference xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference xIA(xSheets, uno::UNO_QUERY_THROW); + xSheets->insertNewByName("Some Sheet", 0); + + uno::Reference xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference 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, 1)->setFormula("aName"); + xSheet0->getCellByPosition(1, 2)->setFormula("otherName"); + xSheet0->getCellByPosition(1, 3)->setFormula("una"); + xSheet0->getCellByPosition(1, 4)->setFormula("otherName"); + xSheet0->getCellByPosition(1, 5)->setFormula("somethingelse"); + + xSheet0->getCellByPosition(1, 5); + xSheet0->getCellByPosition(aCellAddress.Column, aCellAddress.Row + 3); + + uno::Reference xDPTS(xSheet0, uno::UNO_QUERY_THROW); + uno::Reference xDPT(xDPTS->getDataPilotTables(), uno::UNO_QUERY_THROW); + uno::Reference xDPD(xDPT->createDataPilotDescriptor(), + uno::UNO_QUERY_THROW); + + xDPD->setSourceRange(aCellRangeAddress); + + uno::Reference xPropertySet0(xDPD->getDataPilotFields()->getByIndex(0), + uno::UNO_QUERY_THROW); + xPropertySet0->setPropertyValue("Orientation", + uno::makeAny(sheet::DataPilotFieldOrientation_ROW)); + + uno::Reference xPropertySet1(xDPD->getDataPilotFields()->getByIndex(1), + uno::UNO_QUERY_THROW); + xPropertySet1->setPropertyValue("Function", uno::makeAny(sheet::GeneralFunction_SUM)); + xPropertySet1->setPropertyValue("Orientation", + uno::makeAny(sheet::DataPilotFieldOrientation_DATA)); + + uno::Reference xPropertySet2(xDPD->getDataPilotFields()->getByIndex(2), + uno::UNO_QUERY_THROW); + xPropertySet2->setPropertyValue("Orientation", + uno::makeAny(sheet::DataPilotFieldOrientation_COLUMN)); + + xDPT->insertNewByName("DataPilotTable", aCellAddress, xDPD); + + uno::Reference xIA_DPT0(xDPTS->getDataPilotTables(), + uno::UNO_QUERY_THROW); + uno::Reference xDPD0(xIA_DPT0->getByIndex(0), + uno::UNO_QUERY_THROW); + uno::Reference xIA_RF0(xDPD0->getRowFields(), uno::UNO_QUERY_THROW); + + uno::Reference xDPFG(xIA_RF0->getByIndex(0), + uno::UNO_QUERY_THROW); + uno::Sequence aElements(2); + aElements[0] = "aName"; + aElements[1] = "otherName"; + xDPFG->createNameGroup(aElements); + + uno::Reference xNA_GroupNames; + + uno::Reference xIA_DPT1(xDPTS->getDataPilotTables(), + uno::UNO_QUERY_THROW); + uno::Reference xDPD1(xIA_DPT1->getByIndex(0), + uno::UNO_QUERY_THROW); + uno::Reference xIA_RF1(xDPD1->getRowFields(), uno::UNO_QUERY_THROW); + + sheet::DataPilotFieldGroupInfo aDPFGI; + for (auto i = 0; i < xIA_RF1->getCount(); ++i) + { + uno::Reference xPropertySet(xIA_RF1->getByIndex(i), + uno::UNO_QUERY_THROW); + if (::comphelper::getBOOL(xPropertySet->getPropertyValue("IsGroupField"))) + { + CPPUNIT_ASSERT(xPropertySet->getPropertyValue("GroupInfo") >>= aDPFGI); + } + } + + return aDPFGI.Groups; +} + +void ScDataPilotFieldGroupItemObj::setUp() +{ + CalcUnoApiTest::setUp(); + // create a calc document + m_xComponent = loadFromDesktop("private:factory/scalc"); +} + +void ScDataPilotFieldGroupItemObj::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupItemObj); + +} // namespace sc_apitest + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */