qadevOOo/Jar_OOoRunner.mk                                        |    1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv |    2 
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java            |   81 
----------
 3 files changed, 84 deletions(-)

New commits:
commit 46ba298934d1765365018349f26f8a732cefba63
Author: Jens Carl <j.car...@gmx.de>
Date:   Thu Jul 6 07:33:52 2017 +0000

    tdf#45904 Remove/disable obsolete _XSheetAnnotations Java tests
    
    The _XSheetAnnotations test is already written in C++ since commit
    654e275fc673b28ac264f10282a4cd3a9f61a45d.
    
    Change-Id: Ie4d8459f503289cd9fd1c52b9121377826921bc3
    Reviewed-on: https://gerrit.libreoffice.org/39619
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index c2fc23cf8707..191fb20ac158 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -630,7 +630,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/sheet/_XScenarios \
     qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier \
     qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
-    qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations \
     qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \
     qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
     qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
index 6e5c472dc78a..09c3b94d5afd 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
@@ -2,6 +2,4 @@
 "ScAnnotationsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScAnnotationsObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScAnnotationsObj";"com::sun::star::sheet::XSheetAnnotations";"insertNew()"
-"ScAnnotationsObj";"com::sun::star::sheet::XSheetAnnotations";"removeByIndex()"
 
"ScAnnotationsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java 
b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java
deleted file mode 100644
index 163141bc5f41..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations.java
+++ /dev/null
@@ -1,81 +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.sheet;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.sheet.XSheetAnnotations;
-import com.sun.star.table.CellAddress;
-
-
-/**
-* Testing <code>com.sun.star.sheet.XSheetAnnotations</code>
-* interface methods :
-* <ul>
-*  <li><code> insertNew()</code></li>
-*  <li><code> removeByIndex()</code></li>
-* </ul> <p>
-* Test is <b> NOT </b> multithread compliant. <p>
-* @see com.sun.star.sheet.XSheetAnnotations
-*/
-public class _XSheetAnnotations extends MultiMethodTest {
-
-    public XSheetAnnotations oObj = null;
-
-    /**
-    * Adds two new annotations into collection. <p>
-    * Has <b>OK</b> status if the number of elements in collection
-    * increased by 2 after method call.
-    */
-    public void _insertNew(){
-        boolean bResult = false;
-
-        int initialAmount = oObj.getCount();
-        String sAnno = oObj.toString();
-
-        oObj.insertNew(new CellAddress((short)1, 2, 5), sAnno + "1");
-        oObj.insertNew(new CellAddress((short)1, 1, 1), sAnno + "2");
-
-        bResult = (oObj.getCount() == 2 + initialAmount);
-        tRes.tested("insertNew()", bResult);
-    }
-
-    /**
-    * Removes one annotation from collection. <p>
-    * Has <b>OK</b> status if the number of elements in collection
-    * decreased after method call. <p>
-    * The following method tests are to be completed successfully before :
-    * <ul>
-    *  <li> <code> insertNew </code> : to be sure at least two elements
-    *   exist in the collection.</li>
-    * </ul>
-    */
-    public void _removeByIndex(){
-        requiredMethod("insertNew()");
-        int tmpCnt = oObj.getCount();
-
-        oObj.removeByIndex(1);
-        int newCnt = oObj.getCount();
-
-        tRes.tested("removeByIndex()", newCnt < tmpCnt);
-    }
-
-} // EOC _XSheetAnnotations
-
-
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to