mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#45904 Move XEnumeration Java tests to C++

Browse Source 
Move XEnumeration Java tests to C++
for ScIndexEnumeration_DatabaseRangesEnumeration.

Change-Id: I33fac410b4b05f88dad45f859ae466fabb8303fc
Reviewed-on: https://gerrit.libreoffice.org/63592
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
This commit is contained in:
Jens Carl
2018-11-19 18:41:14 +00:00
parent e3e8d52625
commit 4e467724fc
8 changed files with 133 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/qa/complex/api_internal/api.lst
View File

@@ -94,7 +94,6 @@ job96=sc.ScFilterDescriptorBase
job97=sc.ScFunctionListObj job97=sc.ScFunctionListObj
job98=sc.ScHeaderFieldObj job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj job99=sc.ScHeaderFieldsObj
job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration
job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration

1
qadevOOo/Jar_OOoRunner.mk
View File

@@ -992,7 +992,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \ qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration \

2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DatabaseRangesEnumeration.csv
View File

@@ -1,2 +0,0 @@
"ScIndexEnumeration_DatabaseRangesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
"ScIndexEnumeration_DatabaseRangesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
1 ScIndexEnumeration_DatabaseRangesEnumeration com::sun::star::container::XEnumeration hasMoreElements()
2 ScIndexEnumeration_DatabaseRangesEnumeration com::sun::star::container::XEnumeration nextElement()

101
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
View File

@@ -1,101 +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.beans.XPropertySet;
import com.sun.star.container.XEnumerationAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XDatabaseRanges;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.table.CellRangeAddress;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Exception;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase {
private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
*/
@Override
protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
log.println( "creating a Spreadsheet document" );
xSheetDoc = SOF.createCalcDoc(null);
}
/**
* Disposes Spreadsheet document.
*/
@Override
protected void cleanup( TestParameters tParam, PrintWriter log ) {
log.println( " disposing xSheetDoc " );
XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ;
util.DesktopTools.closeDoc(oComp);
}
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
XInterface oObj = null;
// creation of testobject here
// first we write what we are intend to do to log file
log.println( "Creating a test environment" );
log.println("Getting test object ") ;
XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
XDatabaseRanges dbRanges = (XDatabaseRanges) AnyConverter.toObject(
new Type(XDatabaseRanges.class),
docProps.getPropertyValue("DatabaseRanges"));
log.println("Adding at least one element for ElementAccess interface");
CellRangeAddress aRange = new CellRangeAddress((short)0, 2, 4, 5, 6);
if (!dbRanges.hasByName("dbRange")) {
dbRanges.addNewByName("dbRange", aRange);
}
oObj = dbRanges;
XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj);
oObj = ea.createEnumeration();
log.println("ImplementationName: "+util.utils.getImplName(oObj));
// creating test environment
TestEnvironment tEnv = new TestEnvironment( oObj );
tEnv.addObjRelation("ENUM",ea);
return tEnv;
}
}

43
sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk Normal file
View File

@@ -0,0 +1,43 @@
# -*- 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_indexenumeration_databaserangesenumeration))
$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_databaserangesenumeration,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_databaserangesenumeration, \
sc/qa/extras/scindexenumeration_databaserangesenumeration \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_databaserangesenumeration, \
cppu \
sal \
subsequenttest \
test \
unotest \
))
$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_databaserangesenumeration,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_databaserangesenumeration))
$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_databaserangesenumeration))
$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_databaserangesenumeration))
$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_databaserangesenumeration,\
$(sc_unoapi_common_components) \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_databaserangesenumeration))
# vim: set noet sw=4 ts=4:

1
sc/Module_sc.mk
View File

@@ -136,6 +136,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_headerfootercontentobj \ CppunitTest_sc_headerfootercontentobj \
CppunitTest_sc_indexenumeration_cellannotationsenumeration \ CppunitTest_sc_indexenumeration_cellannotationsenumeration \
CppunitTest_sc_indexenumeration_cellarealinksenumeration \ CppunitTest_sc_indexenumeration_cellarealinksenumeration \
CppunitTest_sc_indexenumeration_databaserangesenumeration \
CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \ CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \
CppunitTest_sc_indexenumeration_datapilottablesenumeration \ CppunitTest_sc_indexenumeration_datapilottablesenumeration \
CppunitTest_sc_indexenumeration_ddelinksenumeration \ CppunitTest_sc_indexenumeration_ddelinksenumeration \

89
sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx Normal file
View File

@@ -0,0 +1,89 @@
/* -*- 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/container/xenumeration.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
class ScIndexEnumeration_DatabaseRangesEnumeration : public CalcUnoApiTest,
public apitest::XEnumeration
{
public:
ScIndexEnumeration_DatabaseRangesEnumeration();
virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScIndexEnumeration_DatabaseRangesEnumeration);
// XEnumeration
CPPUNIT_TEST(testHasMoreElements);
CPPUNIT_TEST(testNextElement);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<lang::XComponent> m_xComponent;
};
ScIndexEnumeration_DatabaseRangesEnumeration::ScIndexEnumeration_DatabaseRangesEnumeration()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
uno::Reference<uno::XInterface> ScIndexEnumeration_DatabaseRangesEnumeration::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XDatabaseRanges> xDR;
CPPUNIT_ASSERT(xPropertySet->getPropertyValue("DatabaseRanges") >>= xDR);
xDR->addNewByName("DatabaseRange", table::CellRangeAddress(0, 2, 4, 5, 6));
uno::Reference<container::XEnumerationAccess> xEA(xDR, uno::UNO_QUERY_THROW);
return xEA->createEnumeration();
}
void ScIndexEnumeration_DatabaseRangesEnumeration::setUp()
{
CalcUnoApiTest::setUp();
m_xComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
void ScIndexEnumeration_DatabaseRangesEnumeration::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DatabaseRangesEnumeration);
} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

1
sc/qa/unoapi/sc_5.sce
View File

@@ -16,7 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
-o sc.ScIndexEnumeration_DataPilotItemsEnumeration -o sc.ScIndexEnumeration_DataPilotItemsEnumeration
-o sc.ScIndexEnumeration_DatabaseRangesEnumeration
-o sc.ScIndexEnumeration_FunctionDescriptionEnumeration -o sc.ScIndexEnumeration_FunctionDescriptionEnumeration
-o sc.ScIndexEnumeration_SheetCellRangesEnumeration -o sc.ScIndexEnumeration_SheetCellRangesEnumeration
-o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration -o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration