framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv | 3
qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java | 157
----------
sc/qa/extras/scdatapilottablesobj.cxx | 10
sc/qa/unoapi/sc_4.sce | 1
6 files changed, 9 insertions(+), 164 deletions(-)
New commits:
commit c73cc08f0a4af4578e1d061d042f2c11ce0b51ae
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sun Jan 13 19:25:12 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Mon Jan 14 05:19:50 2019 +0100
tdf#45904 Move XNameAccess Java tests to C++
Move XNameAccess Java tests to C++ for ScDataPilotTablesObj.
Change-Id: I43bd4ca0688e38792080710c288ca746f95460d9
Reviewed-on: https://gerrit.libreoffice.org/66273
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index 113755a44ddb..6b9a152fbeb9 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -80,7 +80,6 @@ job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
job90=sc.ScDataPilotFieldObj
job91=sc.ScDataPilotFieldsObj
-job92=sc.ScDataPilotTablesObj
job94=sc.ScDDELinksObj
job95=sc.ScDrawPagesObj
job96=sc.ScFilterDescriptorBase
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 12bd022d00f0..a4c227a8f463 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -974,7 +974,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
- qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj \
qadevOOo/tests/java/mod/_sc/ScDDELinksObj \
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
qadevOOo/tests/java/mod/_sc/ScDrawPageObj \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
deleted file mode 100644
index bf88fcd3661a..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"ScDataPilotTablesObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScDataPilotTablesObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScDataPilotTablesObj";"com::sun::star::container::XNameAccess";"hasByName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
deleted file mode 100644
index 7bcd96b85391..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
+++ /dev/null
@@ -1,157 +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.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;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.sheet.DataPilotTables</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::sheet::XDataPilotTables</code></li>
-* <li> <code>com::sun::star::container::XNameAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* </ul>
-* @see com.sun.star.sheet.DataPilotTables
-* @see com.sun.star.sheet.XDataPilotTables
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.sheet._XDataPilotTables
-* @see ifc.container._XNameAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScDataPilotTablesObj 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 and inserts new data pilot table with this
descriptor
- * to the collection. The collection of data pilot tables is the instance of
- * the service <code>com.sun.star.sheet.DataPilotTables</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'SHEET'</code> for
- * {@link ifc.sheet._XDataPilotTables}(the spreadsheet which
- * the collection of data pilot tables was retrieved from) </li>
- * </ul>
- * @see com.sun.star.sheet.DataPilotTable
- * @see com.sun.star.sheet.XDataPilotTablesSupplier
- */
- @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" );
-
- // create testobject here
-
- log.println("getting sheets");
- XSpreadsheets xSpreadsheets = xSheetDoc.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("Filing a table");
- for (int i = 1; i < 4; i++) {
- oSheet.getCellByPosition(i, 0).setFormula("Col" + i);
- oSheet.getCellByPosition(0, i).setFormula("Row" + i);
- }
-
- for (int i = 1; i < 4; i++)
- for (int j = 1; j < 4; j++) {
- oSheet.getCellByPosition(i, j).setValue(i * (j + 1));
- }
-
- XDataPilotTablesSupplier DPTS =
UnoRuntime.queryInterface(XDataPilotTablesSupplier.class, oSheet);
-
- log.println("Getting test object ") ;
-
- XDataPilotTables DPT = DPTS.getDataPilotTables();
- XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
- DPDsc.setSourceRange(new CellRangeAddress((short)0, 0, 0, 4, 4));
- DPT.insertNewByName(
- "DataPilotTable",
- new CellAddress((short)0, 5, 5),
- DPDsc );
-
- oObj = DPT;
-
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- // Other parameters required for interface tests
- tEnv.addObjRelation("SHEET", oSheet);
-
- return tEnv;
- }
-
-}
-
-
diff --git a/sc/qa/extras/scdatapilottablesobj.cxx
b/sc/qa/extras/scdatapilottablesobj.cxx
index 44eef48f8d93..9713fbd3177d 100644
--- a/sc/qa/extras/scdatapilottablesobj.cxx
+++ b/sc/qa/extras/scdatapilottablesobj.cxx
@@ -11,6 +11,7 @@
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
+#include <test/container/xnameaccess.hxx>
#include <test/sheet/xdatapilottables.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -40,7 +41,8 @@ class ScDataPilotTablesObj : public CalcUnoApiTest,
public apitest::XDataPilotTables,
public apitest::XElementAccess,
public apitest::XEnumerationAccess,
- public apitest::XIndexAccess
+ public apitest::XIndexAccess,
+ public apitest::XNameAccess
{
public:
ScDataPilotTablesObj();
@@ -66,6 +68,11 @@ public:
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
+ // XNameAccess
+ CPPUNIT_TEST(testGetByName);
+ CPPUNIT_TEST(testGetElementNames);
+ CPPUNIT_TEST(testHasByName);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -76,6 +83,7 @@ ScDataPilotTablesObj::ScDataPilotTablesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<sheet::XDataPilotTable2>::get())
, XIndexAccess(1)
+ , XNameAccess("DataPilotTable")
{
}
diff --git a/sc/qa/unoapi/sc_4.sce b/sc/qa/unoapi/sc_4.sce
index 5d3b0ddde12c..f7287488d41c 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.ScDataPilotTablesObj
-o sc.ScDatabaseRangeObj
-o sc.ScDocumentConfiguration
-o sc.ScDrawPageObj
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
