tdf#45904 Move XElementAccess Java tests to C++

Move XElementAccess Java tests to C++ for ScSheetLinksObj.

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

6 files changed, 9 insertions, 135 deletions

diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 38794d90181e..28c133dcdf10 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -84,7 +84,6 @@ job96=sc.ScFilterDescriptorBase
 job98=sc.ScHeaderFieldObj
 job99=sc.ScHeaderFieldsObj
 job126=sc.ScSheetLinkObj
-job127=sc.ScSheetLinksObj
 job128=sc.ScSpreadsheetSettings
 job129=sc.ScSpreadsheetSettingsObj
 job131=sc.ScStyleFamilyObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 1a156fca7c19..2828744ee90e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -983,7 +983,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
     qadevOOo/tests/java/mod/_sc/ScShapeObj \
     qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
-    qadevOOo/tests/java/mod/_sc/ScSheetLinksObj \
     qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings \
     qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj \
     qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinksObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinksObj.csv
deleted file mode 100644
index 9903e39826f0..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinksObj.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"ScSheetLinksObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScSheetLinksObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScSheetLinksObj";"com::sun::star::container::XNameAccess";"hasByName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
deleted file mode 100644
index 3a996abc81b7..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
+++ /dev/null
@@ -1,128 +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.XSheetLinkable;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-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.SheetLinks</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.SheetLinks
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.container._XNameAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScSheetLinksObj 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. Links the sheet to another sheet using the
-    * interface <code>XSheetLinkable</code>. Obtains the
-    * value of the property <code>'SheetLinks'</code> that is the collection of
-    * sheet links. This collection is the instance of the service
-    *  <code>com.sun.star.sheet.SheetLinks</code>.
-    * @see com.sun.star.sheet.SheetLink
-    * @see com.sun.star.sheet.XSheetLinkable
-    */
-    @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" );
-        XSpreadsheet oSheet = null;
-
-        log.println("Getting test object ") ;
-        XSpreadsheets oSheets = xSheetDoc.getSheets() ;
-        XIndexAccess oIndexSheets = UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
-        oSheet = (XSpreadsheet) AnyConverter.toObject(
-                new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
-
-        XSheetLinkable SL = UnoRuntime.queryInterface(XSheetLinkable.class, oSheet);
-
-        // creating link. Doesn't matter that it refers to unexistent object.
-        // this is for proper work of X*Access tests.
-        String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc");
-        SL.link(aSourceArea, "Sheet1", "", "",
-            com.sun.star.sheet.SheetLinkMode.VALUE);
-
-        // Getting links.
-        XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
-
-        Object links = docProps.getPropertyValue("SheetLinks");
-
-        oObj = UnoRuntime.queryInterface(XInterface.class, links);
-
-        log.println("Creating object - " +
-                                    ((oObj == null) ? "FAILED" : "OK"));
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    }
-
-}
-
diff --git a/sc/qa/extras/scsheetlinksobj.cxx b/sc/qa/extras/scsheetlinksobj.cxx
index 350924dcdd70..481be884ae41 100644
--- a/sc/qa/extras/scsheetlinksobj.cxx
+++ b/sc/qa/extras/scsheetlinksobj.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 <cppu/unotype.hxx>
 #include <rtl/string.hxx>
@@ -34,7 +35,8 @@ namespace sc_apitest
 class ScSheetLinksObj : public CalcUnoApiTest,
                         public apitest::XElementAccess,
                         public apitest::XEnumerationAccess,
-                        public apitest::XIndexAccess
+                        public apitest::XIndexAccess,
+                        public apitest::XNameAccess
 {
 public:
     ScSheetLinksObj();
@@ -56,6 +58,11 @@ public:
     CPPUNIT_TEST(testGetByIndex);
     CPPUNIT_TEST(testGetCount);
 
+    // XNameAccess
+    CPPUNIT_TEST(testGetByName);
+    CPPUNIT_TEST(testGetElementNames);
+    CPPUNIT_TEST(testHasByName);
+
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -66,6 +73,7 @@ ScSheetLinksObj::ScSheetLinksObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<beans::XPropertySet>::get())
     , XIndexAccess(1)
+    , XNameAccess(m_directories.getURLFromSrc("/sc/qa/extras/testdocuments/ScSheetLinksObj.ods"))
 {
 }
 
diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce
index ce0b7f7b0751..cb24d34d75c5 100644
--- a/sc/qa/unoapi/sc_6.sce
+++ b/sc/qa/unoapi/sc_6.sce
@@ -19,7 +19,6 @@
 -o sc.ScNamedRangesObj
 # -o sc.ScShapeObj
 # -o sc.ScSheetLinkObj
--o sc.ScSheetLinksObj
 -o sc.ScSpreadsheetSettings
 -o sc.ScSpreadsheetSettingsObj
 -o sc.ScStyleFamilyObj