tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_CellAnnotationsEnumeration.
Change-Id: I06ad265c09fa4c29e056527c79c0470634abaabc
Reviewed-on: https://gerrit.libreoffice.org/63549
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 0b7eb03..a5bf424 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
job101=sc.ScIndexEnumeration_CellAnnotationsEnumeration
job102=sc.ScIndexEnumeration_CellAreaLinksEnumeration
job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
diff --git a/framework/qa/complex/api_internal/tests.sce b/framework/qa/complex/api_internal/tests.sce
index 8458f33..adc5db8 100644
--- a/framework/qa/complex/api_internal/tests.sce
+++ b/framework/qa/complex/api_internal/tests.sce
@@ -1,3 +1,2 @@
job1=cfgmgr2.AdministrationProvider
job2=sc.ScIndexEnumeration_CellAnnotationsEnumeration
job3=sw.SwXBodyText
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4820e4b..7649da8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -992,7 +992,6 @@
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_CellAnnotationsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_CellAnnotationsEnumeration.csv
deleted file mode 100644
index f686969..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_CellAnnotationsEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScIndexEnumeration_CellAnnotationsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
"ScIndexEnumeration_CellAnnotationsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
deleted file mode 100644
index e47b1a5..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
+++ /dev/null
@@ -1,102 +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.XSheetAnnotations;
import com.sun.star.sheet.XSheetAnnotationsSupplier;
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_CellAnnotationsEnumeration 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;
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("filling some cells");
oSheet.getCellByPosition(5, 5).setValue(15);
oSheet.getCellByPosition(1, 4).setValue(10);
oSheet.getCellByPosition(2, 0).setValue(-5.15);
XSheetAnnotationsSupplier sas = UnoRuntime.queryInterface(XSheetAnnotationsSupplier.class, oSheet);
XSheetAnnotations anno = sas.getAnnotations();
XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class, anno);
oObj = ea.createEnumeration();
log.println("ImplementationName: "+util.utils.getImplName(oObj));
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oObj);
tEnv.addObjRelation("ENUM",ea);
return tEnv;
}
}
diff --git a/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk b/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk
new file mode 100644
index 0000000..6a688b8
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.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_cellannotationsenumeration))
$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_cellannotationsenumeration,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_cellannotationsenumeration, \
sc/qa/extras/scindexenumeration_cellannotationsenumeration \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_cellannotationsenumeration, \
cppu \
sal \
subsequenttest \
test \
unotest \
))
$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_cellannotationsenumeration,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_cellannotationsenumeration))
$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_cellannotationsenumeration))
$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_cellannotationsenumeration))
$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_cellannotationsenumeration,\
$(sc_unoapi_common_components) \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_cellannotationsenumeration))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index de14d4e..40ef48e 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -134,6 +134,7 @@
CppunitTest_sc_functiondescriptionobj \
CppunitTest_sc_functionlistobj \
CppunitTest_sc_headerfootercontentobj \
CppunitTest_sc_indexenumeration_cellannotationsenumeration \
CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \
CppunitTest_sc_indexenumeration_datapilottablesenumeration \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
diff --git a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
new file mode 100644
index 0000000..2f21f71
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
@@ -0,0 +1,97 @@
/* -*- 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/XEnumeration.hpp>
#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/XSheetAnnotations.hpp>
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.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/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
class ScIndexEnumeration_CellAnnotationsEnumeration : public CalcUnoApiTest,
public apitest::XEnumeration
{
public:
ScIndexEnumeration_CellAnnotationsEnumeration();
virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScIndexEnumeration_CellAnnotationsEnumeration);
// XEnumeration
CPPUNIT_TEST(testHasMoreElements);
CPPUNIT_TEST(testNextElement);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<lang::XComponent> m_xComponent;
};
ScIndexEnumeration_CellAnnotationsEnumeration::ScIndexEnumeration_CellAnnotationsEnumeration()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
uno::Reference<uno::XInterface> ScIndexEnumeration_CellAnnotationsEnumeration::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<sheet::XSheetAnnotationsSupplier> xSAS(xSheet0, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSheetAnnotations> xSA(xSAS->getAnnotations(), uno::UNO_QUERY_THROW);
xSA->insertNew(table::CellAddress(0, 5, 5), "Note");
uno::Reference<container::XEnumerationAccess> xEA(xSA, uno::UNO_QUERY_THROW);
uno::Reference<container::XEnumeration> xE(xEA->createEnumeration(), uno::UNO_QUERY_THROW);
return xEA->createEnumeration();
}
void ScIndexEnumeration_CellAnnotationsEnumeration::setUp()
{
CalcUnoApiTest::setUp();
m_xComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
void ScIndexEnumeration_CellAnnotationsEnumeration::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_CellAnnotationsEnumeration);
} // 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_4.sce b/sc/qa/unoapi/sc_4.sce
index 1d48651..c70d8ea 100644
--- a/sc/qa/unoapi/sc_4.sce
+++ b/sc/qa/unoapi/sc_4.sce
@@ -35,5 +35,4 @@
# already gone. If just this test is disabled, later tests of this object fail
# too, so this disables the whole interface.
# -o sc.ScHeaderFooterTextObj
-o sc.ScIndexEnumeration_CellAnnotationsEnumeration
-o sc.ScIndexEnumeration_CellAreaLinksEnumeration
