ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#45904: Move _XSubTotalDescriptor Java tests to C++

Browse Source 
Change-Id: Ie1ec8879972f77c5278992aadf9324f755859d96
Reviewed-on: https://gerrit.libreoffice.org/42096
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Jens Carl
2017-10-29 22:08:00 +01:00
committed by Markus Mohrhard
parent 33a617aa43
commit a060947e8c
9 changed files with 304 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/test/sheet/xsubtotaldescriptor.hxx
+34
View File
@@ -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_XSUBTOTALDESCRIPTOR_HXX
#define INCLUDED_TEST_SHEET_XSUBTOTALDESCRIPTOR_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 XSubTotalDescriptor
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() = 0;
void testAddNew();
void testClear();
protected:
~XSubTotalDescriptor() {}
};
}
#endif // INCLUDED_TEST_SHEET_XSUBTOTALDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
qadevOOo/Jar_OOoRunner.mk
-1
View File
@@ -633,7 +633,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XSpreadsheet \
qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable \
qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor \
qadevOOo/tests/java/ifc/style/_CharacterProperties \
qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
-2
View File
@@ -1,7 +1,5 @@
"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getCount()"
"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScSubTotalDescriptorBase";"com::sun::star::sheet::XSubTotalDescriptor";"addNew()"
"ScSubTotalDescriptorBase";"com::sun::star::sheet::XSubTotalDescriptor";"clear()"
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"InsertPageBreaks"
1 ScSubTotalDescriptorBase com::sun::star::container::XIndexAccess getCount()
2 ScSubTotalDescriptorBase com::sun::star::container::XIndexAccess getByIndex()
ScSubTotalDescriptorBase com::sun::star::sheet::XSubTotalDescriptor addNew()
ScSubTotalDescriptorBase com::sun::star::sheet::XSubTotalDescriptor clear()
3 ScSubTotalDescriptorBase com::sun::star::container::XElementAccess getElementType()
4 ScSubTotalDescriptorBase com::sun::star::container::XElementAccess hasElements()
5 ScSubTotalDescriptorBase com::sun::star::sheet::SubTotalDescriptor InsertPageBreaks
qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java
-69
View File
@@ -1,69 +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 com.sun.star.sheet.GeneralFunction;
import com.sun.star.sheet.SubTotalColumn;
import com.sun.star.sheet.XSubTotalDescriptor;
import lib.MultiMethodTest;
/**
* Testing <code>com.sun.star.sheet.XSubTotalDescriptor</code>
* interface methods :
* <ul>
* <li><code> addNew()</code></li>
* <li><code> clear()</code></li>
* </ul> <p>
* @see com.sun.star.sheet.XSubTotalDescriptor
*/
public class _XSubTotalDescriptor extends MultiMethodTest {
public XSubTotalDescriptor oObj = null;
/**
* Test creates a subtotal field definition and adds it to the descriptor.<p>
* Has <b> OK </b> status if the method successfully returns. <p>
*/
public void _addNew() {
SubTotalColumn[] columns = new SubTotalColumn[1];
SubTotalColumn column = new SubTotalColumn();
column.Column = 5;
column.Function = GeneralFunction.SUM;
columns[0] = column;
oObj.addNew(columns, 1);
tRes.tested("addNew()", true);
}
/**
* Test just calls the method. <p>
* Has <b> OK </b> status if the method successfully returns. <p>
*/
public void _clear() {
oObj.clear();
tRes.tested("clear()", true);
}
/**
* Forces environment recreation.
*/
@Override
protected void after() {
disposeEnvironment();
}
} // finish class _XSubTotalDescriptor
sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
+107
View File
@@ -0,0 +1,107 @@
# -*- 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, \
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_subtotaldescriptorbaseobj,\
-I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
$$(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,\
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 \
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_subtotaldescriptorbaseobj))
# vim: set noet sw=4 ts=4:
sc/Module_sc.mk
+1
View File
@@ -128,6 +128,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_cellcursorobj \
CppunitTest_sc_tabviewobj \
CppunitTest_sc_arealinkobj \
CppunitTest_sc_subtotaldescriptorbaseobj \
CppunitTest_sc_datapilotitemobj \
CppunitTest_sc_subtotalfieldobj \
CppunitTest_sc_arealinksobj \
sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
+114
View File
@@ -0,0 +1,114 @@
/* -*- 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/xsubtotaldescriptor.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/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 ScSubTotalDescriptorBaseObj : public CalcUnoApiTest, public apitest::XSubTotalDescriptor
{
public:
ScSubTotalDescriptorBaseObj();
virtual uno::Reference< uno::XInterface > init() override;
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBaseObj);
// XSubTotalDescriptor
CPPUNIT_TEST(testAddNew);
CPPUNIT_TEST(testClear);
CPPUNIT_TEST_SUITE_END();
private:
static sal_Int32 nTest;
static uno::Reference< lang::XComponent > mxComponent;
};
sal_Int32 ScSubTotalDescriptorBaseObj::nTest = 0;
uno::Reference< lang::XComponent > ScSubTotalDescriptorBaseObj::mxComponent;
ScSubTotalDescriptorBaseObj::ScSubTotalDescriptorBaseObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
uno::Reference< uno::XInterface > ScSubTotalDescriptorBaseObj::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 > 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()
{
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp();
}
void ScSubTotalDescriptorBaseObj::tearDown()
{
if (nTest == NUMBER_OF_TESTS)
{
closeDocument(mxComponent);
mxComponent.clear();
}
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: */
test/Library_subsequenttest.mk
+1
View File
@@ -77,6 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xviewpane \
test/source/sheet/xviewfreezable \
test/source/sheet/xviewsplitable \
test/source/sheet/xsubtotaldescriptor \
test/source/text/xtext \
test/source/text/xtextfield \
test/source/text/xtextcontent \
test/source/sheet/xsubtotaldescriptor.cxx
+47
View File
@@ -0,0 +1,47 @@
/* -*- 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/xsubtotaldescriptor.hxx>
#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/sheet/SubTotalColumn.hpp>
#include <com/sun/star/sheet/XSubTotalDescriptor.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;
namespace apitest {
void XSubTotalDescriptor::testAddNew()
{
uno::Reference< sheet::XSubTotalDescriptor > xSTD(init(), uno::UNO_QUERY_THROW);
uno::Sequence< sheet::SubTotalColumn > xCols;
xCols.realloc(1);
xCols[0].Column = 5;
xCols[0].Function = sheet::GeneralFunction_SUM;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to add column", xSTD->addNew(xCols, 1));
}
void XSubTotalDescriptor::testClear()
{
uno::Reference< sheet::XSubTotalDescriptor > xSTD(init(), UNO_QUERY_THROW);
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to clear XSubTotalDescriptor", xSTD->clear());
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */