[Libreoffice-commits] core.git: 2 commits - include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_datapilotitemobj.mk sc/Module_sc.mk sc/qa test/Library_subsequenttest.mk test/source
Jens Carl
j.carl43 at gmx.de
Sun Aug 27 07:56:19 UTC 2017
include/test/sheet/databaserange.hxx | 44 +
include/test/sheet/datapilotitem.hxx | 34 +
qadevOOo/Jar_OOoRunner.mk | 2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotItemObj.csv | 2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv | 8
qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java | 24 -
qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java | 39 -
sc/CppunitTest_sc_datapilotitemobj.mk | 104 ++++
sc/Module_sc.mk | 1
sc/qa/extras/scdatabaserangeobj.cxx | 22
sc/qa/extras/scdatapilotitemobj.cxx | 150 ++++++
test/Library_subsequenttest.mk | 2
test/source/sheet/databaserange.cxx | 235 ++++++++++
test/source/sheet/datapilotitem.cxx | 72 +++
14 files changed, 662 insertions(+), 77 deletions(-)
New commits:
commit 829b73b1e9cb4ed11feeff428220a39f3b666214
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri Aug 25 06:02:55 2017 +0000
tdf#45904 Move _DataPilotItem Java tests to C++
Change-Id: Ia20630f4cc187bd6f1a47bb6d747fda3c8b39e86
Reviewed-on: https://gerrit.libreoffice.org/41551
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/include/test/sheet/datapilotitem.hxx b/include/test/sheet/datapilotitem.hxx
new file mode 100644
index 000000000000..1c05078352a6
--- /dev/null
+++ b/include/test/sheet/datapilotitem.hxx
@@ -0,0 +1,34 @@
+/* -*- 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: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index c9cd95fdca03..c2abc57550ab 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/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 \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotItemObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotItemObj.csv
index 362ca346a1cf..5723342b487d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotItemObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotItemObj.csv
@@ -1,5 +1,3 @@
-"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()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java b/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java
deleted file mode 100644
index dc9ca3f55dd2..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_DataPilotItem.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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
diff --git a/sc/CppunitTest_sc_datapilotitemobj.mk b/sc/CppunitTest_sc_datapilotitemobj.mk
new file mode 100644
index 000000000000..77221eae63d6
--- /dev/null
+++ b/sc/CppunitTest_sc_datapilotitemobj.mk
@@ -0,0 +1,104 @@
+# -*- 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:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3afc8d8cfeb0..79068f015df2 100644
--- a/sc/Module_sc.mk
+++ b/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,\
diff --git a/sc/qa/extras/scdatapilotitemobj.cxx b/sc/qa/extras/scdatapilotitemobj.cxx
new file mode 100644
index 000000000000..b23253bb531c
--- /dev/null
+++ b/sc/qa/extras/scdatapilotitemobj.cxx
@@ -0,0 +1,150 @@
+/* -*- 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: */
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 132eabd27e5e..213951e7eeba 100644
--- a/test/Library_subsequenttest.mk
+++ b/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 \
diff --git a/test/source/sheet/datapilotitem.cxx b/test/source/sheet/datapilotitem.cxx
new file mode 100644
index 000000000000..b03d35f119a0
--- /dev/null
+++ b/test/source/sheet/datapilotitem.cxx
@@ -0,0 +1,72 @@
+/* -*- 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: */
commit c298f79083cb7e09dd389a353b7bb25e6f5f00b2
Author: Jens Carl <j.carl43 at gmx.de>
Date: Thu Aug 24 21:05:38 2017 +0000
tdf#45904: Move _DatabaseRange Java tests to C++
Change-Id: Iefe319c379ac8fffbb167b4bd4bcb235defabfa9
Reviewed-on: https://gerrit.libreoffice.org/41541
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/include/test/sheet/databaserange.hxx b/include/test/sheet/databaserange.hxx
new file mode 100644
index 000000000000..3932fb41b1b0
--- /dev/null
+++ b/include/test/sheet/databaserange.hxx
@@ -0,0 +1,44 @@
+/* -*- 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_DATABASERANGE_HXX
+#define INCLUDED_TEST_SHEET_DATABASERANGE_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 DatabaseRange
+{
+public:
+ virtual css::uno::Reference< css::uno::XInterface > init(const OUString& rDBName) = 0;
+
+ void testMoveCells();
+ void testKeepFormats();
+ void testStripData();
+ void testAutoFilter();
+ void testUseFilterCriteriaSource();
+ void testFilterCriteriaSource();
+ void testRefreshPeriod();
+ void testFromSelection();
+ void testTokenIndex();
+ void testTotalsRow();
+ void testContainsHeader();
+
+protected:
+ ~DatabaseRange() {}
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_DATABASERANGE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 833e32163ac4..c9cd95fdca03 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/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/_DatabaseRange \
qadevOOo/tests/java/ifc/sheet/_DataPilotItem \
qadevOOo/tests/java/ifc/sheet/_DocumentSettings \
qadevOOo/tests/java/ifc/sheet/_FunctionDescription \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv
index bf4b1387cc73..a57801a581af 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangeObj.csv
@@ -11,11 +11,3 @@
"ScDatabaseRangeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScDatabaseRangeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScDatabaseRangeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"MoveCells"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"KeepFormats"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"StripData"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"AutoFilter#optional"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"UseFilterCriteriaSource#optional"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"FilterCriteriaSource#optional"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"RefreshPeriod#optional"
-"ScDatabaseRangeObj";"com::sun::star::sheet::DatabaseRange";"FromSelection#optional"
diff --git a/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java
deleted file mode 100644
index 7e0d9a440008..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_DatabaseRange.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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;
-
-/**
-* Testing <code>com.sun.star.sheet.DatabaseRange</code>
-* service properties :
-* <ul>
-* <li><code> MoveCells</code></li>
-* <li><code> KeepFormats</code></li>
-* <li><code> StripData</code></li>
-* <li><code> AutoFilter</code></li>
-* <li><code> UseFilerCriteriaSource</code></li>
-* <li><code> FilerCriteriaSource</code></li>
-* </ul> <p>
-* Properties testing is automated by <code>lib.MultiPropertyTest</code>.
-* @see com.sun.star.sheet.DatabaseRange
-*/
-public class _DatabaseRange extends MultiPropertyTest {
-}
-
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index 430c9882461c..a2a17f5e335a 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/sheet/databaserange.hxx>
#include <test/sheet/xdatabaserange.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -20,9 +21,9 @@ using namespace css::uno;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 6
+#define NUMBER_OF_TESTS 17
-class ScDatabaseRangeObj : public CalcUnoApiTest, public apitest::XDatabaseRange
+class ScDatabaseRangeObj : public CalcUnoApiTest, public apitest::DatabaseRange, public apitest::XDatabaseRange
{
public:
virtual void setUp() override;
@@ -33,12 +34,28 @@ public:
ScDatabaseRangeObj();
CPPUNIT_TEST_SUITE(ScDatabaseRangeObj);
+
+ // XDatabaseRange
CPPUNIT_TEST(testDataArea);
CPPUNIT_TEST(testGetSortDescriptor);
CPPUNIT_TEST(testGetSubtotalDescriptor);
CPPUNIT_TEST(testGetImportDescriptor);
CPPUNIT_TEST(testGetFilterDescriptor);
CPPUNIT_TEST(testRefresh);
+
+ // DatabaseRange
+ CPPUNIT_TEST(testMoveCells);
+ CPPUNIT_TEST(testKeepFormats);
+ CPPUNIT_TEST(testStripData);
+ CPPUNIT_TEST(testAutoFilter);
+ CPPUNIT_TEST(testUseFilterCriteriaSource);
+ CPPUNIT_TEST(testFilterCriteriaSource);
+ CPPUNIT_TEST(testRefreshPeriod);
+ CPPUNIT_TEST(testFromSelection);
+ CPPUNIT_TEST(testTokenIndex);
+ CPPUNIT_TEST(testTotalsRow);
+ CPPUNIT_TEST(testContainsHeader);
+
CPPUNIT_TEST_SUITE_END();
private:
static sal_Int32 nTest;
@@ -72,6 +89,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBN
void ScDatabaseRangeObj::setUp()
{
nTest++;
+ CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp();
}
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index fac8f1b7706f..132eabd27e5e 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/container/xnamed \
test/source/sheet/cellarealink \
test/source/sheet/cellproperties \
+ test/source/sheet/databaserange \
test/source/sheet/datapilotfield \
test/source/sheet/xarealink \
test/source/sheet/xcelladdressable \
diff --git a/test/source/sheet/databaserange.cxx b/test/source/sheet/databaserange.cxx
new file mode 100644
index 000000000000..ca7b63d04dc3
--- /dev/null
+++ b/test/source/sheet/databaserange.cxx
@@ -0,0 +1,235 @@
+/* -*- 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/databaserange.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XDatabaseRange.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include "cppunit/extensions/HelperMacros.h"
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+
+CPPUNIT_NS_BEGIN
+
+template<> struct assertion_traits<table::CellRangeAddress>
+{
+ static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y)
+ {
+ return x == y;
+ }
+
+ static std::string toString( const table::CellRangeAddress& x )
+ {
+ OStringStream ost;
+ ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " StartRow: " << x.StartRow
+ << " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow;
+ return ost.str();
+ }
+};
+
+CPPUNIT_NS_END
+
+namespace apitest {
+
+void DatabaseRange::testMoveCells()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("MoveCells");
+
+ bool bMoveCells = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bMoveCells);
+ CPPUNIT_ASSERT_MESSAGE("Default MoveCells already changed", !bMoveCells);
+
+ uno::Any aNewMoveCells;
+ aNewMoveCells <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewMoveCells);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bMoveCells);
+ CPPUNIT_ASSERT_MESSAGE("Value of MoveCells wasn't changed", bMoveCells);
+}
+
+void DatabaseRange::testKeepFormats()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("KeepFormats");
+
+ bool bKeepFormats = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bKeepFormats);
+ CPPUNIT_ASSERT_MESSAGE("Default KeepFormats already changed", !bKeepFormats);
+
+ uno::Any aNewKeepFormats;
+ aNewKeepFormats <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewKeepFormats);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bKeepFormats);
+ CPPUNIT_ASSERT_MESSAGE("Value of KeepFormats wasn't changed", bKeepFormats);
+}
+
+void DatabaseRange::testStripData()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("StripData");
+
+ bool bStripData = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bStripData);
+ CPPUNIT_ASSERT_MESSAGE("Default StripData already changed", !bStripData);
+
+ uno::Any aNewStripData;
+ aNewStripData <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewStripData);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bStripData);
+ CPPUNIT_ASSERT_MESSAGE("Value of StripData wasn't changed", bStripData);
+}
+
+void DatabaseRange::testAutoFilter()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("AutoFilter");
+
+ bool bAutoFilter = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bAutoFilter);
+ CPPUNIT_ASSERT_MESSAGE("Default AutoFilter already changed", !bAutoFilter);
+
+ uno::Any aNewAutoFilter;
+ aNewAutoFilter <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewAutoFilter);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bAutoFilter);
+ CPPUNIT_ASSERT_MESSAGE("Value of AutoFilter wasn't changed", bAutoFilter);
+}
+
+void DatabaseRange::testUseFilterCriteriaSource()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("UseFilterCriteriaSource");
+
+ bool bUseFilterCriteriaSource = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bUseFilterCriteriaSource);
+ CPPUNIT_ASSERT_MESSAGE("Default UseFilterCriteriaSource already changed", !bUseFilterCriteriaSource);
+
+ uno::Any aNewUseFilterCriteriaSource;
+ aNewUseFilterCriteriaSource <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewUseFilterCriteriaSource);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bUseFilterCriteriaSource);
+ CPPUNIT_ASSERT_MESSAGE("Value of UseFilterCriteriaSource wasn't changed", bUseFilterCriteriaSource);
+}
+
+void DatabaseRange::testFilterCriteriaSource()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("FilterCriteriaSource");
+
+ table::CellRangeAddress cellRangeAddress;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= cellRangeAddress);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshPeriod already changed",
+ table::CellRangeAddress(0,0,0,0,0), cellRangeAddress);
+
+ uno::Any aFilterCriteriaSource;
+ aFilterCriteriaSource <<= table::CellRangeAddress(1,1,1,1,1);
+ xDatabaseRange->setPropertyValue(propName, aFilterCriteriaSource);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= cellRangeAddress);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of FilterCriteriaSource wasn't changed",
+ table::CellRangeAddress(1,1,1,1,1), cellRangeAddress);
+}
+
+void DatabaseRange::testRefreshPeriod()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("RefreshPeriod");
+
+ sal_Int32 aRefreshPeriod = 1;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= aRefreshPeriod);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshPeriod already changed", sal_Int32(0), aRefreshPeriod);
+
+ uno::Any aNewRefreshPeriod;
+ aNewRefreshPeriod <<= static_cast<sal_Int32>(42);
+ xDatabaseRange->setPropertyValue(propName, aNewRefreshPeriod);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= aRefreshPeriod);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshPeriod wasn't changed", sal_Int32(42), aRefreshPeriod);
+}
+
+void DatabaseRange::testFromSelection()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("FromSelection");
+
+ bool bFromSelection = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bFromSelection);
+ CPPUNIT_ASSERT_MESSAGE("Default FromSelection already changed", !bFromSelection);
+
+ uno::Any aNewFromSelection;
+ aNewFromSelection <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewFromSelection);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bFromSelection);
+ CPPUNIT_ASSERT_MESSAGE("Value of FromSelection wasn't changed", bFromSelection);
+}
+
+void DatabaseRange::testTokenIndex()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("TokenIndex");
+
+ sal_Int32 aTokenIndex = 0;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= aTokenIndex);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Default TotalIndex already changed", sal_Int32(1), aTokenIndex);
+
+ uno::Any aNewTokenIndex;
+ aNewTokenIndex <<= static_cast<sal_Int32>(42);
+ xDatabaseRange->setPropertyValue(propName, aNewTokenIndex);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= aTokenIndex);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of TotalIndex was changed", sal_Int32(1), aTokenIndex);
+}
+
+void DatabaseRange::testTotalsRow()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("TotalsRow");
+
+ bool bTotalsRow = true;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bTotalsRow);
+ CPPUNIT_ASSERT_MESSAGE("Default TotalsRow already changed", !bTotalsRow);
+
+ uno::Any aNewTotalsRow;
+ aNewTotalsRow <<= true;
+ xDatabaseRange->setPropertyValue(propName, aNewTotalsRow);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bTotalsRow);
+ CPPUNIT_ASSERT_MESSAGE("Value of TotalsRow wasn't changed", bTotalsRow);
+}
+
+void DatabaseRange::testContainsHeader()
+{
+ uno::Reference< beans::XPropertySet > xDatabaseRange(init("DataArea"), UNO_QUERY_THROW);
+
+ const OUString propName("ContainsHeader");
+
+ bool bContainsHeader = false;
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bContainsHeader);
+ CPPUNIT_ASSERT_MESSAGE("Default ContainsHeader already changed", bContainsHeader);
+
+ uno::Any aNewContainsHeader;
+ aNewContainsHeader <<= false;
+ xDatabaseRange->setPropertyValue(propName, aNewContainsHeader);
+ CPPUNIT_ASSERT(xDatabaseRange->getPropertyValue(propName) >>= bContainsHeader);
+ CPPUNIT_ASSERT_MESSAGE("Value of ContainsHeader wasn't changed", !bContainsHeader);
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list