tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_DataPilotTablesEnumeration.
Change-Id: I6f5f8439b50cdf313b00f9dd69b780d654b5cdb4
Reviewed-on: https://gerrit.libreoffice.org/63507
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 ef30cc2..eaf4247 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -97,7 +97,6 @@
job101=sc.ScIndexEnumeration_CellAnnotationsEnumeration
job102=sc.ScIndexEnumeration_CellAreaLinksEnumeration
job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
job105=sc.ScIndexEnumeration_DataPilotTablesEnumeration
job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
job108=sc.ScIndexEnumeration_LabelRangesEnumeration
job109=sc.ScIndexEnumeration_NamedRangesEnumeration
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index b8dab8f..4f33139c 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -996,7 +996,6 @@
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotTablesEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotTablesEnumeration.csv
deleted file mode 100644
index 756fb96..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotTablesEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScIndexEnumeration_DataPilotTablesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
"ScIndexEnumeration_DataPilotTablesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
deleted file mode 100644
index e2472db..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.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.lang.XComponent;
import com.sun.star.sheet.XDataPilotDescriptor;
import com.sun.star.sheet.XDataPilotTables;
import com.sun.star.sheet.XDataPilotTablesSupplier;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.sheet.XSpreadsheets;
import com.sun.star.table.CellAddress;
import com.sun.star.table.CellRangeAddress;
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_DataPilotTablesEnumeration 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" );
// create testobject here
log.println("getting sheets");
XSpreadsheets xSpreadsheets = xSheetDoc.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));
log.println("Filing a table");
for (int i = 1; i < 4; i++) {
oSheet.getCellByPosition(i, 0).setFormula("Col" + i);
oSheet.getCellByPosition(0, i).setFormula("Row" + i);
}
for (int i = 1; i < 4; i++)
for (int j = 1; j < 4; j++) {
oSheet.getCellByPosition(i, j).setValue(i * (j + 1));
}
XDataPilotTablesSupplier DPTS = UnoRuntime.queryInterface(XDataPilotTablesSupplier.class, oSheet);
log.println("Getting test object ") ;
XDataPilotTables DPT = DPTS.getDataPilotTables();
XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
DPDsc.setSourceRange(new CellRangeAddress((short)0, 0, 0, 4, 4));
DPT.insertNewByName(
"DataPilotTable",
new CellAddress((short)0, 5, 5),
DPDsc );
oObj = DPT;
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_datapilottablesenumeration.mk b/sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk
new file mode 100644
index 0000000..ae23e70
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.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_datapilottablesenumeration))
$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_datapilottablesenumeration,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_datapilottablesenumeration, \
sc/qa/extras/scindexenumeration_datapilottablesenumeration \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_datapilottablesenumeration, \
cppu \
sal \
subsequenttest \
test \
unotest \
))
$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_datapilottablesenumeration,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_datapilottablesenumeration))
$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_datapilottablesenumeration))
$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_datapilottablesenumeration))
$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_datapilottablesenumeration,\
$(sc_unoapi_common_components) \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_datapilottablesenumeration))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 5727282..4feef0c 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -135,6 +135,7 @@
CppunitTest_sc_functionlistobj \
CppunitTest_sc_headerfootercontentobj \
CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \
CppunitTest_sc_indexenumeration_datapilottablesenumeration \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
CppunitTest_sc_indexenumeration_scenariosenumeration \
CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \
diff --git a/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx
new file mode 100644
index 0000000..2aac0ef
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx
@@ -0,0 +1,112 @@
/* -*- 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/lang/XComponent.hpp>
#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
#include <com/sun/star/sheet/XDataPilotTables.hpp>
#include <com/sun/star/sheet/XDataPilotTablesSupplier.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/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/string.hxx>
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
class ScIndexEnumeration_DataPilotTablesEnumeration : public CalcUnoApiTest,
public apitest::XEnumeration
{
public:
ScIndexEnumeration_DataPilotTablesEnumeration();
virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScIndexEnumeration_DataPilotTablesEnumeration);
// XEnumeration
CPPUNIT_TEST(testHasMoreElements);
CPPUNIT_TEST(testNextElement);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<lang::XComponent> m_xComponent;
};
ScIndexEnumeration_DataPilotTablesEnumeration::ScIndexEnumeration_DataPilotTablesEnumeration()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotTablesEnumeration::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);
for (auto i = 1; i < 4; ++i)
{
xSheet0->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
xSheet0->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
}
for (auto x = 1; x < 4; ++x)
for (auto y = 1; y < 4; ++y)
xSheet0->getCellByPosition(x, y)->setValue(x * (y + 1));
uno::Reference<sheet::XDataPilotTablesSupplier> xDPTS(xSheet0, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XDataPilotTables> xDPT(xDPTS->getDataPilotTables(), uno::UNO_QUERY_THROW);
uno::Reference<sheet::XDataPilotDescriptor> xDPD(xDPT->createDataPilotDescriptor(),
uno::UNO_QUERY_THROW);
xDPD->setSourceRange(table::CellRangeAddress(0, 0, 0, 4, 4));
xDPT->insertNewByName("DataPilotTable", table::CellAddress(0, 5, 5), xDPD);
uno::Reference<container::XEnumerationAccess> xEA(xDPT, uno::UNO_QUERY_THROW);
return xEA->createEnumeration();
}
void ScIndexEnumeration_DataPilotTablesEnumeration::setUp()
{
CalcUnoApiTest::setUp();
m_xComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
void ScIndexEnumeration_DataPilotTablesEnumeration::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DataPilotTablesEnumeration);
} // 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 34bc565..96c98b8 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_DataPilotTablesEnumeration
-o sc.ScIndexEnumeration_DatabaseRangesEnumeration
-o sc.ScIndexEnumeration_FunctionDescriptionEnumeration
-o sc.ScIndexEnumeration_LabelRangesEnumeration
