tdf#45904 Move XEnumerationAccess Java test to C++
Move XEnumerationAccess Java test to C++ for ScCellFieldsObj.
Change-Id: I09e7c6be401bb54e1314da95d6797790aedefbe1
Reviewed-on: https://gerrit.libreoffice.org/64795
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 167c230..9a0f6d9 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -76,7 +76,6 @@
job79=sc.ScAutoFormatObj
job80=sc.ScAutoFormatsObj
job81=sc.ScCellFieldObj
job82=sc.ScCellFieldsObj
job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
job89=sc.ScDatabaseRangesObj
diff --git a/framework/qa/complex/api_internal/worksforme.sce b/framework/qa/complex/api_internal/worksforme.sce
index c411bb3..e764cbd 100644
--- a/framework/qa/complex/api_internal/worksforme.sce
+++ b/framework/qa/complex/api_internal/worksforme.sce
@@ -18,7 +18,6 @@
job=cmdmail.SimpleCommandMail
job=fileacc.SimpleFileAccess
job=sc.ScCellFieldObj
job=sc.ScCellFieldsObj
job=sc.XMLImporter
job=sc.XMLMetaExporter
job=sd.SdDocLinkTargets
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index be961b4..ba1cd3c 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -959,7 +959,6 @@
qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj \
qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldsObj \
qadevOOo/tests/java/mod/_sc/ScCellObj \
qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv
deleted file mode 100644
index ea3a0c7..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldsObj.csv
+++ /dev/null
@@ -1 +0,0 @@
"ScCellFieldsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java
deleted file mode 100644
index 3445d08..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java
+++ /dev/null
@@ -1,129 +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.XIndexAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.sheet.XSpreadsheets;
import com.sun.star.table.XCell;
import com.sun.star.text.XText;
import com.sun.star.text.XTextContent;
import com.sun.star.text.XTextFieldsSupplier;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
/**
* Test for object that represents a collection of text fields
* in a cell of a spreadsheet. <p>
*
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XEnumerationAccess</code></li>
* <li> <code>com::sun::star::util::XRefreshable</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* </ul> <p>
*
* @see com.sun.star.container.XEnumerationAccess
* @see com.sun.star.util.XRefreshable
* @see com.sun.star.container.XElementAccess
* @see ifc.container._XEnumerationAccess
* @see ifc.util._XRefreshable
* @see ifc.container._XElementAccess
*/
public class ScCellFieldsObj 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);
}
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Creates an instance of the service
* <code>com.sun.star.text.TextField.URL</code>, inserts it to the content
* of the cell in the spreadsheet. Then the component is obtained
* by <code>XTextFieldsSupplier</code> interface of a cell.<p>
*/
@Override
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) throws Exception {
XInterface oObj = null;
XText oText = null;
XTextContent oContent = null;
XInterface aField = null;
// we want to create an instance of ScCellFieldObj.
// to do this we must get an MultiServiceFactory.
XMultiServiceFactory _oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xSheetDoc);
aField = (XInterface)
_oMSF.createInstance("com.sun.star.text.TextField.URL");
oContent = UnoRuntime.queryInterface(XTextContent.class, aField);
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets = UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
XCell oCell = oSheet.getCellByPosition(2,3);
oText = UnoRuntime.queryInterface(XText.class, oCell);
oText.insertTextContent(
oText.createTextCursor(), oContent, true);
XTextFieldsSupplier xTextFieldsSupp = UnoRuntime.queryInterface(XTextFieldsSupplier.class, oCell);
oObj = xTextFieldsSupp.getTextFields();
TestEnvironment tEnv = new TestEnvironment(oObj) ;
return tEnv;
}
}
diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx
index d9074ad..b015b96 100644
--- a/sc/qa/extras/sccellfieldsobj.cxx
+++ b/sc/qa/extras/sccellfieldsobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/util/xrefreshable.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -35,6 +36,7 @@
{
class ScCellFieldsObj : public CalcUnoApiTest,
public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XRefreshable
{
public:
@@ -50,6 +52,9 @@
CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements);
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
// XRefreshable
CPPUNIT_TEST(testAddRefreshListener);
CPPUNIT_TEST(testRefresh);
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
index f5828f2..43f203c 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -29,5 +29,4 @@
-o sc.ScAutoFormatsObj
-o sc.ScCellCursorObj
# ported to cppunit -o sc.ScCellFieldObj
-o sc.ScCellFieldsObj
-o sc.ScCellObj
