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 | |
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>
-rw-r--r-- | framework/qa/complex/api_internal/api.lst | 1 | ||||
-rw-r--r-- | include/test/sheet/xsubtotalfield.hxx | 34 | ||||
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 2 | ||||
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv | 4 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java | 108 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java | 126 | ||||
-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 | ||||
-rw-r--r-- | test/Library_subsequenttest.mk | 1 | ||||
-rw-r--r-- | test/source/sheet/xsubtotalfield.cxx | 79 |
12 files changed, 339 insertions, 242 deletions
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index f045d179e632..ac0c62e2e7f5 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -129,7 +129,6 @@ job129=sc.ScSpreadsheetSettingsObj job130=sc.ScStyleFamiliesObj job131=sc.ScStyleFamilyObj job132=sc.ScStyleObj -job133=sc.ScSubTotalFieldObj job134=sc.ScTableColumnObj job135=sc.ScTableColumnsObj job136=sc.ScTableConditionalEntry diff --git a/include/test/sheet/xsubtotalfield.hxx b/include/test/sheet/xsubtotalfield.hxx new file mode 100644 index 000000000000..c32af101aae9 --- /dev/null +++ b/include/test/sheet/xsubtotalfield.hxx @@ -0,0 +1,34 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_TEST_SHEET_XSUBTOTALFIELD_HXX +#define INCLUDED_TEST_SHEET_XSUBTOTALFIELD_HXX + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/XInterface.hpp> +#include <test/testdllapi.hxx> + +namespace apitest { + +class OOO_DLLPUBLIC_TEST XSubTotalField +{ +public: + virtual css::uno::Reference< css::uno::XInterface > init() = 0; + + void testGetSetGroupColumn(); + void testGetSetTotalColumns(); + +protected: + ~XSubTotalField() {} +}; + +} +#endif // INCLUDED_TEST_SHEET_XSUBTOTALFIELD_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index c2abc57550ab..f29279109c4a 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -635,7 +635,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable \ qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor \ - qadevOOo/tests/java/ifc/sheet/_XSubTotalField \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \ @@ -1112,7 +1111,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj \ qadevOOo/tests/java/mod/_sc/ScStyleObj \ qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \ - qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj \ qadevOOo/tests/java/mod/_sc/ScTableColumnObj \ qadevOOo/tests/java/mod/_sc/ScTableColumnsObj \ qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv deleted file mode 100644 index a25bff1dcdd0..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalFieldObj.csv +++ /dev/null @@ -1,4 +0,0 @@ -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"getGroupColumn()" -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"setGroupColumn()" -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"getSubTotalColumns()" -"ScSubTotalFieldObj";"com::sun::star::sheet::XSubTotalField";"setSubTotalColumns()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java deleted file mode 100644 index 57fcb485b37d..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalField.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package ifc.sheet; - -import lib.MultiMethodTest; - -import java.util.Arrays; - -import com.sun.star.sheet.GeneralFunction; -import com.sun.star.sheet.SubTotalColumn; -import com.sun.star.sheet.XSubTotalField; - -/** -* Testing <code>com.sun.star.sheet.XSubTotalField</code> -* interface methods : -* <ul> -* <li><code> getGroupColumn()</code></li> -* <li><code> setGroupColumn()</code></li> -* <li><code> getSubTotalColumns()</code></li> -* <li><code> setSubTotalColumns()</code></li> -* </ul> <p> -* @see com.sun.star.sheet.XSubTotalField -*/ -public class _XSubTotalField extends MultiMethodTest { - - public XSubTotalField oObj = null; - public int GroupColumn = 0; - public SubTotalColumn[] STColumns = null; - - /** - * Test calls the method, stores and checks returned value. <p> - * Has <b> OK </b> status if returned value isn't equal to zero. <p> - */ - public void _getGroupColumn() { - GroupColumn = oObj.getGroupColumn(); - tRes.tested("getGroupColumn()", GroupColumn != 0); - } // end of getGroupColumn - - /** - * Test calls the method, stores and checks returned value. <p> - * Has <b> OK </b> status if returned value isn't null. <p> - */ - public void _getSubTotalColumns() { - STColumns = oObj.getSubTotalColumns(); - tRes.tested("getSubTotalColumns()", STColumns != null); - } // end of getSubTotalColumns - - /** - * Test sets new value of the column by which entries are grouped, - * gets the current value and compares - * returned value with value that was stored by method - * <code>getGroupColumn()</code>. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getGroupColumn() </code> : to have the current column by - * which entries are grouped </li> - * </ul> - */ - public void _setGroupColumn() { - requiredMethod("getGroupColumn()"); - oObj.setGroupColumn(2); - tRes.tested("setGroupColumn()", GroupColumn != oObj.getGroupColumn()); - } // end of getGroupColumn - - /** - * Test sets new value using method, gets the current value and compares - * returned value with value that was stored by method - * <code>getSubTotalColumns()</code>. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getSubTotalColumns() </code> : to have the current value</li> - * </ul> - */ - public void _setSubTotalColumns() { - requiredMethod("getSubTotalColumns()"); - SubTotalColumn[] columns = new SubTotalColumn[2]; - SubTotalColumn column = new SubTotalColumn(); - column.Column=2; - column.Function=GeneralFunction.AVERAGE; - columns[0]=column; - columns[1]=STColumns[0]; - oObj.setSubTotalColumns(columns); - tRes.tested( - "setSubTotalColumns()", - !Arrays.equals(STColumns, oObj.getSubTotalColumns()) ); - } // end of getSubTotalColumns - -} // finish class _XSubTotalField - - diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java deleted file mode 100644 index 59bbe97ba5bc..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.container.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.GeneralFunction; -import com.sun.star.sheet.SubTotalColumn; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.sheet.XSubTotalCalculatable; -import com.sun.star.sheet.XSubTotalDescriptor; -import com.sun.star.sheet.XSubTotalField; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -/** -* Test for object which is represented by service -* <code>com.sun.star.sheet.SubTotalField</code>. <p> -* Object implements the following interfaces : -* <ul> -* <li> <code>com::sun::star::sheet::XSubTotalField</code></li> -* </ul> -* @see com.sun.star.sheet.SubTotalField -* @see com.sun.star.sheet.XSubTotalField -* @see ifc.sheet._XSubTotalField -*/ -public class ScSubTotalFieldObj extends TestCase { - private XSpreadsheetDocument xSpreadsheetDoc; - - /** - * Creates Spreadsheet document. - */ - @Override - public void initialize( TestParameters Param, PrintWriter log ) throws Exception { - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); - - log.println("creating a spreadsheetdocument"); - xSpreadsheetDoc = SOF.createCalcDoc(null); - } - - /** - * Disposes Spreadsheet document. - */ - @Override - protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xSheetDoc " ); - XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; - util.DesktopTools.closeDoc(oComp); - } - - /** - * Creating a TestEnvironment for the interfaces to be tested. - * Retrieves a collection of spreadsheets from the document and takes one of - * them. Creates a subtotal descriptor using the interface - * <code>XSubTotalCalculatable</code>. Adds a subtotal field definition to - * the descriptor. Obtains the subtotal field with index 0 from the - * collection. The obtained subtotal field is the instance of the service - * <code>com.sun.star.sheet.SubTotalField</code>. - * @see com.sun.star.sheet.XSubTotalCalculatable - * @see com.sun.star.sheet.SubTotalField - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - log.println("getting sheets"); - XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - - log.println("getting a sheet"); - XSpreadsheet oSheet = null; - XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); - oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type (XSpreadsheet.class),oIndexAccess.getByIndex(0)); - - XSubTotalCalculatable xSTC = UnoRuntime.queryInterface(XSubTotalCalculatable.class, oSheet); - - XSubTotalDescriptor xSTD = xSTC.createSubTotalDescriptor(true); - - SubTotalColumn[] columns = new SubTotalColumn[1]; - SubTotalColumn column = new SubTotalColumn(); - column.Column = 5; - column.Function = GeneralFunction.SUM; - columns[0] = column; - xSTD.addNew(columns, 1); - - XIndexAccess oDescIndex = UnoRuntime.queryInterface(XIndexAccess.class, xSTD); - - XInterface oObj = null; - - oObj = ( XSubTotalField ) AnyConverter.toObject( - new Type(XSubTotalField.class),oDescIndex.getByIndex(0)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - return tEnv; - - } // finish method getTestEnvironment - -} // finish class ScSubTotalFieldObj - 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 diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 213951e7eeba..bda4b7a8613b 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/sheet/xsheetannotationshapesupplier \ test/source/sheet/xsheetoutline \ test/source/sheet/xstyleloader \ + test/source/sheet/xsubtotalfield \ test/source/sheet/xuniquecellformatrangessupplier\ test/source/sheet/xusedareacursor \ test/source/sheet/xviewpane \ diff --git a/test/source/sheet/xsubtotalfield.cxx b/test/source/sheet/xsubtotalfield.cxx new file mode 100644 index 000000000000..66d0c7cc820c --- /dev/null +++ b/test/source/sheet/xsubtotalfield.cxx @@ -0,0 +1,79 @@ +/* -*- 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/sheet/xsubtotalfield.hxx> + +#include <com/sun/star/sheet/GeneralFunction.hpp> +#include <com/sun/star/sheet/SubTotalColumn.hpp> +#include <com/sun/star/sheet/XSubTotalField.hpp> + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> + +#include "cppunit/extensions/HelperMacros.h" + +using namespace com::sun::star; +using namespace com::sun::star::uno; + +CPPUNIT_NS_BEGIN + +template<> struct assertion_traits<uno::Sequence< sheet::SubTotalColumn > > +{ + static bool equal(const uno::Sequence< sheet::SubTotalColumn >& x, + const uno::Sequence< sheet::SubTotalColumn >& y) + { + return x == y; + } + + static std::string toString(const uno::Sequence< sheet::SubTotalColumn >& x) + { + OStringStream ost; + ost << "Sequence: Length: " << x.getLength() << "\n"; + for (auto element = x.begin(); element != x.end(); ++element) + ost << "Column: " << element->Column << " Function:\n"; + // FIXME: Find a way to print Function + //ost << "Column: " << element->Column << " Function: " << element->Function << "\n"; + return ost.str(); + } +}; + +CPPUNIT_NS_END + +namespace apitest { + +void XSubTotalField::testGetSetGroupColumn() +{ + uno::Reference< sheet::XSubTotalField > xSTF(init(), uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT_MESSAGE("Unable to get GroupColumn", xSTF->getGroupColumn() != 0); + + xSTF->setGroupColumn(2); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set GroupColumn to new value", + sal_Int32(2), xSTF->getGroupColumn()); +} + +void XSubTotalField::testGetSetTotalColumns() +{ + uno::Reference< sheet::XSubTotalField > xSTF(init(), UNO_QUERY_THROW); + + uno::Sequence< sheet::SubTotalColumn > sDefaultCols = xSTF->getSubTotalColumns(); + CPPUNIT_ASSERT_MESSAGE("Unable to get SubTotalColumns", sDefaultCols.getLength() != 0); + + uno::Sequence< sheet::SubTotalColumn > sNewCols; + sNewCols.realloc(1); + sNewCols[0].Column = 5; + sNewCols[0].Function = sheet::GeneralFunction_AVERAGE; + xSTF->setSubTotalColumns(sNewCols); + + CPPUNIT_ASSERT_MESSAGE("Unable to set SubTotalColumns", sDefaultCols != xSTF->getSubTotalColumns()); +} + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |