From af5f02ec27e3403c1e4c43bca621e2a0d261aa0e Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Mon, 1 Apr 2019 03:58:12 +0000 Subject: Rename ScSubTotalDescriptorBaseObj to ScSubTotalDescriptorBase Correct class name to mirror the name of the object we are testing against. Change-Id: If26dc045f67df7725043f1b0ccd0d3c8ba73f4ed Reviewed-on: https://gerrit.libreoffice.org/70030 Tested-by: Jenkins Reviewed-by: Jens Carl --- sc/CppunitTest_sc_subtotaldescriptorbase.mk | 46 +++++++++++ sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk | 46 ----------- sc/Module_sc.mk | 2 +- sc/qa/extras/scsubtotaldescriptorbase.cxx | 106 ++++++++++++++++++++++++ sc/qa/extras/scsubtotaldescriptorbaseobj.cxx | 107 ------------------------- 5 files changed, 153 insertions(+), 154 deletions(-) create mode 100644 sc/CppunitTest_sc_subtotaldescriptorbase.mk delete mode 100644 sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk create mode 100644 sc/qa/extras/scsubtotaldescriptorbase.cxx delete mode 100644 sc/qa/extras/scsubtotaldescriptorbaseobj.cxx diff --git a/sc/CppunitTest_sc_subtotaldescriptorbase.mk b/sc/CppunitTest_sc_subtotaldescriptorbase.mk new file mode 100644 index 000000000000..e20d002735aa --- /dev/null +++ b/sc/CppunitTest_sc_subtotaldescriptorbase.mk @@ -0,0 +1,46 @@ +# -*- 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_subtotaldescriptorbase)) + +$(eval $(call gb_CppunitTest_use_external,sc_subtotaldescriptorbase,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbase, \ + sc/qa/extras/scsubtotaldescriptorbase \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbase, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbase,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbase,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbase)) +$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbase)) + +$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbase,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbase)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk b/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk deleted file mode 100644 index 6a4ed6a951f7..000000000000 --- a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -*- 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_subtotaldescriptorbaseobj)) - -$(eval $(call gb_CppunitTest_use_external,sc_subtotaldescriptorbaseobj,boost_headers)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbaseobj, \ - sc/qa/extras/scsubtotaldescriptorbaseobj \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \ - cppu \ - sal \ - subsequenttest \ - test \ - unotest \ -)) - -$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbaseobj,\ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbaseobj,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbaseobj)) -$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbaseobj)) - -$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbaseobj,\ - $(sc_unoapi_common_components) \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbaseobj)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 7e014431f6a5..b56484c798a5 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -192,7 +192,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_spreadsheetsettingsobj \ CppunitTest_sc_stylefamiliesobj \ CppunitTest_sc_stylefamilyobj \ - CppunitTest_sc_subtotaldescriptorbaseobj \ + CppunitTest_sc_subtotaldescriptorbase \ CppunitTest_sc_subtotalfieldobj \ CppunitTest_sc_tablecolumnsobj \ CppunitTest_sc_tableconditionalentryobj \ diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx b/sc/qa/extras/scsubtotaldescriptorbase.cxx new file mode 100644 index 000000000000..5d77331f3801 --- /dev/null +++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx @@ -0,0 +1,106 @@ +/* -*- 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 + +using namespace css; + +namespace sc_apitest +{ +class ScSubTotalDescriptorBase : public CalcUnoApiTest, + public apitest::SubTotalDescriptor, + public apitest::XEnumerationAccess, + public apitest::XSubTotalDescriptor +{ +public: + ScSubTotalDescriptorBase(); + + virtual uno::Reference init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBase); + + // SubTotalDescriptor + CPPUNIT_TEST(testSubTotalDescriptorProperties); + + // XEnumerationAccess + CPPUNIT_TEST(testCreateEnumeration); + + // XSubTotalDescriptor + CPPUNIT_TEST(testAddNew); + CPPUNIT_TEST(testClear); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference mxComponent; +}; + +ScSubTotalDescriptorBase::ScSubTotalDescriptorBase() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference ScSubTotalDescriptorBase::init() +{ + uno::Reference xDoc(mxComponent, uno::UNO_QUERY_THROW); + + uno::Reference xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); + + uno::Reference xSTC(xSheet, uno::UNO_QUERY_THROW); + uno::Reference xSTD = xSTC->createSubTotalDescriptor(true); + + uno::Sequence xCols; + xCols.realloc(1); + xCols[0].Column = 5; + xCols[0].Function = sheet::GeneralFunction_SUM; + xSTD->addNew(xCols, 10); + + return xSTD; +} + +void ScSubTotalDescriptorBase::setUp() +{ + CalcUnoApiTest::setUp(); + // create calc document + mxComponent = loadFromDesktop("private:factory/scalc"); +} + +void ScSubTotalDescriptorBase::tearDown() +{ + closeDocument(mxComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalDescriptorBase); + +} // 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/extras/scsubtotaldescriptorbaseobj.cxx b/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx deleted file mode 100644 index 25236174837a..000000000000 --- a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- 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 - -using namespace css; -using namespace css::uno; -using namespace com::sun::star; - -namespace sc_apitest { - -class ScSubTotalDescriptorBaseObj : public CalcUnoApiTest,public apitest::XEnumerationAccess, - public apitest::SubTotalDescriptor, - public apitest::XSubTotalDescriptor -{ -public: - ScSubTotalDescriptorBaseObj(); - - virtual uno::Reference< uno::XInterface > init() override; - virtual void setUp() override; - virtual void tearDown() override; - - CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBaseObj); - - // XEnumerationAccess - CPPUNIT_TEST(testCreateEnumeration); - - // SubTotalDescriptor - CPPUNIT_TEST(testSubTotalDescriptorProperties); - - // XSubTotalDescriptor - CPPUNIT_TEST(testAddNew); - CPPUNIT_TEST(testClear); - - CPPUNIT_TEST_SUITE_END(); - -private: - uno::Reference< lang::XComponent > mxComponent; -}; - -ScSubTotalDescriptorBaseObj::ScSubTotalDescriptorBaseObj() - : CalcUnoApiTest("/sc/qa/extras/testdocuments") -{ -} - -uno::Reference< uno::XInterface > ScSubTotalDescriptorBaseObj::init() -{ - uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); - - 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 > xSTC(xSheet, uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSubTotalDescriptor > xSTD = xSTC->createSubTotalDescriptor(true); - - uno::Sequence< sheet::SubTotalColumn > xCols; - xCols.realloc(1); - xCols[0].Column = 5; - xCols[0].Function = sheet::GeneralFunction_SUM; - xSTD->addNew(xCols, 10); - - return xSTD; -} - -void ScSubTotalDescriptorBaseObj::setUp() -{ - CalcUnoApiTest::setUp(); - // create a calc document - mxComponent = loadFromDesktop("private:factory/scalc"); -} - -void ScSubTotalDescriptorBaseObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - -CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalDescriptorBaseObj); - -} // end namespace - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit