[Libreoffice-commits] .: 3 commits - sc/qa solenv/gbuild test/inc test/Library_subsequenttest.mk test/Package_inc.mk test/source
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Fri Feb 10 10:23:16 PST 2012
sc/qa/extras/scdatapilottableobj.cxx | 37 +++++
solenv/gbuild/Module.mk | 2
test/Library_subsequenttest.mk | 1
test/Package_inc.mk | 1
test/inc/test/sheet/xdatapilottable2.hxx | 70 +++++++++++
test/source/sheet/xdatapilottable2.cxx | 195 +++++++++++++++++++++++++++++++
6 files changed, 303 insertions(+), 3 deletions(-)
New commits:
commit 82e349fd80671f7dabe9dd7a22e4711696300082
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 10 17:51:33 2012 +0100
add XDataPilotTable2 test to ScDatPilotTableObj
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 0d1cf40..6fedec0 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -28,6 +28,7 @@
#include <test/unoapi_test.hxx>
#include <test/sheet/xdatapilottable.hxx>
+#include <test/sheet/xdatapilottable2.hxx>
#include <test/sheet/xdatapilotdescriptor.hxx>
#include <test/container/xnamed.hxx>
@@ -39,10 +40,10 @@
namespace sc_apitest {
-#define NUMBER_OF_TESTS 12
+#define NUMBER_OF_TESTS 13
class ScDataPilotTableObj : public UnoApiTest, apitest::XDataPilotDescriptor, apitest::XDataPilotTable,
- apitest::XNamed
+ apitest::XNamed, apitest::XDataPilotTable2
{
public:
ScDataPilotTableObj();
@@ -50,6 +51,7 @@ public:
virtual void setUp();
virtual void tearDown();
virtual uno::Reference< uno::XInterface > init();
+ virtual uno::Reference< uno::XInterface > initDP2();
CPPUNIT_TEST_SUITE(ScDataPilotTableObj);
CPPUNIT_TEST(testRefresh);
@@ -65,6 +67,7 @@ public:
CPPUNIT_TEST(testGetDataFields);
CPPUNIT_TEST(testGetName);
CPPUNIT_TEST(testSetName);
+ CPPUNIT_TEST(testGetDrillDownData);
CPPUNIT_TEST_SUITE_END();
private:
@@ -111,6 +114,36 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init()
return xDPTable;
}
+uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
+{
+ rtl::OUString aFileURL;
+ createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDataPilotTableObj.ods")), aFileURL);
+ if(!mxComponent.is())
+ mxComponent = loadFromDesktop(aFileURL);
+ CPPUNIT_ASSERT(mxComponent.is());
+
+ uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
+ uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW);
+ uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW);
+
+ // set variables from xdatapilottable.[ch]xx
+ xCellForChange = xSheet->getCellByPosition( 1, 5 );
+ xCellForCheck = xSheet->getCellByPosition( 7, 11 );
+ CPPUNIT_ASSERT(xCellForCheck.is());
+ CPPUNIT_ASSERT(xCellForChange.is());
+
+ CPPUNIT_ASSERT_MESSAGE("Could not create interface of type XSpreadsheet", xSheet.is());
+ uno::Reference< sheet::XDataPilotTablesSupplier > xDPTS(xSheet, UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xDPTS.is());
+ uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
+ CPPUNIT_ASSERT(xDPT.is());
+
+ uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable2"))),UNO_QUERY_THROW);
+
+ CPPUNIT_ASSERT(xDPTable.is());
+ return xDPTable;
+}
+
void ScDataPilotTableObj::setUp()
{
nTest++;
diff --git a/test/inc/test/sheet/xdatapilottable2.hxx b/test/inc/test/sheet/xdatapilottable2.hxx
index 436376b..e81de86 100644
--- a/test/inc/test/sheet/xdatapilottable2.hxx
+++ b/test/inc/test/sheet/xdatapilottable2.hxx
@@ -31,6 +31,8 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/sheet/XDataPilotTable2.hpp>
+#include "test/testdllapi.hxx"
+
using namespace com::sun::star;
#include <vector>
@@ -39,7 +41,7 @@ using namespace com::sun::star;
namespace apitest {
-class XDataPilotTable2
+class OOO_DLLPUBLIC_TEST XDataPilotTable2
{
public:
void testGetPositionData();
diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx
index 57b111d..b707146 100644
--- a/test/source/sheet/xdatapilottable2.cxx
+++ b/test/source/sheet/xdatapilottable2.cxx
@@ -80,6 +80,7 @@ void XDataPilotTable2::testGetDrillDownData()
}
}
+ std::cout << "Sum: " << sum << "; nVal: " << nVal << std::endl;
CPPUNIT_ASSERT(sum == nVal);
}
commit c1589dbd450426928077694346b773b718e6ff78
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 10 17:41:46 2012 +0100
add test code for XDataPilotTable2
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 727b230..49fb833 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xdatapilotdescriptor \
test/source/sheet/xdatapilotfieldgrouping \
test/source/sheet/xdatapilottable \
+ test/source/sheet/xdatapilottable2 \
test/source/sheet/xnamedrange \
test/source/sheet/xnamedranges \
test/source/sheet/xspreadsheets2 \
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
index 7199974..55a50af 100644
--- a/test/Package_inc.mk
+++ b/test/Package_inc.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx
$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamereplace.hxx,test/container/xnamereplace.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,test/sheet/xdatapilottable.hxx))
+$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable2.hxx,test/sheet/xdatapilottable2.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotfieldgrouping.hxx,test/sheet/xdatapilotfieldgrouping.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/datapilotfield.hxx,test/sheet/datapilotfield.hxx))
$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheets2.hxx,test/sheet/xspreadsheets2.hxx))
diff --git a/test/inc/test/sheet/xdatapilottable2.hxx b/test/inc/test/sheet/xdatapilottable2.hxx
new file mode 100644
index 0000000..436376b
--- /dev/null
+++ b/test/inc/test/sheet/xdatapilottable2.hxx
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Markus Mohrhard <markus.mohrhard at googlemail.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/sheet/XDataPilotTable2.hpp>
+
+using namespace com::sun::star;
+
+#include <vector>
+
+using namespace com::sun::star;
+
+namespace apitest {
+
+class XDataPilotTable2
+{
+public:
+ void testGetPositionData();
+ void testGetDrillDownData();
+ void testGetOutputRangeByType();
+ void testInsertDrillData();
+
+ virtual uno::Reference< uno::XInterface > initDP2() = 0;
+
+protected:
+
+private:
+ void getOutputRanges(uno::Reference< sheet::XDataPilotTable2 >);
+ void buildDataFields(uno::Reference< sheet::XDataPilotTable2 >);
+ void buildResultCells(uno::Reference< sheet::XDataPilotTable2 >);
+
+ std::vector< table::CellAddress > maResultCells;
+ std::vector< sal_Int32 > maDataFieldDims;
+ table::CellRangeAddress maRangeWhole;
+ table::CellRangeAddress maRangeTable;
+ table::CellRangeAddress maRangeResult;
+};
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx
new file mode 100644
index 0000000..57b111d
--- /dev/null
+++ b/test/source/sheet/xdatapilottable2.cxx
@@ -0,0 +1,194 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Markus Mohrhard <markus.mohrhard at googlemail.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <test/sheet/xdatapilottable2.hxx>
+#include <com/sun/star/sheet/XDataPilotTable2.hpp>
+#include <com/sun/star/sheet/XDataPilotTable.hpp>
+#include <com/sun/star/sheet/DataPilotTableResultData.hpp>
+#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <com/sun/star/sheet/DataPilotTablePositionType.hpp>
+#include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
+#include <com/sun/star/sheet/DataResult.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include "cppunit/extensions/HelperMacros.h"
+
+using namespace com::sun::star::uno;
+
+namespace apitest {
+
+void XDataPilotTable2::testGetPositionData()
+{
+ uno::Reference< sheet::XDataPilotTable2 > xDPTable(initDP2(), UNO_QUERY_THROW);
+}
+
+void XDataPilotTable2::testGetDrillDownData()
+{
+ uno::Reference< sheet::XDataPilotTable2 > xDPTable(initDP2(), UNO_QUERY_THROW);
+
+ getOutputRanges(xDPTable);
+ buildDataFields(xDPTable);
+ buildResultCells(xDPTable);
+
+ for (std::vector<table::CellAddress>::iterator itr = maResultCells.begin();
+ itr != maResultCells.end(); ++itr)
+ {
+ sheet::DataPilotTablePositionData aPosData = xDPTable->getPositionData(*itr);
+ Any aTempAny = aPosData.PositionData;
+ sheet::DataPilotTableResultData aResData;
+ CPPUNIT_ASSERT(aTempAny >>= aResData);
+ sal_Int32 nDim = maDataFieldDims[aResData.DataFieldIndex];
+ sheet::DataResult aRes = aResData.Result;
+ double nVal = aRes.Value;
+
+ Sequence< Sequence<Any> > aData = xDPTable->getDrillDownData(*itr);
+ double sum = 0;
+
+ if( aData.getLength() > 1 )
+ {
+ for ( sal_Int32 row = 1; row < aData.getLength(); ++row)
+ {
+ Any aAny = aData[row][nDim];
+ double nValue;
+ if (aAny >>= nValue)
+ sum += nValue;
+ }
+ }
+
+ CPPUNIT_ASSERT(sum == nVal);
+ }
+
+
+}
+
+void XDataPilotTable2::testGetOutputRangeByType()
+{
+ uno::Reference< sheet::XDataPilotTable2 > xDPTable(initDP2(), UNO_QUERY_THROW);
+
+ // check for wrong arguments
+ bool bCaught = false;
+ try
+ {
+ xDPTable->getOutputRangeByType(-1);
+ }
+ catch ( const lang::IllegalArgumentException& )
+ {
+ bCaught = true;
+ }
+ CPPUNIT_ASSERT(bCaught);
+
+ bCaught = false;
+ try
+ {
+ xDPTable->getOutputRangeByType(100);
+ }
+ catch ( const lang::IllegalArgumentException& )
+ {
+ bCaught = true;
+ }
+ CPPUNIT_ASSERT(bCaught);
+
+ // make sure the whole range is not empty
+ CPPUNIT_ASSERT( maRangeWhole.EndColumn - maRangeWhole.StartColumn > 0);
+ CPPUNIT_ASSERT( maRangeWhole.EndRow - maRangeWhole.StartRow > 0);
+
+ //table range must be of equal width with the whole range, and the same bottom
+ CPPUNIT_ASSERT( maRangeTable.Sheet == maRangeWhole.Sheet );
+ CPPUNIT_ASSERT( maRangeTable.EndRow == maRangeWhole.EndRow );
+ CPPUNIT_ASSERT( maRangeTable.StartColumn == maRangeWhole.StartColumn );
+ CPPUNIT_ASSERT( maRangeTable.EndColumn == maRangeWhole.EndColumn );
+
+ //result range must be smaller than the table range, and must share the same lower-right corner
+ CPPUNIT_ASSERT( maRangeResult.Sheet == maRangeTable.Sheet );
+ CPPUNIT_ASSERT( maRangeResult.StartColumn < maRangeTable.StartColumn );
+ CPPUNIT_ASSERT( maRangeResult.StartRow < maRangeTable.StartRow );
+ CPPUNIT_ASSERT( maRangeResult.EndRow == maRangeTable.EndRow );
+ CPPUNIT_ASSERT( maRangeResult.EndColumn == maRangeTable.EndColumn );
+
+}
+
+/*
+void XDataPilotTable2::testInsertDrillDownData()
+{
+ uno::Reference< sheet::XDataPilotTable2 > xDPTable(initDP2(), UNO_QUERY_THROW);
+
+}
+*/
+void XDataPilotTable2::buildResultCells( uno::Reference< sheet::XDataPilotTable2 > xDPTable)
+{
+ getOutputRanges(xDPTable);
+ maResultCells.clear();
+
+ for ( sal_Int32 x = maRangeResult.StartColumn; x < maRangeResult.EndColumn; ++x)
+ {
+ for( sal_Int32 y = maRangeResult.StartRow; y < maRangeResult.EndRow; ++y)
+ {
+ table::CellAddress aAddr;
+ aAddr.Sheet = maRangeResult.Sheet;
+ aAddr.Column = x;
+ aAddr.Row = y;
+ sheet::DataPilotTablePositionData aPosData = xDPTable->getPositionData(aAddr);
+ if (aPosData.PositionType != sheet::DataPilotTablePositionType::RESULT)
+ {
+ CPPUNIT_ASSERT(false);
+ }
+ maResultCells.push_back(aAddr);
+ }
+ }
+}
+
+void XDataPilotTable2::getOutputRanges( uno::Reference< sheet::XDataPilotTable2 > xDPTable)
+{
+ maRangeWhole = xDPTable->getOutputRangeByType(sheet::DataPilotOutputRangeType::WHOLE);
+ maRangeTable = xDPTable->getOutputRangeByType(sheet::DataPilotOutputRangeType::TABLE);
+ maRangeResult = xDPTable->getOutputRangeByType(sheet::DataPilotOutputRangeType::RESULT);
+}
+
+void XDataPilotTable2::buildDataFields( uno::Reference< sheet::XDataPilotTable2 > xDPTable )
+{
+ uno::Reference< sheet::XDataPilotDescriptor > xDesc(xDPTable, UNO_QUERY_THROW);
+ uno::Reference< container::XIndexAccess > xIndex(xDesc->getDataPilotFields(), UNO_QUERY_THROW);
+
+ sal_Int32 nFieldCount = xIndex->getCount();
+ for( sal_Int32 i = 0; i < nFieldCount; ++i)
+ {
+ uno::Reference< beans::XPropertySet > xPropSet(xIndex->getByIndex(i), UNO_QUERY_THROW);
+ Any aAny = xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation")));
+ sheet::DataPilotFieldOrientation aOrientation;
+ CPPUNIT_ASSERT( aAny >>= aOrientation );
+
+ if ( aOrientation == sheet::DataPilotFieldOrientation_DATA )
+ {
+ maDataFieldDims.push_back( i );
+ }
+ }
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 85e0a914464d1fdd088173bae11388de71f02ef6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu Feb 9 15:30:41 2012 +0100
slowcheck should not be executed in module default target
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index c46a2e8..f93b277 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
debugrun :| build
endif
-all : build unitcheck slowcheck
+all : build unitcheck
$(info $(gb_Module_BUILDHINT))
build :
More information about the Libreoffice-commits
mailing list