mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct and improve test set up of ScDataPilotItemObj

Browse Source 
Change-Id: I65fb4a444e7e072004adcc9f9ad7af77a3f9f919
Reviewed-on: https://gerrit.libreoffice.org/68888
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
This commit is contained in:
Jens Carl 2019-03-07 21:31:09 +00:00
parent 22606ba1e2
commit 91cdf22b88
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
sc/qa/extras/scdatapilotitemobj.cxx
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* -*- 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 file is part of the LibreOffice project.
* *
@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx> #include <test/calc_unoapi_test.hxx>
#include <test/sheet/datapilotitem.hxx> #include <test/sheet/datapilotitem.hxx>
#include <rtl/string.hxx>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp>
@ -22,21 +23,20 @@
#include <com/sun/star/sheet/XDataPilotTables.hpp> #include <com/sun/star/sheet/XDataPilotTables.hpp>
#include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
using namespace css; using namespace css;
using namespace css::uno;
namespace sc_apitest {
namespace sc_apitest
{
class ScDataPilotItemObj : public CalcUnoApiTest, public apitest::DataPilotItem class ScDataPilotItemObj : public CalcUnoApiTest, public apitest::DataPilotItem
{ {
public: public:
virtual void setUp() override; virtual void setUp() override;
virtual void tearDown() override; virtual void tearDown() override;
virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference<uno::XInterface> init() override;
ScDataPilotItemObj(); ScDataPilotItemObj();
@ -49,85 +49,86 @@ public:
private: private:
static const int m_nMaxFieldIndex = 6; static const int m_nMaxFieldIndex = 6;
uno::Reference< lang::XComponent > mxComponent; uno::Reference<lang::XComponent> m_xComponent;
}; };
ScDataPilotItemObj::ScDataPilotItemObj() ScDataPilotItemObj::ScDataPilotItemObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
} }
uno::Reference< uno::XInterface > ScDataPilotItemObj::init() uno::Reference<uno::XInterface> ScDataPilotItemObj::init()
{ {
table::CellRangeAddress sCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1); table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
table::CellAddress sCellAddress(0, 7, 8); table::CellAddress aCellAddress(0, 7, 8);
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
// we need to sheets
uno::Reference< sheet::XSpreadsheets > xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
xSheets->insertNewByName("Some Sheet", 0); xSheets->insertNewByName("Some Sheet", 0);
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), uno::UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet1( xIndex->getByIndex(0), uno::UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet2( xIndex->getByIndex(1), uno::UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheet> xSheet1(xIA->getByIndex(1), uno::UNO_QUERY_THROW);
for (auto i = 1; i < m_nMaxFieldIndex; i++) for (auto i = 1; i < m_nMaxFieldIndex; i++)
{ {
xSheet1->getCellByPosition(i, 0)->setFormula(OUString("Col" + OUString::number(i))); xSheet0->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
xSheet1->getCellByPosition(0, 1)->setFormula(OUString("Row" + OUString::number(i))); xSheet0->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
xSheet2->getCellByPosition(i, 0)->setFormula(OUString("Col" + OUString::number(i))); xSheet1->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
xSheet2->getCellByPosition(0, 1)->setFormula(OUString("Row" + OUString::number(i))); xSheet1->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
} }
for (auto i = 1; i < m_nMaxFieldIndex; i++) for (auto i = 1; i < m_nMaxFieldIndex; i++)
for (auto j = 1; j < m_nMaxFieldIndex; j++) for (auto j = 1; j < m_nMaxFieldIndex; j++)
{ {
xSheet0->getCellByPosition(i, j)->setValue(i * (j + 1));
xSheet1->getCellByPosition(i, j)->setValue(i * (j + 2)); xSheet1->getCellByPosition(i, j)->setValue(i * (j + 2));
xSheet2->getCellByPosition(i, j)->setValue(i * (j + 2));
} }
xSheet1->getCellByPosition(1,5); xSheet0->getCellByPosition(1, 5);
xSheet1->getCellByPosition(sCellAddress.Column, sCellAddress.Row + 3); xSheet0->getCellByPosition(aCellAddress.Column, aCellAddress.Row + 3);
uno::Reference< sheet::XDataPilotTablesSupplier > xDPTS(xSheet1, uno::UNO_QUERY_THROW); uno::Reference<sheet::XDataPilotTablesSupplier> xDPTS(xSheet0, uno::UNO_QUERY_THROW);
uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); uno::Reference<sheet::XDataPilotTables> xDPT(xDPTS->getDataPilotTables(), uno::UNO_QUERY_THROW);
uno::Reference< sheet::XDataPilotDescriptor > xDPD = xDPT->createDataPilotDescriptor(); uno::Reference<sheet::XDataPilotDescriptor> xDPD(xDPT->createDataPilotDescriptor(),
xDPD->setSourceRange(sCellRangeAddress); uno::UNO_QUERY_THROW);
xDPD->setSourceRange(aCellRangeAddress);
uno::Reference< beans::XPropertySet > xDataPilotFieldProp(xDPD->getDataPilotFields()->getByIndex(0), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xDataPilotFieldProp(
uno::Any aGF; aGF <<= sheet::GeneralFunction_SUM; xDPD->getDataPilotFields()->getByIndex(0), uno::UNO_QUERY_THROW);
xDataPilotFieldProp->setPropertyValue("Function", aGF); xDataPilotFieldProp->setPropertyValue("Function", uno::makeAny(sheet::GeneralFunction_SUM));
uno::Any aDPFO; aDPFO <<= sheet::DataPilotFieldOrientation_DATA; xDataPilotFieldProp->setPropertyValue("Orientation",
xDataPilotFieldProp->setPropertyValue("Orientation", aDPFO); uno::makeAny(sheet::DataPilotFieldOrientation_DATA));
if (xDPT->hasByName("DataPilotTable")) if (xDPT->hasByName("DataPilotTable"))
xDPT->removeByName("DataPilotTable"); xDPT->removeByName("DataPilotTable");
xIndex = xDPD->getDataPilotFields(); uno::Reference<container::XIndexAccess> xIA_DPF(xDPD->getDataPilotFields(), uno::UNO_QUERY_THROW);
xDPT->insertNewByName("DataPilotTable", sCellAddress, xDPD); xDPT->insertNewByName("DataPilotTable", aCellAddress, xDPD);
uno::Reference< sheet::XDataPilotField > xDPF(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); uno::Reference<sheet::XDataPilotField> xDPF(xIA_DPF->getByIndex(0), uno::UNO_QUERY_THROW);
return xDPF->getItems(); uno::Reference<uno::XInterface> xReturn(xDPF->getItems()->getByIndex(0), uno::UNO_QUERY_THROW);
return xReturn;
} }
void ScDataPilotItemObj::setUp() void ScDataPilotItemObj::setUp()
{ {
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create calc document // create calc document
mxComponent = loadFromDesktop("private:factory/scalc"); m_xComponent = loadFromDesktop("private:factory/scalc");
} }
void ScDataPilotItemObj::tearDown() void ScDataPilotItemObj::tearDown()
{ {
closeDocument(mxComponent); closeDocument(m_xComponent);
CalcUnoApiTest::tearDown(); CalcUnoApiTest::tearDown();
} }
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotItemObj); CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotItemObj);
} } // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

4
test/source/sheet/datapilotitem.cxx
View File

@ -11,6 +11,7 @@
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
@ -22,8 +23,7 @@ namespace apitest {
void DataPilotItem::testProperties() void DataPilotItem::testProperties()
{ {
uno::Reference< container::XIndexAccess > xIA(init(), UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xItem(init(), UNO_QUERY_THROW);
uno::Reference< beans::XPropertySet > xItem(xIA->getByIndex(0), UNO_QUERY_THROW);
const OUString propNameIS("IsHidden"); const OUString propNameIS("IsHidden");