tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScDataPilotFieldObj.
Change-Id: I9fa5d153cced1aae8892d2422025dfcdcda73c69
Reviewed-on: https://gerrit.libreoffice.org/68782
Tested-by: Jenkins
Reviewed-by: Jens Carl <[email protected]>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index d31c465..2340ff4 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -77,7 +77,6 @@ job80=sc.ScAutoFormatsObj
job81=sc.ScCellFieldObj
job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
job90=sc.ScDataPilotFieldObj
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
job126=sc.ScSheetLinkObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9a2f095..2e025ea 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -964,7 +964,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScChartsObj \
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
qadevOOo/tests/java/mod/_sc/ScDrawPageObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
deleted file mode 100644
index 17d800d..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
+++ /dev/null
@@ -1,7 +0,0 @@
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
deleted file mode 100644
index 043e879..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
+++ /dev/null
@@ -1,314 +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 com.sun.star.beans.XPropertySet;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNamed;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.DataPilotFieldOrientation;
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;
import java.io.PrintWriter;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
import util.SOfficeFactory;
/**
* Test for object which is represented by service
* <code>com.sun.star.sheet.DataPilotField</code>. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XNamed</code></li>
* <li> <code>com::sun::star::sheet::DataPilotField</code></li>
* <li> <code>com::sun::star::beans::XPropertySet</code></li>
* </ul>
* @see com.sun.star.sheet.DataPilotField
* @see com.sun.star.container.XNamed
* @see com.sun.star.sheet.DataPilotField
* @see com.sun.star.beans.XPropertySet
* @see ifc.container._XNamed
* @see ifc.sheet._DataPilotField
* @see ifc.beans._XPropertySet
*/
public class ScDataPilotFieldObj extends TestCase {
private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
* field in x and y direction.
*/
private static final int mMaxFieldIndex = 6;
/**
* 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.
* Retrieves a collection of spreadsheets from a document
* and takes one of them. Fills some table in the spreadsheet.
* Obtains the collection of data pilot tables using the interface
* <code>XDataPilotTablesSupplier</code>. Creates a data pilot descriptor
* for the filled table and inserts new data pilot table with this descriptor
* to the collection. Obtains the collection of all the data pilot fields
* using the interface <code>XDataPilotDescriptor</code>. Retrieves from
* the collection the data pilot field with index 0. This data pilot field
* is the instance of the service <code>com.sun.star.sheet.DataPilotField</code>.
* @see com.sun.star.sheet.DataPilotField
* @see com.sun.star.sheet.XDataPilotTablesSupplier
* @see com.sun.star.sheet.XDataPilotDescriptor
*/
@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");
// the cell range
CellRangeAddress sCellRangeAdress = new CellRangeAddress();
sCellRangeAdress.Sheet = 0;
sCellRangeAdress.StartColumn = 1;
sCellRangeAdress.StartRow = 0;
sCellRangeAdress.EndColumn = mMaxFieldIndex - 1;
sCellRangeAdress.EndRow = mMaxFieldIndex - 1;
// position of the data pilot table
CellAddress sCellAdress = new CellAddress();
sCellAdress.Sheet = 0;
sCellAdress.Column = 7;
sCellAdress.Row = 8;
log.println("Getting a sheet");
XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
XSpreadsheet oSheet = null;
XSpreadsheet oSheet2 = null;
XIndexAccess oIndexAccess = UnoRuntime.queryInterface(
XIndexAccess.class, xSpreadsheets);
// Make sure there are at least two sheets
xSpreadsheets.insertNewByName("Some Sheet", (short) 0);
oSheet = (XSpreadsheet) AnyConverter.toObject(new Type(
XSpreadsheet.class), oIndexAccess.getByIndex(0));
oSheet2 = (XSpreadsheet) AnyConverter.toObject(new Type(
XSpreadsheet.class), oIndexAccess.getByIndex(1));
log.println("Filling a table");
for (int i = 1; i < mMaxFieldIndex; i++) {
oSheet.getCellByPosition(i, 0).setFormula("Col" + i);
oSheet.getCellByPosition(0, i).setFormula("Row" + i);
oSheet2.getCellByPosition(i, 0).setFormula("Col" + i);
oSheet2.getCellByPosition(0, i).setFormula("Row" + i);
}
for (int i = 1; i < mMaxFieldIndex; i++)
for (int j = 1; j < mMaxFieldIndex; j++) {
oSheet.getCellByPosition(i, j).setValue(i * (j + 1));
oSheet2.getCellByPosition(i, j).setValue(i * (j + 2));
}
oSheet.getCellByPosition(1, 5);
int x = sCellAdress.Column;
int y = sCellAdress.Row + 3;
oSheet.getCellByPosition(x, y);
// create the test objects
log.println("Getting test objects");
XDataPilotTablesSupplier DPTS = UnoRuntime.queryInterface(
XDataPilotTablesSupplier.class, oSheet);
XDataPilotTables DPT = DPTS.getDataPilotTables();
XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
DPDsc.setSourceRange(sCellRangeAdress);
XPropertySet fieldPropSet = null;
Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0);
fieldPropSet = UnoRuntime.queryInterface(XPropertySet.class,
oDataPilotField);
fieldPropSet.setPropertyValue("Function",
com.sun.star.sheet.GeneralFunction.SUM);
fieldPropSet.setPropertyValue("Orientation",
com.sun.star.sheet.DataPilotFieldOrientation.DATA);
log.println("Insert the DataPilotTable");
if (DPT.hasByName("DataPilotTable")) {
DPT.removeByName("DataPilotTable");
}
XIndexAccess IA = DPDsc.getDataPilotFields();
getSRange(IA);
DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
oObj = (XInterface) AnyConverter.toObject(new Type(XInterface.class),
IA.getByIndex(0));
log.println("Creating object - " + ((oObj == null) ? "FAILED" : "OK"));
TestEnvironment tEnv = new TestEnvironment(oObj);
log.println("Implementationname: " + util.utils.getImplName(oObj));
// Other parameters required for interface tests
return tEnv;
}
private void getSRange(XIndexAccess IA) {
int fieldsAmount = IA.getCount() + 1;
String[] fieldsNames = new String[fieldsAmount];
int i = -1;
int cnt = 0;
while ((++i) < fieldsAmount) {
Object field;
try {
field = IA.getByIndex(i);
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
return;
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
e.printStackTrace(log);
return;
}
XNamed named = UnoRuntime.queryInterface(XNamed.class,
field);
String name = named.getName();
log.println("**Field : '" + name + "' ... ");
if (!name.equals("Data")) {
fieldsNames[cnt] = name;
XPropertySet props = UnoRuntime.queryInterface(
XPropertySet.class, field);
try {
switch (cnt % 5) {
case 0:
props.setPropertyValue("Orientation",
DataPilotFieldOrientation.COLUMN);
log.println(" Column");
break;
case 1:
props.setPropertyValue("Orientation",
DataPilotFieldOrientation.ROW);
log.println(" Row");
break;
case 2:
props.setPropertyValue("Orientation",
DataPilotFieldOrientation.DATA);
log.println(" Data");
break;
case 3:
props.setPropertyValue("Orientation",
DataPilotFieldOrientation.HIDDEN);
log.println(" Hidden");
break;
case 4:
props.setPropertyValue("Orientation",
DataPilotFieldOrientation.PAGE);
log.println(" Page");
break;
}
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
return;
} catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
return;
} catch (com.sun.star.beans.PropertyVetoException e) {
e.printStackTrace(log);
return;
} catch (com.sun.star.beans.UnknownPropertyException e) {
e.printStackTrace(log);
return;
}
if ((++cnt) > 4) {
break;
}
} else {
return;
}
}
}
}
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index 46cd9a7..cf46161 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
#include <test/beans/xpropertyset.hxx>
#include <test/container/xnamed.hxx>
#include <test/sheet/datapilotfield.hxx>
#include <test/sheet/xdatapilotfield.hxx>
@@ -31,7 +32,8 @@ class ScDataPilotFieldObj : public CalcUnoApiTest,
public apitest::DataPilotField,
public apitest::XDataPilotField,
public apitest::XDataPilotFieldGrouping,
public apitest::XNamed
public apitest::XNamed,
public apitest::XPropertySet
{
public:
virtual void setUp() override;
@@ -61,6 +63,13 @@ public:
CPPUNIT_TEST(testGetName);
CPPUNIT_TEST(testSetName);
// XPropertySet
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
CPPUNIT_TEST(testSetPropertyValue);
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
CPPUNIT_TEST_SUITE_END();
private:
@@ -70,6 +79,8 @@ private:
ScDataPilotFieldObj::ScDataPilotFieldObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XNamed("Col1")
, XPropertySet({ "Function", "HasAutoShowInfo", "HasLayoutInfo", "HasSortInfo", "Subtotals",
"Subtotals2" })
{
}
diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
index 9f19138..90d19b5 100644
--- a/sc/qa/unoapi/sc_1.sce
+++ b/sc/qa/unoapi/sc_1.sce
@@ -16,7 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-o sc.ScDataPilotFieldGroupObj
-o sc.ScDataPilotFieldObj
# i84653 -o sc.ScPageObj
# i84554 -o sc.AccessibleEditableTextPara_PreviewNote
# i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
