tdf#45904 Remove obsolete _XNamed tests
The _XNamed tests are already written in C++ since commit
1b973485e63717e875347f0ad33c8137f4bc05c7 for ScDataPilotTableObj.
Change-Id: I877b548678d40916b406ddffdd4f209bfe4c4a8e
Reviewed-on: https://gerrit.libreoffice.org/63314
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3991a15..bd528d0 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -982,7 +982,6 @@
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj \
qadevOOo/tests/java/mod/_sc/ScDDELinkObj \
qadevOOo/tests/java/mod/_sc/ScDDELinksObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv
deleted file mode 100644
index b946708..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScDataPilotTableObj";"com::sun::star::container::XNamed";"getName()"
"ScDataPilotTableObj";"com::sun::star::container::XNamed";"setName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
deleted file mode 100644
index ea82731..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
+++ /dev/null
@@ -1,277 +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.XPropertySet;
import com.sun.star.container.XIndexAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.TableFilterField;
import com.sun.star.sheet.XDataPilotDescriptor;
import com.sun.star.sheet.XDataPilotTables;
import com.sun.star.sheet.XDataPilotTablesSupplier;
import com.sun.star.sheet.XSheetFilterDescriptor;
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.Exception;
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.DataPilotTable</code>. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XNamed</code></li>
* <li> <code>com::sun::star::sheet::XDataPilotTable</code></li>
* <li> <code>com::sun::star::sheet::XDataPilotDescriptor</code></li>
* </ul>
* @see com.sun.star.sheet.DataPilotTable
* @see com.sun.star.container.XNamed
* @see com.sun.star.sheet.XDataPilotTable
* @see com.sun.star.sheet.XDataPilotDescriptor
* @see ifc.container._XNamed
* @see ifc.sheet._XDataPilotTable
* @see ifc.sheet._XDataPilotDescriptor
*/
public class ScDataPilotTableObj 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.
* 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. Obtains the collection of all the data pilot fields
* using the interface <code>XDataPilotDescriptor</code>. Sets field
* orientation for every of the data pilot fields. Sets the definitions of
* the filter fields for the created description. Inserts new data pilot
* table with this descriptor to the collection.
* This new data pilot table is the instance of the service
* <code>com.sun.star.sheet.DataPilotTable</code>.
* Object relations created :
* <ul>
* <li> <code>'OUTPUTRANGE'</code> for
* {@link ifc.sheet._XDataPilotTable}(the cell range address of the
* created data pilot table) </li>
* <li> <code>'FIELDSAMOUNT'</code> for
* {@link ifc.sheet._XDataPilotDescriptor}(the number of filled fields
* which descriptor was created for) </li>
* <li> <code>'CELLFORCHANGE'</code> for
* {@link ifc.sheet._XDataPilotTable}(value of this cell will be changed)</li>
* <li> <code>'CELLFORCHECK'</code> for
* {@link ifc.sheet._XDataPilotTable}(value of this cell must be changed
* after refresh call)</li>
* </ul>
* @see com.sun.star.sheet.DataPilotTable
* @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;
CellAddress sCellAddress = new CellAddress();
sCellAddress.Sheet = 0;
sCellAddress.Column = 7;
sCellAddress.Row = 8;
// 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 sheets");
XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
XSpreadsheet oSheet = null;
Object oChangeCell = null;
Object oCheckCell = null;
oSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
oChangeCell = oSheet.getCellByPosition(1, 5);
oCheckCell = oSheet.getCellByPosition(
sCellAddress.Column, sCellAddress.Row + 3);
log.println("Filing a table");
for (int i = 1; i < 6; i++) {
oSheet.getCellByPosition(0, i).setFormula("Row" + i);
oSheet.getCellByPosition(i, 0).setFormula("Col" + i);
}
for (int i = 1; i < 6; i++)
for (int j = 1; j < 6; j++) {
oSheet.getCellByPosition(i, j).setValue(2.5 * j + i);
}
CellRangeAddress sCellRangeAddress = new CellRangeAddress();
sCellRangeAddress.Sheet = 0;
sCellRangeAddress.StartColumn = 1;
sCellRangeAddress.StartRow = 0;
sCellRangeAddress.EndColumn = 5;
sCellRangeAddress.EndRow = 5;
TableFilterField[] filterFields = new TableFilterField[2];
filterFields[0] = new TableFilterField();
filterFields[0].Connection = com.sun.star.sheet.FilterConnection.AND;
filterFields[0].Field = 1;
filterFields[0].IsNumeric = true;
filterFields[0].NumericValue = 4;
filterFields[0].Operator = com.sun.star.sheet.FilterOperator.GREATER;
filterFields[1] = new TableFilterField();
filterFields[1].Connection = com.sun.star.sheet.FilterConnection.AND;
filterFields[1].Field = 1;
filterFields[1].IsNumeric = true;
filterFields[1].NumericValue = 12;
filterFields[1].Operator = com.sun.star.sheet.FilterOperator.LESS_EQUAL;
XDataPilotTablesSupplier DPTS = UnoRuntime.queryInterface(XDataPilotTablesSupplier.class, oSheet);
log.println("Getting test object");
XDataPilotTables DPT = DPTS.getDataPilotTables();
XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
DPDsc.setSourceRange(sCellRangeAddress);
XSheetFilterDescriptor SFD = DPDsc.getFilterDescriptor();
SFD.setFilterFields(filterFields);
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);
if (DPT.hasByName("DataPilotTable")) {
DPT.removeByName("DataPilotTable");
}
DPT.insertNewByName("DataPilotTable", sCellAddress, DPDsc);
oObj = (XInterface) AnyConverter.toObject(
new Type(XInterface.class),DPT.getByName(DPT.getElementNames()[0]));
log.println("Creating object - " +
((oObj == null) ? "FAILED" : "OK"));
TestEnvironment tEnv = new TestEnvironment( oObj );
// Other parameters required for interface tests
tEnv.addObjRelation("OUTPUTRANGE", sCellAddress);
tEnv.addObjRelation("CELLFORCHANGE", oChangeCell);
tEnv.addObjRelation("CELLFORCHECK", oCheckCell);
tEnv.addObjRelation("FIELDSAMOUNT", Integer.valueOf(5));
tEnv.addObjRelation("SHEETDOCUMENT", xSheetDoc);
createTable2(oSheet, sCellRangeAddress, tEnv);
return tEnv;
}
/**
* Create a new DataPilot table output for use with testing XDataPilotTable2
* interface.
*
* @param oSheet current sheet instance
* @param srcRange source range
* @param tEnv test environment instance
*/
private void createTable2(XSpreadsheet oSheet, CellRangeAddress srcRange, TestEnvironment tEnv) throws Exception
{
XDataPilotTablesSupplier DPTS = UnoRuntime.queryInterface(XDataPilotTablesSupplier.class, oSheet);
log.println("Creating test table object");
XDataPilotTables DPT = DPTS.getDataPilotTables();
XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
DPDsc.setSourceRange(srcRange);
XIndexAccess xIA = DPDsc.getDataPilotFields();
int fieldCount = xIA.getCount() - 1; // skip the last field because it's always hidden.
for (int i = 0; i < fieldCount; ++i)
{
Object o = xIA.getByIndex(i);
XPropertySet fieldPropSet = UnoRuntime.queryInterface(
XPropertySet.class, o);
if (i == fieldCount - 1)
{
// last field
fieldPropSet.setPropertyValue(
"Function", com.sun.star.sheet.GeneralFunction.SUM);
fieldPropSet.setPropertyValue(
"Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA);
}
else if (i%2 == 0)
{
// even number fields
fieldPropSet.setPropertyValue(
"Orientation", com.sun.star.sheet.DataPilotFieldOrientation.COLUMN);
}
else
{
// odd number fields
fieldPropSet.setPropertyValue(
"Orientation", com.sun.star.sheet.DataPilotFieldOrientation.ROW);
}
}
if (DPT.hasByName("DataPilotTable2"))
DPT.removeByName("DataPilotTable2");
CellAddress destAddr = new CellAddress();
destAddr.Sheet = 0;
destAddr.Column = 0;
destAddr.Row = 14;
DPT.insertNewByName("DataPilotTable2", destAddr, DPDsc);
Object o = DPT.getByName("DataPilotTable2");
tEnv.addObjRelation("DATAPILOTTABLE2", o);
}
}
diff --git a/sc/qa/unoapi/sc_4.sce b/sc/qa/unoapi/sc_4.sce
index 870f7e9..1d48651 100644
--- a/sc/qa/unoapi/sc_4.sce
+++ b/sc/qa/unoapi/sc_4.sce
@@ -17,7 +17,6 @@
#
-o sc.ScDataPilotItemObj
-o sc.ScDataPilotItemsObj
-o sc.ScDataPilotTableObj
-o sc.ScDataPilotTablesObj
-o sc.ScDatabaseRangeObj
# -o sc.ScDatabaseRangesObj
