[Libreoffice-commits] core.git: sc/CppunitTest_sc_subtotaldescriptorbase.mk sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk sc/Module_sc.mk sc/qa
Jens Carl (via logerrit)
logerrit at kemper.freedesktop.org
Mon Apr 1 06:14:53 UTC 2019
sc/CppunitTest_sc_subtotaldescriptorbase.mk | 22 +++++------
sc/Module_sc.mk | 2 -
sc/qa/extras/scsubtotaldescriptorbase.cxx | 55 +++++++++++++---------------
3 files changed, 39 insertions(+), 40 deletions(-)
New commits:
commit af5f02ec27e3403c1e4c43bca621e2a0d261aa0e
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Mon Apr 1 03:58:12 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Mon Apr 1 08:14:30 2019 +0200
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 <j.carl43 at gmx.de>
diff --git a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk b/sc/CppunitTest_sc_subtotaldescriptorbase.mk
similarity index 76%
rename from sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
rename to sc/CppunitTest_sc_subtotaldescriptorbase.mk
index 6a4ed6a951f7..e20d002735aa 100644
--- a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_subtotaldescriptorbase.mk
@@ -9,15 +9,15 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_subtotaldescriptorbase))
-$(eval $(call gb_CppunitTest_use_external,sc_subtotaldescriptorbaseobj,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,sc_subtotaldescriptorbase,boost_headers))
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbaseobj, \
- sc/qa/extras/scsubtotaldescriptorbaseobj \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbase, \
+ sc/qa/extras/scsubtotaldescriptorbase \
))
-$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbase, \
cppu \
sal \
subsequenttest \
@@ -25,22 +25,22 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \
unotest \
))
-$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbase,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbase,\
offapi \
udkapi \
))
-$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbaseobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbase))
+$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbase))
-$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbase,\
$(sc_unoapi_common_components) \
))
-$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbase))
# 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/scsubtotaldescriptorbaseobj.cxx b/sc/qa/extras/scsubtotaldescriptorbase.cxx
similarity index 58%
rename from sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
rename to sc/qa/extras/scsubtotaldescriptorbase.cxx
index 25236174837a..5d77331f3801 100644
--- a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -21,36 +21,35 @@
#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/uno/XInterface.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 {
-class ScSubTotalDescriptorBaseObj : public CalcUnoApiTest,public apitest::XEnumerationAccess,
- public apitest::SubTotalDescriptor,
- public apitest::XSubTotalDescriptor
+namespace sc_apitest
+{
+class ScSubTotalDescriptorBase : public CalcUnoApiTest,
+ public apitest::SubTotalDescriptor,
+ public apitest::XEnumerationAccess,
+ public apitest::XSubTotalDescriptor
{
public:
- ScSubTotalDescriptorBaseObj();
+ ScSubTotalDescriptorBase();
- virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
- CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBaseObj);
-
- // XEnumerationAccess
- CPPUNIT_TEST(testCreateEnumeration);
+ CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBase);
// SubTotalDescriptor
CPPUNIT_TEST(testSubTotalDescriptorProperties);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XSubTotalDescriptor
CPPUNIT_TEST(testAddNew);
CPPUNIT_TEST(testClear);
@@ -58,25 +57,25 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- uno::Reference< lang::XComponent > mxComponent;
+ uno::Reference<lang::XComponent> mxComponent;
};
-ScSubTotalDescriptorBaseObj::ScSubTotalDescriptorBaseObj()
+ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
-uno::Reference< uno::XInterface > ScSubTotalDescriptorBaseObj::init()
+uno::Reference<uno::XInterface> ScSubTotalDescriptorBase::init()
{
- uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW);
+ 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<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::Reference<sheet::XSubTotalCalculatable> xSTC(xSheet, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSubTotalDescriptor> xSTD = xSTC->createSubTotalDescriptor(true);
- uno::Sequence< sheet::SubTotalColumn > xCols;
+ uno::Sequence<sheet::SubTotalColumn> xCols;
xCols.realloc(1);
xCols[0].Column = 5;
xCols[0].Function = sheet::GeneralFunction_SUM;
@@ -85,22 +84,22 @@ uno::Reference< uno::XInterface > ScSubTotalDescriptorBaseObj::init()
return xSTD;
}
-void ScSubTotalDescriptorBaseObj::setUp()
+void ScSubTotalDescriptorBase::setUp()
{
CalcUnoApiTest::setUp();
- // create a calc document
+ // create calc document
mxComponent = loadFromDesktop("private:factory/scalc");
}
-void ScSubTotalDescriptorBaseObj::tearDown()
+void ScSubTotalDescriptorBase::tearDown()
{
closeDocument(mxComponent);
CalcUnoApiTest::tearDown();
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalDescriptorBaseObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalDescriptorBase);
-} // end namespace
+} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
More information about the Libreoffice-commits
mailing list