tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScAutoFormatObj.
Change-Id: I01ad72f7f48b3626085203ceac4f49bca847cdab
Reviewed-on: https://gerrit.libreoffice.org/70097
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 946bc59..a159f3a 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -72,7 +72,6 @@
job73=sc.ScAccessiblePreviewTable
job74=sc.ScAccessibleSpreadsheet
job78=sc.ScAutoFormatFieldObj
job79=sc.ScAutoFormatObj
job81=sc.ScCellFieldObj
job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 6a2a933..3815a06 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -950,7 +950,6 @@
qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj \
qadevOOo/tests/java/mod/_sc/ScAutoFormatObj \
qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
qadevOOo/tests/java/mod/_sc/ScCellObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
deleted file mode 100644
index 96344c7..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ /dev/null
@@ -1,7 +0,0 @@
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java
deleted file mode 100644
index 7790499..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java
+++ /dev/null
@@ -1,93 +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 com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNamed;
import com.sun.star.lang.XMultiServiceFactory;
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.TableAutoFormat</code>. <p>
* In StarCalc application there is a collection of autoformats
* for tables (you can select a predefined format for a
* table or create your own). This object represents
* one of these autoformats. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XNamed</code></li>
* <li> <code>com::sun::star::container::XIndexAccess</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* <li> <code>com::sun::star::sheet::TableAutoFormat</code></li>
* <li> <code>com::sun::star::beans::XPropertySet</code></li>
* </ul>
* This object test <b> is NOT </b> designed to be run in several
* threads concurrently.
* @see com.sun.star.container.XNamed
* @see com.sun.star.container.XIndexAccess
* @see com.sun.star.container.XElementAccess
* @see com.sun.star.sheet.TableAutoFormat
* @see com.sun.star.beans.XPropertySet
* @see ifc.container._XNamed
* @see ifc.container._XIndexAccess
* @see ifc.container._XElementAccess
* @see ifc.sheet._TableAutoFormat
* @see ifc.beans._XPropertySet
*/
public class ScAutoFormatObj extends TestCase {
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Using SOffice ServiceManager an instance of
* <code>com.sun.star.sheet.TableAutoFormatField</code> service
* is created. From this collection one Format is retrieved as
* object tested.
*/
@Override
public TestEnvironment createTestEnvironment(TestParameters tParam,
PrintWriter log) throws Exception {
XInterface oObj = null;
XMultiServiceFactory oMSF = tParam.getMSF();
XInterface formats = (XInterface)oMSF.createInstance
("com.sun.star.sheet.TableAutoFormats");
XIndexAccess formatsIndex = UnoRuntime.queryInterface(XIndexAccess.class, formats);
oObj = (XInterface) AnyConverter.toObject(
new Type(XInterface.class),formatsIndex.getByIndex
(formatsIndex.getCount() - 1));
XNamed objNamed = UnoRuntime.queryInterface(XNamed.class, oObj) ;
log.println("AutoFormat name is '" + objNamed.getName() + "'") ;
TestEnvironment tEnv = new TestEnvironment(oObj);
return tEnv;
}
}
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 525160e..cc48c03 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
#include <test/beans/xpropertyset.hxx>
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
@@ -33,7 +34,8 @@
public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XNamed
public apitest::XNamed,
public apitest::XPropertySet
{
public:
ScAutoFormatObj();
@@ -62,6 +64,13 @@
CPPUNIT_TEST(testGetName);
CPPUNIT_TEST(testSetName);
// XPropertySet
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
CPPUNIT_TEST(testSetPropertyValue);
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
index 475da04..ca7b7b5 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -23,7 +23,6 @@
# FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
# -o sc.ScAnnotationShapeObj
-o sc.ScAutoFormatFieldObj
-o sc.ScAutoFormatObj
-o sc.ScCellCursorObj
# ported to cppunit -o sc.ScCellFieldObj
-o sc.ScCellObj
