tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScStyleFamiliesObj.
Change-Id: I0c21e35f1c303bb430010b51795285c0a2e7e283
Reviewed-on: https://gerrit.libreoffice.org/66347
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 6b9a152..63e1236 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -89,7 +89,6 @@
job127=sc.ScSheetLinksObj
job128=sc.ScSpreadsheetSettings
job129=sc.ScSpreadsheetSettingsObj
job130=sc.ScStyleFamiliesObj
job131=sc.ScStyleFamilyObj
job132=sc.ScStyleObj
job134=sc.ScTableColumnObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index a4c227a..30d9932 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -990,7 +990,6 @@
qadevOOo/tests/java/mod/_sc/ScSheetLinksObj \
qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings \
qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj \
qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj \
qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamiliesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamiliesObj.csv
deleted file mode 100644
index e6d6f86..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleFamiliesObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScStyleFamiliesObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScStyleFamiliesObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
deleted file mode 100644
index 127b732..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
+++ /dev/null
@@ -1,105 +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.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
import util.SOfficeFactory;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.style.XStyleFamiliesSupplier;
import com.sun.star.uno.UnoRuntime;
/**
* Test for object which is represented by service
* <code>com.sun.star.style.StyleFamilies</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>
* <li> <code>com::sun::star::container::XIndexAccess</code></li>
* </ul>
* @see com.sun.star.style.StyleFamilies
* @see com.sun.star.container.XNameAccess
* @see com.sun.star.container.XElementAccess
* @see com.sun.star.container.XIndexAccess
* @see ifc.container._XNameAccess
* @see ifc.container._XElementAccess
* @see ifc.container._XIndexAccess
*/
public class ScStyleFamiliesObj extends TestCase {
private XSpreadsheetDocument xSpreadsheetDoc = 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" );
xSpreadsheetDoc = SOF.createCalcDoc(null);
}
/**
* Disposes Spreadsheet document.
*/
@Override
protected void cleanup( TestParameters tParam, PrintWriter log ) {
log.println( " disposing xSheetDoc " );
XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ;
util.DesktopTools.closeDoc(oComp);
}
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Retrieves the collection of style families from the document
* using the interface <code>XStyleFamiliesSupplier</code>.
* This collection is the instance of the service
* <code>com.sun.star.style.StyleFamilies</code>.
* @see com.sun.star.style.StyleFamilies
* @see com.sun.star.style.XStyleFamiliesSupplier
*/
@Override
public TestEnvironment createTestEnvironment(
TestParameters tParam, PrintWriter log) throws StatusException {
// creation of testobject here
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
XNameAccess oStyleFamilies=null;
// create testobject here
log.println("getting style families");
XStyleFamiliesSupplier oStyleFamiliesSupplier =UnoRuntime.queryInterface(
XStyleFamiliesSupplier.class, xSpreadsheetDoc);
oStyleFamilies = oStyleFamiliesSupplier.getStyleFamilies();
TestEnvironment tEnv = new TestEnvironment(oStyleFamilies);
return tEnv;
} // finish method getTestEnvironment
} // finish class ScStyleFamiliesObj
diff --git a/sc/qa/extras/scstylefamiliesobj.cxx b/sc/qa/extras/scstylefamiliesobj.cxx
index 6449537..c283f93 100644
--- a/sc/qa/extras/scstylefamiliesobj.cxx
+++ b/sc/qa/extras/scstylefamiliesobj.cxx
@@ -8,10 +8,12 @@
*/
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/container/xnameaccess.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -19,12 +21,15 @@
#include <com/sun/star/uno/Reference.hxx>
#include <cppu/unotype.hxx>
using namespace css;
using namespace css::uno;
namespace sc_apitest
{
class ScStyleFamiliesObj : public CalcUnoApiTest,
public apitest::XElementAccess,
public apitest::XIndexAccess,
public apitest::XNameAccess
{
@@ -37,6 +42,10 @@
CPPUNIT_TEST_SUITE(ScStyleFamiliesObj);
// XElementAccess
CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements);
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
@@ -54,6 +63,7 @@
ScStyleFamiliesObj::ScStyleFamiliesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<container::XNameContainer>::get())
, XIndexAccess(2)
, XNameAccess("CellStyles")
{
diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce
index 303ce4a..ce0b7f7 100644
--- a/sc/qa/unoapi/sc_6.sce
+++ b/sc/qa/unoapi/sc_6.sce
@@ -22,5 +22,4 @@
-o sc.ScSheetLinksObj
-o sc.ScSpreadsheetSettings
-o sc.ScSpreadsheetSettingsObj
-o sc.ScStyleFamiliesObj
-o sc.ScStyleFamilyObj
