tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_SheetCellRangesEnumeration.
Change-Id: Ic3bc6f38244c4f476d29826accc397b4b6902f31
Reviewed-on: https://gerrit.libreoffice.org/63605
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 3e7a3e9..4d8c908 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -94,7 +94,6 @@
job97=sc.ScFunctionListObj
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration
job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration
job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3b4af41..83e10b5 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -993,7 +993,6 @@
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetCellRangesEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetCellRangesEnumeration.csv
deleted file mode 100644
index 6c2b357..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SheetCellRangesEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScIndexEnumeration_SheetCellRangesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
"ScIndexEnumeration_SheetCellRangesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
deleted file mode 100644
index c6e2ae5..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
+++ /dev/null
@@ -1,127 +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.XEnumerationAccess;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameContainer;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.sheet.XSpreadsheets;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase {
private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
*/
@Override
protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
// get a soffice factory object
SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
log.println( "creating a sheetdocument" );
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;
Object oRange = null ;
// creation of testobject here
// first we write what we are intend to do to log file
log.println( "Creating a test environment" );
// get a soffice factory object
SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
log.println("Getting test object ");
XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc);
oObj = (XInterface)
SOF.createInstance(oComp, "com.sun.star.sheet.SheetCellRanges");
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndSheets = UnoRuntime.queryInterface (XIndexAccess.class, oSheets);
XSpreadsheet oSheet = null;
oSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),oIndSheets.getByIndex(0));
XNameContainer oRanges = UnoRuntime.queryInterface(XNameContainer.class, oObj);
oRange = oSheet.getCellRangeByName("C1:D4");
oRanges.insertByName("Range1", oRange);
oRange = oSheet.getCellRangeByName("E2:F5");
oRanges.insertByName("Range2", oRange);
oRange = oSheet.getCellRangeByName("G2:H3");
oRanges.insertByName("Range3", oRange);
oRange = oSheet.getCellRangeByName("I7:J8");
oRanges.insertByName("Range4", oRange);
log.println("filling some cells");
for (int i = 0; i < 10; i++) {
for (int j = 0; j < 5; j++) {
oSheet.getCellByPosition(i, j).setFormula("a");
}
}
for (int i = 0; i < 10; i++) {
for (int j = 5; j < 10; j++) {
oSheet.getCellByPosition(i, j).setValue(i + j);
}
}
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 ;
}
}
diff --git a/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk b/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk
new file mode 100644
index 0000000..2b104d9
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk
@@ -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_sheetcellrangesenumeration))
$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_sheetcellrangesenumeration,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_sheetcellrangesenumeration, \
sc/qa/extras/scindexenumeration_sheetcellrangesenumeration \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_sheetcellrangesenumeration, \
cppu \
sal \
subsequenttest \
test \
unotest \
))
$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_sheetcellrangesenumeration,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_sheetcellrangesenumeration))
$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_sheetcellrangesenumeration))
$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_sheetcellrangesenumeration))
$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_sheetcellrangesenumeration,\
$(sc_unoapi_common_components) \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_sheetcellrangesenumeration))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3ab90123..7c94044 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -144,6 +144,7 @@
CppunitTest_sc_indexenumeration_labelrangesenumeration \
CppunitTest_sc_indexenumeration_namedrangesenumeration \
CppunitTest_sc_indexenumeration_scenariosenumeration \
CppunitTest_sc_indexenumeration_sheetcellrangesenumeration \
CppunitTest_sc_indexenumeration_sheetlinksenumeration \
CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \
CppunitTest_sc_indexenumeration_tablecolumnsenumeration \
diff --git a/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx
new file mode 100644
index 0000000..5080f50
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx
@@ -0,0 +1,122 @@
/* -*- 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/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sheet/XSheetCellRanges.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheets.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
class ScIndexEnumeration_SheetCellRangesEnumeration : public CalcUnoApiTest,
public apitest::XEnumeration
{
public:
ScIndexEnumeration_SheetCellRangesEnumeration();
virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScIndexEnumeration_SheetCellRangesEnumeration);
// XEnumeration
CPPUNIT_TEST(testHasMoreElements);
CPPUNIT_TEST(testNextElement);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<lang::XComponent> m_xComponent;
};
ScIndexEnumeration_SheetCellRangesEnumeration::ScIndexEnumeration_SheetCellRangesEnumeration()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
uno::Reference<uno::XInterface> ScIndexEnumeration_SheetCellRangesEnumeration::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCellRanges> xSCR(
xMSF->createInstance("com.sun.star.sheet.SheetCellRanges"), uno::UNO_QUERY_THROW);
uno::Reference<container::XNameContainer> xNC(xSCR, uno::UNO_QUERY_THROW);
uno::Any aRange;
aRange <<= xSheet0->getCellRangeByName("C1:D4");
xNC->insertByName("Range1", aRange);
aRange <<= xSheet0->getCellRangeByName("E2:F5");
xNC->insertByName("Range2", aRange);
aRange <<= xSheet0->getCellRangeByName("G2:H3");
xNC->insertByName("Range3", aRange);
aRange <<= xSheet0->getCellRangeByName("I7:J8");
xNC->insertByName("Range4", aRange);
for (auto x = 0; x < 10; ++x)
{
for (auto y = 0; y < 5; ++y)
{
xSheet0->getCellByPosition(x, y)->setFormula("a");
}
}
for (auto x = 0; x < 10; ++x)
{
for (auto y = 5; y < 10; ++y)
{
xSheet0->getCellByPosition(x, y)->setValue(x + y);
}
}
uno::Reference<container::XEnumerationAccess> xEA(xSCR, uno::UNO_QUERY_THROW);
return xEA->createEnumeration();
}
void ScIndexEnumeration_SheetCellRangesEnumeration::setUp()
{
CalcUnoApiTest::setUp();
m_xComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
void ScIndexEnumeration_SheetCellRangesEnumeration::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SheetCellRangesEnumeration);
} // 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/unoapi/sc_5.sce b/sc/qa/unoapi/sc_5.sce
index 9d20e4d..89860ad 100644
--- a/sc/qa/unoapi/sc_5.sce
+++ b/sc/qa/unoapi/sc_5.sce
@@ -16,7 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-o sc.ScIndexEnumeration_DataPilotItemsEnumeration
-o sc.ScIndexEnumeration_SheetCellRangesEnumeration
-o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
-o sc.ScIndexEnumeration_SpreadsheetsEnumeration
-o sc.ScIndexEnumeration_SubTotalFieldsEnumeration
