tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScAnnotationsObj.
Change-Id: Ife8c2d51a3aae409fa008c5ad2515a8976481771
Reviewed-on: https://gerrit.libreoffice.org/64407
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 fd5f7f2..b47dad57 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -72,7 +72,6 @@
job73=sc.ScAccessiblePreviewTable
job74=sc.ScAccessibleSpreadsheet
job75=sc.ScAnnotationObj
job76=sc.ScAnnotationsObj
job78=sc.ScAutoFormatFieldObj
job79=sc.ScAutoFormatObj
job80=sc.ScAutoFormatsObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 575f7fa..2c5673c 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -952,7 +952,6 @@
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet \
qadevOOo/tests/java/mod/_sc/ScAnnotationObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationsObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \
qadevOOo/tests/java/mod/_sc/ScAreaLinkObj \
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
deleted file mode 100644
index a6e62ec..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
deleted file mode 100644
index 24d9756..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
+++ /dev/null
@@ -1,132 +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.XNameAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XSheetAnnotation;
import com.sun.star.sheet.XSheetAnnotationAnchor;
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.table.XCell;
import com.sun.star.table.XCellRange;
import com.sun.star.text.XSimpleText;
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 which represents a collection of annotations
* for a spreadsheet document (implements
* <code>com.sun.star.sheet.CellAnnotations</code>). <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XIndexAccess</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* <li> <code>com::sun::star::sheet::XSheetAnnotations</code></li>
* </ul> <p>
* This object test <b> is NOT </b> designed to be run in several
* threads concurrently.
* @see com.sun.star.sheet.CellAnnotations
* @see com.sun.star.container.XIndexAccess
* @see com.sun.star.container.XElementAccess
* @see com.sun.star.sheet.XSheetAnnotations
* @see ifc.container._XIndexAccess
* @see ifc.container._XElementAccess
* @see ifc.sheet._XSheetAnnotations
*/
public class ScAnnotationsObj 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.
* From a document collection of spreadsheets a single one is
* retrieved and one annotation is added to it. Then a collection
* of annotations is retrieved using spreadsheet's
* <code>com.sun.star.sheet.XSheetAnnotationsSupplier</code> interface.
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
// 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 ") ;
XSpreadsheetDocument xSpreadsheetDoc = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xSheetDoc);
XSpreadsheets sheets = xSpreadsheetDoc.getSheets();
XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, sheets );
XCell oCell = null;
XSpreadsheet oSheet = null;
oSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),
oNames.getByName(oNames.getElementNames()[0]));
// adding an annotation...
XCellRange oCRange = UnoRuntime.queryInterface(XCellRange.class, oSheet);
oCell = oCRange.getCellByPosition(10,10);
XSheetAnnotationAnchor oAnnoA = UnoRuntime.queryInterface(XSheetAnnotationAnchor.class, oCell);
XSheetAnnotation oAnno = oAnnoA.getAnnotation();
XSimpleText sText = UnoRuntime.queryInterface(XSimpleText.class, oAnno);
sText.setString("ScAnnotationsObj");
XSheetAnnotationsSupplier supp = UnoRuntime.queryInterface(
XSheetAnnotationsSupplier.class, oSheet);
XInterface oObj = supp.getAnnotations();
TestEnvironment tEnv = new TestEnvironment( oObj );
return tEnv;
}
} // finish class ScAnnotationsObj
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index 5c358e2..a10da1c 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -8,25 +8,31 @@
*/
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/sheet/xsheetannotations.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSheetAnnotation.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/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <cppu/unotype.hxx>
using namespace css;
using namespace css::uno;
namespace sc_apitest {
class ScAnnontationsObj : public CalcUnoApiTest, public apitest::XEnumerationAccess,
class ScAnnontationsObj : public CalcUnoApiTest, public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XSheetAnnotations
{
@@ -41,6 +47,10 @@
CPPUNIT_TEST_SUITE(ScAnnontationsObj);
// XElementAccess
CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements);
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -64,6 +74,7 @@
ScAnnontationsObj::ScAnnontationsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<sheet::XSheetAnnotation>::get())
, XIndexAccess(1)
{
}
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
index 17cba11..b45313e 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -23,7 +23,6 @@
# FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
# -o sc.ScAnnotationObj
# -o sc.ScAnnotationShapeObj
-o sc.ScAnnotationsObj
-o sc.ScAreaLinkObj
-o sc.ScAutoFormatFieldObj
-o sc.ScAutoFormatObj
