[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 23 00:49:29 UTC 2019
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv | 1
qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv | 1
qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java | 65 -----
qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java | 115 ----------
qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java | 3
sc/qa/unoapi/sc_4.sce | 1
8 files changed, 189 deletions(-)
New commits:
commit 13279b94080d87dde51bc8b8c669212bf71cacca
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Jan 22 23:15:44 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Jan 23 01:49:04 2019 +0100
tdf#45904 Clean up _XDrawPageSummarizer Java tests
The XDrawPageSummarizer interface is deprecated since commit
d081c80877dc1ae413b9d65c206485b6821d0ef8
Change-Id: I041c5d5df11d1b5208b846c76ef82427c4df4585
Reviewed-on: https://gerrit.libreoffice.org/66757
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 c52e866b14a0..38794d90181e 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
-job95=sc.ScDrawPagesObj
job96=sc.ScFilterDescriptorBase
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index b56fd80617b6..1a156fca7c19 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -351,7 +351,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator \
qadevOOo/tests/java/ifc/drawing/_XDrawPages \
qadevOOo/tests/java/ifc/drawing/_XDrawPagesSupplier \
- qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer \
qadevOOo/tests/java/ifc/drawing/_XDrawPageSupplier \
qadevOOo/tests/java/ifc/drawing/_XDrawView \
qadevOOo/tests/java/ifc/drawing/_XGluePointsSupplier \
@@ -975,7 +974,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/ScDrawPagesObj \
qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase \
qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
deleted file mode 100644
index 7b3c5b2ae7bf..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
+++ /dev/null
@@ -1 +0,0 @@
-"ScDrawPagesObj";"com::sun::star::drawing::XDrawPageSummarizer#optional";"summarize()"
diff --git a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv
index afd975830c02..c54e175f77c9 100644
--- a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv
+++ b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv
@@ -4,4 +4,3 @@
"SdDrawPagesAccess";"com::sun::star::drawing::XDrawPages";"remove()"
"SdDrawPagesAccess";"com::sun::star::container::XElementAccess";"getElementType()"
"SdDrawPagesAccess";"com::sun::star::container::XElementAccess";"hasElements()"
-"SdDrawPagesAccess";"com::sun::star::drawing::XDrawPageSummarizer#optional";"summarize()"
diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java
deleted file mode 100644
index b346f933365d..000000000000
--- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java
+++ /dev/null
@@ -1,65 +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 ifc.drawing;
-
-import lib.MultiMethodTest;
-import lib.StatusException;
-import lib.Status;
-
-import com.sun.star.drawing.XDrawPageSummarizer;
-import com.sun.star.drawing.XDrawPages;
-
-/**
-* Testing <code>com.sun.star.drawing.XDrawPageSummarizer</code>
-* interface methods :
-* <ul>
-* <li><code> summarize()</code></li>
-* </ul> <p>
-* This test needs the following object relations :
-* <ul>
-* <li> <code>'DrawPages'</code> (of type <code>XDrawPages</code>):
-* a collection of pages to be summarized. </li>
-* <ul> <p>
-* Test is <b> NOT </b> multithread compliant. <p>
-* @see com.sun.star.drawing.XDrawPageSummarizer
-*/
-public class _XDrawPageSummarizer extends MultiMethodTest {
- public XDrawPageSummarizer oObj = null;
-
- /**
- * First the relation is retrieved. Then the method is called.<p>
- * Has <b> OK </b> status if the method returns not null value. <p>
- */
- public void summarize(){
- boolean result = true;
- XDrawPages oDrawPages = (XDrawPages) tEnv.getObjRelation("DrawPages");
- if ( oDrawPages == null ) {
- // SKIPPED.FAILED - the ObjectRelation is not available
- throw new StatusException(Status.failed( "ObjectRelation('DrawPages') XDrawPages n.a." ));
- }
- log.println("testing summarize() ... ");
-
- oObj.summarize(oDrawPages);
- result=true;
-
- tRes.tested("summarize()", result);
- } // end of summarize()
-
-} // end of XDrawPageSummarizer
-
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
deleted file mode 100644
index 16bf9a80edf1..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
+++ /dev/null
@@ -1,115 +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.drawing.XDrawPages;
-import com.sun.star.drawing.XDrawPagesSupplier;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.drawing.DrawPages</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XIndexAccess</code></li>
-* <li> <code>com::sun::star::drawing::XDrawPageSummarizer</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* <li> <code>com::sun::star::drawing::XDrawPages</code></li>
-* </ul>
-* @see com.sun.star.drawing.DrawPages
-* @see com.sun.star.container.XIndexAccess
-* @see com.sun.star.drawing.XDrawPageSummarizer
-* @see com.sun.star.container.XElementAccess
-* @see com.sun.star.drawing.XDrawPages
-* @see ifc.container._XIndexAccess
-* @see ifc.drawing._XDrawPageSummarizer
-* @see ifc.container._XElementAccess
-* @see ifc.drawing._XDrawPages
-*/
-public class ScDrawPagesObj 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 all drawpages in the document using the
- * interface <code>XDrawPagesSupplier</code>. Creates and inserts two new
- * drawPages into this collection. The retrieved collection is the instance
- * of the service <code>com.sun.star.drawing.DrawPages</code>.
- * @see com.sun.star.drawing.XDrawPagesSupplier
- * @see com.sun.star.drawing.DrawPages
- */
- @Override
- public TestEnvironment createTestEnvironment(
- TestParameters tParam, PrintWriter log) throws StatusException {
-
- XInterface oObj = null;
- XDrawPages oDP = null;
-
- // creation of testobject here
- // first we write what we are intend to do to log file
- log.println( "creating a test environment" );
-
- // get the drawpage of drawing here
- log.println( "getting Drawpages" );
- XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xSheetDoc);
- oDP = oDPS.getDrawPages();
- oDP.insertNewByIndex(1);
- oDP.insertNewByIndex(2);
- oObj = oDP;
-
- log.println( "creating a new environment for drawpage object" );
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- return tEnv;
- } // finish method getTestEnvironment
-
-} // finish class ScDrawPagesObj
-
diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
index 0fa45e5779c3..20e69e34b1ea 100644
--- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
@@ -38,17 +38,14 @@ import com.sun.star.uno.XInterface;
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XIndexAccess</code></li>
-* <li> <code>com::sun::star::drawing::XDrawPageSummarizer</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* <li> <code>com::sun::star::drawing::XDrawPages</code></li>
* </ul>
* @see com.sun.star.drawing.DrawPages
* @see com.sun.star.container.XIndexAccess
-* @see com.sun.star.drawing.XDrawPageSummarizer
* @see com.sun.star.container.XElementAccess
* @see com.sun.star.drawing.XDrawPages
* @see ifc.container._XIndexAccess
-* @see ifc.drawing._XDrawPageSummarizer
* @see ifc.container._XElementAccess
* @see ifc.drawing._XDrawPages
*/
diff --git a/sc/qa/unoapi/sc_4.sce b/sc/qa/unoapi/sc_4.sce
index f7287488d41c..1063cae36791 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.ScDrawPagesObj
-o sc.ScFilterDescriptorBase
# ported to cppunit -o sc.ScHeaderFieldObj
-o sc.ScHeaderFieldsObj
More information about the Libreoffice-commits
mailing list