diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-09-02 04:34:39 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-08 21:05:27 +0200 |
commit | 4867bbdd99e3d5262621fa761d852d849b7365ab (patch) | |
tree | 85d94724e8379b8f3291841d729730b8c8255a1f /sc | |
parent | d7a22815e8e7e52702afc3ff418a859194a1af68 (diff) |
tdf#45904: Move _XSubTotalField Java tests to C++
Change-Id: I64528c4e315247583e185bc3ab0defbc22bd8726
Reviewed-on: https://gerrit.libreoffice.org/41826
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/CppunitTest_sc_subtotalfieldobj.mk | 105 | ||||
-rw-r--r-- | sc/Module_sc.mk | 1 | ||||
-rw-r--r-- | sc/qa/extras/scsubtotalfieldobj.cxx | 119 | ||||
-rw-r--r-- | sc/qa/unoapi/sc_7.sce | 1 |
4 files changed, 225 insertions, 1 deletions
diff --git a/sc/CppunitTest_sc_subtotalfieldobj.mk b/sc/CppunitTest_sc_subtotalfieldobj.mk new file mode 100644 index 000000000000..36800c349f46 --- /dev/null +++ b/sc/CppunitTest_sc_subtotalfieldobj.mk @@ -0,0 +1,105 @@ +# -*- 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_subtotalfieldobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_subtotalfieldobj,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotalfieldobj, \ + sc/qa/extras/scsubtotalfieldobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_subtotalfieldobj, \ + 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_subtotalfieldobj,\ + -I$(SRCDIR)/sc/source/ui/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_subtotalfieldobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_subtotalfieldobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_subtotalfieldobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_subtotalfieldobj,\ + 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 \ + linguistic/source/lng \ + 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_subtotalfieldobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 79068f015df2..3698137d27f6 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -129,6 +129,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_tabviewobj \ CppunitTest_sc_arealinkobj \ CppunitTest_sc_datapilotitemobj \ + CppunitTest_sc_subtotalfieldobj \ )) $(eval $(call gb_Module_add_perfcheck_targets,sc,\ diff --git a/sc/qa/extras/scsubtotalfieldobj.cxx b/sc/qa/extras/scsubtotalfieldobj.cxx new file mode 100644 index 000000000000..6ddbaf8686c0 --- /dev/null +++ b/sc/qa/extras/scsubtotalfieldobj.cxx @@ -0,0 +1,119 @@ +/* -*- 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/sheet/xsubtotalfield.hxx> + +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/sheet/GeneralFunction.hpp> +#include <com/sun/star/sheet/SubTotalColumn.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/sheet/XSpreadsheets.hpp> +#include <com/sun/star/sheet/XSpreadsheet.hpp> +#include <com/sun/star/sheet/XSubTotalCalculatable.hpp> +#include <com/sun/star/sheet/XSubTotalDescriptor.hpp> +#include <com/sun/star/sheet/XSubTotalField.hpp> + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XInterface.hpp> + +using namespace css; +using namespace css::uno; +using namespace com::sun::star; + +namespace sc_apitest { + +#define NUMBER_OF_TESTS 2 + +class ScSubTotalFieldObj : public CalcUnoApiTest, public apitest::XSubTotalField +{ +public: + ScSubTotalFieldObj(); + + virtual uno::Reference< uno::XInterface > init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScSubTotalFieldObj); + + // XSubTotalField + CPPUNIT_TEST(testGetSetGroupColumn); + CPPUNIT_TEST(testGetSetTotalColumns); + + CPPUNIT_TEST_SUITE_END(); + +private: + static sal_Int32 nTest; + static uno::Reference< lang::XComponent > mxComponent; + +}; + +sal_Int32 ScSubTotalFieldObj::nTest = 0; +uno::Reference< lang::XComponent > ScSubTotalFieldObj::mxComponent; + +ScSubTotalFieldObj::ScSubTotalFieldObj() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference< uno::XInterface > ScSubTotalFieldObj::init() +{ + // create a 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()); + + uno::Reference< container::XIndexAccess > xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); + + uno::Reference< sheet::XSubTotalCalculatable > xSubTotalCalc(xSheet, uno::UNO_QUERY_THROW); + uno::Reference< sheet::XSubTotalDescriptor > xSubTotalDesc = xSubTotalCalc->createSubTotalDescriptor(true); + + uno::Sequence< sheet::SubTotalColumn > xCols; + xCols.realloc(1); + xCols[0].Column = 5; + xCols[0].Function = sheet::GeneralFunction_SUM; + xSubTotalDesc->addNew(xCols, 1); + + uno::Reference< container::XIndexAccess > xDescIndex(xSubTotalDesc, uno::UNO_QUERY_THROW); + uno::Reference< sheet::XSubTotalField > xSTF(xDescIndex->getByIndex(0), uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT(xSTF.is()); + return xSTF; +} + +void ScSubTotalFieldObj::setUp() +{ + nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); + CalcUnoApiTest::setUp(); +} + +void ScSubTotalFieldObj::tearDown() +{ + if (nTest == NUMBER_OF_TESTS) + { + closeDocument(mxComponent); + mxComponent.clear(); + } + + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalFieldObj); + +} // end namespace + +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_7.sce b/sc/qa/unoapi/sc_7.sce index 0e5ed6abd500..46d35f29d4cd 100644 --- a/sc/qa/unoapi/sc_7.sce +++ b/sc/qa/unoapi/sc_7.sce @@ -17,7 +17,6 @@ # # -o sc.ScStyleObj -o sc.ScSubTotalDescriptorBase --o sc.ScSubTotalFieldObj # # i84656 -o sc.ScTabViewObj # -o sc.ScTableColumnObj -o sc.ScTableColumnsObj |