[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_datapilotfieldsobj.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 2 01:39:17 UTC 2019
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv | 3
sc/CppunitTest_sc_datapilotfieldsobj.mk | 43 +++
sc/Module_sc.mk | 1
sc/qa/extras/scdatapilotfieldsobj.cxx | 108 ++++++++++
4 files changed, 152 insertions(+), 3 deletions(-)
New commits:
commit 3b79e1e35e527b6973bce9c76d2d036f4300ce49
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Fri Feb 1 23:50:32 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Sat Feb 2 02:38:50 2019 +0100
tdf#45904 Move XNameAccess Java tests to C++
Move XNameAccess Java tests to C++ for ScDataPilotFieldsObj.
Change-Id: I29625dcf6aa97e2781752c27e3eedba3ca479501
Reviewed-on: https://gerrit.libreoffice.org/67266
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv
index 10e5650ed423..8b5162f84c3b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv
@@ -1,6 +1,3 @@
-"ScDataPilotFieldsObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScDataPilotFieldsObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScDataPilotFieldsObj";"com::sun::star::container::XNameAccess";"hasByName()"
"ScDataPilotFieldsObj";"com::sun::star::container::XIndexAccess";"getCount()"
"ScDataPilotFieldsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScDataPilotFieldsObj";"com::sun::star::container::XElementAccess";"getElementType()"
diff --git a/sc/CppunitTest_sc_datapilotfieldsobj.mk b/sc/CppunitTest_sc_datapilotfieldsobj.mk
new file mode 100644
index 000000000000..03dc63afed97
--- /dev/null
+++ b/sc/CppunitTest_sc_datapilotfieldsobj.mk
@@ -0,0 +1,43 @@
+# -*- 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_datapilotfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_datapilotfieldsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldsobj, \
+ sc/qa/extras/scdatapilotfieldsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldsobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldsobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilotfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldsobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index dd41344970f5..dab7c9f5a81f 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -126,6 +126,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_databaserangeobj) \
CppunitTest_sc_databaserangesobj \
CppunitTest_sc_datapilotfieldobj \
+ CppunitTest_sc_datapilotfieldsobj \
CppunitTest_sc_datapilotitemobj \
CppunitTest_sc_datapilottableobj \
CppunitTest_sc_datapilottablesobj \
diff --git a/sc/qa/extras/scdatapilotfieldsobj.cxx b/sc/qa/extras/scdatapilotfieldsobj.cxx
new file mode 100644
index 000000000000..363724380b56
--- /dev/null
+++ b/sc/qa/extras/scdatapilotfieldsobj.cxx
@@ -0,0 +1,108 @@
+/* -*- 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/calc_unoapi_test.hxx>
+#include <test/container/xnameaccess.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
+#include <com/sun/star/sheet/XDataPilotTables.hpp>
+#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+namespace sc_apitest
+{
+class ScDataPilotFieldsObj : public CalcUnoApiTest, public apitest::XNameAccess
+{
+public:
+ ScDataPilotFieldsObj();
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScDataPilotFieldsObj);
+
+ // XNameAccess
+ CPPUNIT_TEST(testGetByName);
+ CPPUNIT_TEST(testGetElementNames);
+ CPPUNIT_TEST(testHasByName);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScDataPilotFieldsObj::ScDataPilotFieldsObj()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XNameAccess("")
+{
+}
+
+uno::Reference<uno::XInterface> ScDataPilotFieldsObj::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+
+ uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
+
+ for (int i = 1; i < 4; ++i)
+ {
+ xSheet0->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
+ xSheet0->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
+ }
+
+ for (int i = 1; i < 4; ++i)
+ {
+ for (int j = 1; j < 4; ++j)
+ {
+ xSheet0->getCellByPosition(i, j)->setValue(i * (j + 1));
+ }
+ }
+
+ uno::Reference<sheet::XDataPilotTablesSupplier> xDPTS(xSheet0, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XDataPilotTables> xDPT(xDPTS->getDataPilotTables(), uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XDataPilotDescriptor> xDPD(xDPT->createDataPilotDescriptor(),
+ uno::UNO_QUERY_THROW);
+
+ xDPD->setSourceRange(table::CellRangeAddress(0, 0, 0, 4, 4));
+ xDPT->insertNewByName("DataPilotTable", table::CellAddress(0, 5, 5), xDPD);
+
+ return xDPD->getDataPilotFields();
+}
+
+void ScDataPilotFieldsObj::setUp()
+{
+ CalcUnoApiTest::setUp();
+ // create a calc document
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+}
+
+void ScDataPilotFieldsObj::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldsObj);
+
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list