qadevOOo/Jar_OOoRunner.mk | 1
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/_XDrawPageExpander.java | 65
----------
qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java | 3
qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java | 3
6 files changed, 74 deletions(-)
New commits:
commit be75c098440f073d92dd713ba2492625aff8246e
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Tue Jan 22 23:08:40 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Wed Jan 23 01:27:06 2019 +0100
tdf#45904 Clean up _XDrawPageExpander Java tests
The XDrawPageExpander interface is deprecated since commit
d081c80877dc1ae413b9d65c206485b6821d0ef8
Change-Id: I3400f09667004669286ffb94c2c89c284f0eb3f0
Reviewed-on: https://gerrit.libreoffice.org/66756
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 6af59eb7f706..b56fd80617b6 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -349,7 +349,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/drawing/_XConnectorShape \
qadevOOo/tests/java/ifc/drawing/_XControlShape \
qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator \
- qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander \
qadevOOo/tests/java/ifc/drawing/_XDrawPages \
qadevOOo/tests/java/ifc/drawing/_XDrawPagesSupplier \
qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
index 844f27507b3e..7b3c5b2ae7bf 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPagesObj.csv
@@ -1,2 +1 @@
-"ScDrawPagesObj";"com::sun::star::drawing::XDrawPageExpander#optional";"expand()"
"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 059f4b0e966b..afd975830c02 100644
--- a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv
+++ b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdDrawPagesAccess.csv
@@ -4,5 +4,4 @@
"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::XDrawPageExpander#optional";"expand()"
"SdDrawPagesAccess";"com::sun::star::drawing::XDrawPageSummarizer#optional";"summarize()"
diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java
b/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java
deleted file mode 100644
index 1f3eb73694e7..000000000000
--- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.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.XDrawPage;
-import com.sun.star.drawing.XDrawPageExpander;
-import com.sun.star.drawing.XDrawPages;
-
-/**
-* Testing <code>com.sun.star.drawing.XDrawPageExpander</code>
-* interface methods :
-* <ul>
-* <li><code> expand()</code></li>
-* </ul> <p>
-* This test needs the following object relations :
-* <ul>
-* <li> <code>'DrawPage'</code> (of type <code>XDrawPage</code>):
-* draw page to be expanded. </li>
-* <ul> <p>
-* Test is <b> NOT </b> multithread compliant. <p>
-* @see com.sun.star.drawing.XDrawPageExpander
-*/
-public class _XDrawPageExpander extends MultiMethodTest {
- public XDrawPageExpander 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 _expand() {
- boolean result = true;
- XDrawPage oDrawPage = (XDrawPage) tEnv.getObjRelation("DrawPage");
- if ( oDrawPage == null ) {
- // SKIPPED.FAILED - the ObjectRelation is not available
- throw new StatusException(Status.failed(
"ObjectRelation('DrawPages') XDrawPages n.a."));
- }
- log.println("testing expand() ... ");
-
- XDrawPages pages = oObj.expand(oDrawPage);
- result = pages != null;
-
- tRes.tested("expand()", result);
- } // end expand
-} // end DrawPageExpander
-
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
index 345901bdfc52..16bf9a80edf1 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
@@ -38,19 +38,16 @@ import com.sun.star.uno.XInterface;
* <code>com.sun.star.drawing.DrawPages</code>. <p>
* Object implements the following interfaces :
* <ul>
-* <li> <code>com::sun::star::drawing::XDrawPageExpander</code></li>
* <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.drawing.XDrawPageExpander
* @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.drawing._XDrawPageExpander
* @see ifc.container._XIndexAccess
* @see ifc.drawing._XDrawPageSummarizer
* @see ifc.container._XElementAccess
diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
index ea4afc016f07..0fa45e5779c3 100644
--- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
@@ -37,19 +37,16 @@ import com.sun.star.uno.XInterface;
* <code>com.sun.star.drawing.DrawPages</code>. <p>
* Object implements the following interfaces :
* <ul>
-* <li> <code>com::sun::star::drawing::XDrawPageExpander</code></li>
* <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.drawing.XDrawPageExpander
* @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.drawing._XDrawPageExpander
* @see ifc.container._XIndexAccess
* @see ifc.drawing._XDrawPageSummarizer
* @see ifc.container._XElementAccess
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
