From a0d1f5eca204e4de84e6e83f0c0765323a23833f Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Tue, 20 Nov 2018 20:50:41 +0000 Subject: tdf#45904 Move XEnumeration Java tests to C++ Move XEnumeration Java tests to C++ for ScIndexEnumeration_TableChartsEnumeration. Change-Id: Ibbfcf9ec92c3bae4d6add044d2e62472f32d801e Reviewed-on: https://gerrit.libreoffice.org/63678 Tested-by: Jenkins Reviewed-by: Jens Carl --- ...t_sc_indexenumeration_tablechartsenumeration.mk | 45 ++++++ sc/Module_sc.mk | 3 +- .../scindexenumeration_tablechartsenumeration.cxx | 167 +++++++++++++++++++++ sc/qa/unoapi/sc_5.sce | 1 - 4 files changed, 214 insertions(+), 2 deletions(-) create mode 100644 sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk create mode 100644 sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx (limited to 'sc') diff --git a/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk b/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk new file mode 100644 index 000000000000..b67417cc1d24 --- /dev/null +++ b/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk @@ -0,0 +1,45 @@ +# -*- 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_indexenumeration_tablechartsenumeration)) + +$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_tablechartsenumeration,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_tablechartsenumeration, \ + sc/qa/extras/scindexenumeration_tablechartsenumeration \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_tablechartsenumeration, \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_tablechartsenumeration,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_tablechartsenumeration)) + +$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_tablechartsenumeration)) +$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_tablechartsenumeration)) + +$(eval $(call gb_CppunitTest_use_rdb,sc_indexenumeration_tablechartsenumeration,services)) + +$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_tablechartsenumeration)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_tablechartsenumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 205234820e3e..2da7844a1467 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -150,8 +150,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration \ CppunitTest_sc_indexenumeration_subtotalfieldsenumeration \ CppunitTest_sc_indexenumeration_tableautoformatenumeration \ - CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \ + CppunitTest_sc_indexenumeration_tablechartsenumeration \ CppunitTest_sc_indexenumeration_tablecolumnsenumeration \ + CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \ CppunitTest_sc_indexenumeration_tablerowsenumeration \ CppunitTest_sc_indexenumeration_textfieldenumeration \ CppunitTest_sc_importdescriptorbaseobj \ diff --git a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx new file mode 100644 index 000000000000..8cbabc2768fa --- /dev/null +++ b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx @@ -0,0 +1,167 @@ +/* -*- 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 +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using namespace css; +using namespace css::uno; + +namespace sc_apitest +{ +class ScIndexEnumeration_TableChartsEnumeration : public CalcUnoApiTest, + public apitest::XEnumeration +{ +public: + ScIndexEnumeration_TableChartsEnumeration(); + + virtual uno::Reference init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableChartsEnumeration); + + // XEnumeration + CPPUNIT_TEST(testHasMoreElements); + CPPUNIT_TEST(testNextElement); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference m_xComponent; +}; + +ScIndexEnumeration_TableChartsEnumeration::ScIndexEnumeration_TableChartsEnumeration() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference ScIndexEnumeration_TableChartsEnumeration::init() +{ + uno::Reference xDoc(m_xComponent, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference xIA(xSheets, uno::UNO_QUERY_THROW); + uno::Reference xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW); + + xSheet0->getCellByPosition(1, 0)->setFormula("JAN"); + xSheet0->getCellByPosition(2, 0)->setFormula("FEB"); + xSheet0->getCellByPosition(3, 0)->setFormula("MAR"); + xSheet0->getCellByPosition(4, 0)->setFormula("APR"); + xSheet0->getCellByPosition(5, 0)->setFormula("MAY"); + xSheet0->getCellByPosition(6, 0)->setFormula("JUN"); + xSheet0->getCellByPosition(7, 0)->setFormula("JUL"); + xSheet0->getCellByPosition(8, 0)->setFormula("AUG"); + xSheet0->getCellByPosition(9, 0)->setFormula("SEP"); + xSheet0->getCellByPosition(10, 0)->setFormula("OCT"); + xSheet0->getCellByPosition(11, 0)->setFormula("NOV"); + xSheet0->getCellByPosition(12, 0)->setFormula("DEC"); + xSheet0->getCellByPosition(13, 0)->setFormula("SUM"); + + xSheet0->getCellByPosition(0, 1)->setFormula("Smith"); + xSheet0->getCellByPosition(1, 1)->setValue(42); + xSheet0->getCellByPosition(2, 1)->setValue(58.9); + xSheet0->getCellByPosition(3, 1)->setValue(-66.5); + xSheet0->getCellByPosition(4, 1)->setValue(43.4); + xSheet0->getCellByPosition(5, 1)->setValue(44.5); + xSheet0->getCellByPosition(6, 1)->setValue(45.3); + xSheet0->getCellByPosition(7, 1)->setValue(-67.3); + xSheet0->getCellByPosition(8, 1)->setValue(30.5); + xSheet0->getCellByPosition(9, 1)->setValue(23.2); + xSheet0->getCellByPosition(10, 1)->setValue(-97.3); + xSheet0->getCellByPosition(11, 1)->setValue(22.4); + xSheet0->getCellByPosition(11, 1)->setValue(23.5); + xSheet0->getCellByPosition(13, 1)->setFormula("SUM(B2:M2"); + + xSheet0->getCellByPosition(0, 2)->setFormula("Jones"); + xSheet0->getCellByPosition(1, 2)->setValue(21); + xSheet0->getCellByPosition(2, 2)->setValue(40.9); + xSheet0->getCellByPosition(3, 2)->setValue(-57.5); + xSheet0->getCellByPosition(4, 2)->setValue(-23.4); + xSheet0->getCellByPosition(5, 2)->setValue(34.5); + xSheet0->getCellByPosition(6, 2)->setValue(59.3); + xSheet0->getCellByPosition(7, 2)->setValue(27.3); + xSheet0->getCellByPosition(8, 2)->setValue(-38.5); + xSheet0->getCellByPosition(9, 2)->setValue(43.2); + xSheet0->getCellByPosition(10, 2)->setValue(57.3); + xSheet0->getCellByPosition(11, 2)->setValue(25.4); + xSheet0->getCellByPosition(11, 2)->setValue(28.5); + xSheet0->getCellByPosition(13, 2)->setFormula("SUM(B3:M3"); + + xSheet0->getCellByPosition(0, 3)->setFormula("Brown"); + xSheet0->getCellByPosition(1, 3)->setValue(31.45); + xSheet0->getCellByPosition(2, 3)->setValue(-20.9); + xSheet0->getCellByPosition(3, 3)->setValue(-117.5); + xSheet0->getCellByPosition(4, 3)->setValue(23.4); + xSheet0->getCellByPosition(5, 3)->setValue(-114.5); + xSheet0->getCellByPosition(6, 3)->setValue(115.3); + xSheet0->getCellByPosition(7, 3)->setValue(-171.3); + xSheet0->getCellByPosition(8, 3)->setValue(89.5); + xSheet0->getCellByPosition(9, 3)->setValue(41.2); + xSheet0->getCellByPosition(10, 3)->setValue(71.3); + xSheet0->getCellByPosition(11, 3)->setValue(25.4); + xSheet0->getCellByPosition(11, 3)->setValue(38.5); + xSheet0->getCellByPosition(13, 3)->setFormula("SUM(A4:L4"); + + uno::Reference xCellRange0(xSheet0, uno::UNO_QUERY_THROW); + uno::Reference xCellRange1(xCellRange0->getCellRangeByName("A1:N4"), + uno::UNO_QUERY_THROW); + uno::Reference xCRA(xCellRange1, uno::UNO_QUERY_THROW); + + uno::Sequence aCRA(1); + aCRA[0] = xCRA->getRangeAddress(); + + uno::Reference xTCS(xSheet0, uno::UNO_QUERY_THROW); + uno::Reference xTC = xTCS->getCharts(); + xTC->addNewByName("ScChartObj", awt::Rectangle(500, 3000, 25000, 11000), aCRA, true, false); + + uno::Reference xEA(xTC, uno::UNO_QUERY_THROW); + + return xEA->createEnumeration(); +} + +void ScIndexEnumeration_TableChartsEnumeration::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScIndexEnumeration_TableChartsEnumeration::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableChartsEnumeration); + +} // namespace sc_apitest + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sc/qa/unoapi/sc_5.sce b/sc/qa/unoapi/sc_5.sce index 2ab776fd1858..b8c921a07ff4 100644 --- a/sc/qa/unoapi/sc_5.sce +++ b/sc/qa/unoapi/sc_5.sce @@ -16,4 +16,3 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -o sc.ScIndexEnumeration_DataPilotItemsEnumeration --o sc.ScIndexEnumeration_TableChartsEnumeration -- cgit