tdf#45904 Move XEnumerationAccess Java test to C++

Move XEnumerationAccess Java test to C++ for ScDataPilotFieldsObj.

Change-Id: I4b8bf204ccf4229ee5c57c03caef9fa5459e28a8
Reviewed-on: https://gerrit.libreoffice.org/67269
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>

6 files changed, 5 insertions, 153 deletions

diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 64cfe9d6c7f7..18192bd23b86 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -79,7 +79,6 @@ job81=sc.ScCellFieldObj
 job85=sc.ScCellSearchObj
 job88=sc.ScDatabaseRangeObj
 job90=sc.ScDataPilotFieldObj
-job91=sc.ScDataPilotFieldsObj
 job98=sc.ScHeaderFieldObj
 job99=sc.ScHeaderFieldsObj
 job126=sc.ScSheetLinkObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 61623c302bb1..91f2b3503eec 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -968,7 +968,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj \
     qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj \
     qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj \
-    qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj \
     qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
     qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
     qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv
deleted file mode 100644
index 7d42ccda9aa6..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldsObj.csv
+++ /dev/null
@@ -1 +0,0 @@
-"ScDataPilotFieldsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
deleted file mode 100644
index 1b3d2748f047..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
+++ /dev/null
@@ -1,149 +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.DataPilotFields</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::container::XNameAccess</code></li>
-*  <li> <code>com::sun::star::container::XElementAccess</code></li>
-* </ul>
-* @see com.sun.star.sheet.DataPilotFields
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.container._XNameAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScDataPilotFieldsObj 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. Obtains the collection of all the data pilot fields
-    * using the interface <code>XDataPilotDescriptor</code>. This collection
-    * is the instance of the service <code>com.sun.star.sheet.DataPilotFields</code>.
-    * @see com.sun.star.sheet.DataPilotFields
-    * @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" );
-
-        // 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 = DPDsc.getDataPilotFields();
-        log.println("Creating object - " +
-                                    ((oObj == null) ? "FAILED" : "OK"));
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        // Other parameters required for interface tests
-
-        return tEnv;
-    }
-
-}
diff --git a/sc/qa/extras/scdatapilotfieldsobj.cxx b/sc/qa/extras/scdatapilotfieldsobj.cxx
index 89b07762e638..24c6adfc9db1 100644
--- a/sc/qa/extras/scdatapilotfieldsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldsobj.cxx
@@ -9,6 +9,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>
 
@@ -33,6 +34,7 @@ namespace sc_apitest
 {
 class ScDataPilotFieldsObj : public CalcUnoApiTest,
                              public apitest::XElementAccess,
+                             public apitest::XEnumerationAccess,
                              public apitest::XIndexAccess,
                              public apitest::XNameAccess
 {
@@ -48,6 +50,9 @@ public:
     CPPUNIT_TEST(testHasElements);
     CPPUNIT_TEST(testGetElementType);
 
+    // XEnumerationAccess
+    CPPUNIT_TEST(testCreateEnumeration);
+
     // XIndexAccess
     CPPUNIT_TEST(testGetByIndex);
     CPPUNIT_TEST(testGetCount);
diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
index fa1684ca01c8..e442a168e4b6 100644
--- a/sc/qa/unoapi/sc_1.sce
+++ b/sc/qa/unoapi/sc_1.sce
@@ -19,7 +19,6 @@
 -o sc.ScDataPilotFieldGroupObj
 -o sc.ScDataPilotFieldGroupsObj
 -o sc.ScDataPilotFieldObj
--o sc.ScDataPilotFieldsObj
 # i84653 -o sc.ScPageObj
 # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
 # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter