tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScTableConditionalFormat.
Change-Id: Ib2575920e05d56feed68c6f4c15b485ab7993600
Reviewed-on: https://gerrit.libreoffice.org/66488
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 63e1236..28698eb 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -93,7 +93,6 @@
job132=sc.ScStyleObj
job134=sc.ScTableColumnObj
job135=sc.ScTableColumnsObj
job137=sc.ScTableConditionalFormat
job138=sc.ScTableRowObj
job139=sc.ScTableValidationObj
job140=sc.XMLContentExporter
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 30d9932..e657d66 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -995,7 +995,6 @@
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \
qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
qadevOOo/tests/java/mod/_sc/ScTableColumnsObj \
qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat \
qadevOOo/tests/java/mod/_sc/ScTableRowObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv
deleted file mode 100644
index 3c950b8..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScTableConditionalFormat";"com::sun::star::container::XElementAccess";"getElementType()"
"ScTableConditionalFormat";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
deleted file mode 100644
index 0e579af..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
+++ /dev/null
@@ -1,167 +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.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XIndexAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.ConditionOperator;
import com.sun.star.sheet.XSheetConditionalEntries;
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.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
/**
* Test for object which is represented by service
* <code>com.sun.star.sheet.TableConditionalFormat</code>. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XNameAccess</code></li>
* <li> <code>com::sun::star::container::XIndexAccess</code></li>
* <li> <code>com::sun::star::sheet::XSheetConditionalEntries</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* </ul>
* @see com.sun.star.sheet.TableConditionalFormat
* @see com.sun.star.container.XNameAccess
* @see com.sun.star.container.XIndexAccess
* @see com.sun.star.sheet.XSheetConditionalEntries
* @see com.sun.star.container.XElementAccess
* @see ifc.container._XNameAccess
* @see ifc.container._XIndexAccess
* @see ifc.sheet._XSheetConditionalEntries
* @see ifc.container._XElementAccess
*/
public class ScTableConditionalFormat extends TestCase {
private XSpreadsheetDocument xSpreadsheetDoc = 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" );
xSpreadsheetDoc = SOF.createCalcDoc(null);
}
/**
* Disposes Spreadsheet document.
*/
@Override
protected void cleanup( TestParameters tParam, PrintWriter log ) {
log.println( " disposing xSheetDoc " );
XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ;
util.DesktopTools.closeDoc(oComp);
}
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Retrieves a collection of spreadsheets from the document and takes one of
* them. Fills some cells of the spreadsheet. Retrieves value of the property
* <code>'ConditionalFormat'</code> that is the collection of the conditions
* of a conditional format. Adds new two conditional entries to the
* collection using the interface <code>XSheetConditionalEntries</code>.
* The retrieved collection is the instance of the service
* <code>com.sun.star.sheet.TableConditionalFormat</code>.
* @see com.sun.star.sheet.TableConditionalFormat
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
XInterface oObj = null;
log.println("getting sheets");
XSpreadsheets xSpreadsheets = xSpreadsheetDoc.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");
try {
oSheet.getCellByPosition(5, 5).setValue(15);
oSheet.getCellByPosition(1, 4).setValue(10);
oSheet.getCellByPosition(2, 0).setValue(-5.15);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
log.println("Exception occurred while filling cells");
e.printStackTrace(log);
}
XPropertySet Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet);
oObj = (XInterface) AnyConverter.toObject(
new Type(XInterface.class),
Props.getPropertyValue("ConditionalFormat"));
XSheetConditionalEntries xSCE = UnoRuntime.queryInterface(XSheetConditionalEntries.class, oObj);
xSCE.addNew(Conditions(5));
xSCE.addNew(Conditions(2));
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oObj);
return tEnv;
} // finish method getTestEnvironment
/**
* Returns the array of the property values that was filled by condition
* values.
*/
public PropertyValue[] Conditions(int nr) {
PropertyValue[] con = new PropertyValue[5];
CellAddress ca = new CellAddress();
ca.Column = 1;
ca.Row = 5;
ca.Sheet = 0;
con[0] = new PropertyValue();
con[0].Name = "StyleName";
con[0].Value = "Result2";
con[1] = new PropertyValue();
con[1].Name = "Formula1";
con[1].Value = "$Sheet1.$B$"+nr;
con[2] = new PropertyValue();
con[2].Name = "Formula2";
con[2].Value = "";
con[3] = new PropertyValue();
con[3].Name = "Operator";
con[3].Value = ConditionOperator.EQUAL;
con[4] = new PropertyValue();
con[4].Name = "SourcePosition";
con[4].Value = ca;
return con;
}
} // finish class ScTableConditionalFormat
diff --git a/sc/qa/extras/sctableconditionalformat.cxx b/sc/qa/extras/sctableconditionalformat.cxx
index 5209dd5..094f883 100644
--- a/sc/qa/extras/sctableconditionalformat.cxx
+++ b/sc/qa/extras/sctableconditionalformat.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/container/xnameaccess.hxx>
@@ -31,6 +32,8 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <cppu/unotype.hxx>
using namespace css;
using namespace css::uno;
using namespace com::sun::star;
@@ -38,6 +41,7 @@
namespace sc_apitest
{
class ScTableConditionalFormat : public CalcUnoApiTest,
public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XNameAccess,
@@ -53,6 +57,10 @@
CPPUNIT_TEST_SUITE(ScTableConditionalFormat);
// XElementAccess
CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements);
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -78,6 +86,7 @@
ScTableConditionalFormat::ScTableConditionalFormat()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<sheet::XSheetConditionalEntry>::get())
, XIndexAccess(2)
, XNameAccess("Entry1")
{
diff --git a/sc/qa/unoapi/sc_7.sce b/sc/qa/unoapi/sc_7.sce
index 37ade7c..c394803 100644
--- a/sc/qa/unoapi/sc_7.sce
+++ b/sc/qa/unoapi/sc_7.sce
@@ -20,7 +20,6 @@
# # i84656 -o sc.ScTabViewObj
# -o sc.ScTableColumnObj
-o sc.ScTableColumnsObj
-o sc.ScTableConditionalFormat
# -o sc.ScTableRowObj
# -o sc.ScTableSheetObj
# -o sc.ScTableSheetsObj
