[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 29 06:09:05 UTC 2019
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv | 7
qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java | 123 ----------
sc/qa/extras/scfilterdescriptorbase.cxx | 10
sc/qa/unoapi/sc_4.sce | 1
6 files changed, 10 insertions(+), 133 deletions(-)
New commits:
commit a71de08d75e15fd37408901d47a7aa3918f8087a
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Jan 29 01:17:54 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Tue Jan 29 07:08:44 2019 +0100
tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScFilterDescriptorBase.
Change-Id: I86a16f3c53a5aacea0ce88a54ec8b340d13dff4f
Reviewed-on: https://gerrit.libreoffice.org/67038
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 434ae00edc0d..751bb7ccd89c 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
-job96=sc.ScFilterDescriptorBase
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
job126=sc.ScSheetLinkObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4e140f06b987..a80f13887733 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -973,7 +973,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
qadevOOo/tests/java/mod/_sc/ScDrawPageObj \
- qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase \
qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv
deleted file mode 100644
index ed43efa9a2b5..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
deleted file mode 100644
index 993254bfabe0..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
+++ /dev/null
@@ -1,123 +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.XSheetFilterable;
-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.SheetFilterDescriptor</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::sheet::XSheetFilterDescriptor</code></li>
-* <li> <code>com::sun::star::sheet::SheetFilterDescriptor</code></li>
-* <li> <code>com::sun::star::beans::XPropertySet</code></li>
-* </ul>
-* @see com.sun.star.sheet.SheetFilterDescriptor
-* @see com.sun.star.sheet.XSheetFilterDescriptor
-* @see com.sun.star.sheet.SheetFilterDescriptor
-* @see com.sun.star.beans.XPropertySet
-* @see ifc.sheet._XSheetFilterDescriptor
-* @see ifc.sheet._SheetFilterDescriptor
-* @see ifc.beans._XPropertySet
-*/
-public class ScFilterDescriptorBase extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
- // get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
- log.println( "creating a sheetdocument" );
- 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 cells in the spreadsheet.
- * Creates the filter descriptor using the interface
- * <code>XSheetFilterable</code>. This filter descriptor is the instance
- * of the service <code>com.sun.star.sheet.SheetFilterDescriptor</code>.
- * @see com.sun.star.sheet.XSheetFilterable
- * @see com.sun.star.sheet.SheetFilterDescriptor
- */
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
-
- XInterface oObj = null;
- XSheetFilterable SF = null;
-
- 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("filling some cells");
- oSheet.getCellByPosition(5, 5).setValue(15);
- oSheet.getCellByPosition(1, 4).setValue(10);
- oSheet.getCellByPosition(2, 0).setValue(-5.15);
-
- SF = UnoRuntime.queryInterface(XSheetFilterable.class, oSheet);
-
- oObj = SF.createFilterDescriptor(true);
-
- log.println("creating a new environment for object");
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- return tEnv;
-
- } // finish method getTestEnvironment
-
-} // finish class ScFilterDescriptorBase
-
diff --git a/sc/qa/extras/scfilterdescriptorbase.cxx b/sc/qa/extras/scfilterdescriptorbase.cxx
index be19bfc679f8..3ab3cafad943 100644
--- a/sc/qa/extras/scfilterdescriptorbase.cxx
+++ b/sc/qa/extras/scfilterdescriptorbase.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/beans/xpropertyset.hxx>
#include <test/sheet/sheetfilterdescriptor.hxx>
#include <test/sheet/xsheetfilterdescriptor.hxx>
@@ -25,6 +26,7 @@ namespace sc_apitest
{
class ScFilterDescriptorBase : public CalcUnoApiTest,
public apitest::SheetFilterDescriptor,
+ public apitest::XPropertySet,
public apitest::XSheetFilterDescriptor
{
public:
@@ -40,6 +42,13 @@ public:
// SheetFilterDescriptor
CPPUNIT_TEST(testSheetFilterDescriptorProperties);
+ // XPropertySet
+ CPPUNIT_TEST(testGetPropertySetInfo);
+ CPPUNIT_TEST(testGetPropertyValue);
+ CPPUNIT_TEST(testSetPropertyValue);
+ CPPUNIT_TEST(testPropertyChangeListener);
+ CPPUNIT_TEST(testVetoableChangeListener);
+
// XSheetFilterDescriptor
CPPUNIT_TEST(testGetSetFilterFields);
@@ -51,6 +60,7 @@ private:
ScFilterDescriptorBase::ScFilterDescriptorBase()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XPropertySet({ "Orientation", "OutputPosition" })
{
}
diff --git a/sc/qa/unoapi/sc_4.sce b/sc/qa/unoapi/sc_4.sce
index 1063cae36791..dcff7d102652 100644
--- a/sc/qa/unoapi/sc_4.sce
+++ b/sc/qa/unoapi/sc_4.sce
@@ -20,7 +20,6 @@
-o sc.ScDatabaseRangeObj
-o sc.ScDocumentConfiguration
-o sc.ScDrawPageObj
--o sc.ScFilterDescriptorBase
# ported to cppunit -o sc.ScHeaderFieldObj
-o sc.ScHeaderFieldsObj
# The two HeaderFooter tests seem to fail randomly
More information about the Libreoffice-commits
mailing list