diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-07-05 07:12:08 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-13 10:44:05 +0200 |
commit | 4b4c14a0803c0ba0af98b888af7ad8793ea4f754 (patch) | |
tree | 1f850580874241bde9c306e0c65d92af39540812 /qadevOOo | |
parent | 01a51eb77ce97c79b897f842051c6704dada0494 (diff) |
tdf#45904 Remove/disable obsolete _XSheetAnnotation Java tests
The _XSheetAnnotation test is already written in C++ since commit
0bf016694e8df63e20e530f9880e87de567dc7e1.
Change-Id: Id12206370e36acb63dcbc3298d39eba093cb4be6
Reviewed-on: https://gerrit.libreoffice.org/39552
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv | 5 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java | 130 |
3 files changed, 0 insertions, 136 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index ab9a8c3e2fba..c2fc23cf8707 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -629,7 +629,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced \ qadevOOo/tests/java/ifc/sheet/_XScenarios \ qadevOOo/tests/java/ifc/sheet/_XScenariosSupplier \ - qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation \ qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \ qadevOOo/tests/java/ifc/sheet/_XSheetAnnotations \ qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv index fba2a0877540..5bfb8b6e1270 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationObj.csv @@ -7,10 +7,5 @@ "ScAnnotationObj";"com::sun::star::text::XTextRange";"getEnd()" "ScAnnotationObj";"com::sun::star::text::XTextRange";"getString()" "ScAnnotationObj";"com::sun::star::text::XTextRange";"setString()" -"ScAnnotationObj";"com::sun::star::sheet::XSheetAnnotation";"getPosition()" -"ScAnnotationObj";"com::sun::star::sheet::XSheetAnnotation";"getAuthor()" -"ScAnnotationObj";"com::sun::star::sheet::XSheetAnnotation";"getDate()" -"ScAnnotationObj";"com::sun::star::sheet::XSheetAnnotation";"getIsVisible()" -"ScAnnotationObj";"com::sun::star::sheet::XSheetAnnotation";"setIsVisible()" "ScAnnotationObj";"com::sun::star::container::XChild";"getParent()" "ScAnnotationObj";"com::sun::star::container::XChild";"setParent()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java deleted file mode 100644 index 232b5bd84560..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotation.java +++ /dev/null @@ -1,130 +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 lib.Status; -import lib.StatusException; -import util.ValueComparer; - -import com.sun.star.sheet.XSheetAnnotation; -import com.sun.star.table.CellAddress; -import com.sun.star.text.XSimpleText; -import com.sun.star.uno.UnoRuntime; - -/** -* Testing <code>com.sun.star.sheet.XSheetAnnotation</code> -* interface methods : -* <ul> -* <li><code> getPosition()</code></li> -* <li><code> getAuthor()</code></li> -* <li><code> getDate()</code></li> -* <li><code> getIsVisible()</code></li> -* <li><code> setIsVisible()</code></li> -* </ul> <p> -* This test needs the following object relations : -* <ul> -* <li> <code>'CELLPOS'</code> (of type -* <code>com.sun.star.table.CellAddress</code>): -* The position of cell with annotation. </li> -* <ul> <p> -* Test is <b> NOT </b> multithread compliant. <p> -* @see com.sun.star.sheet.XSheetAnnotation -*/ -public class _XSheetAnnotation extends MultiMethodTest { - - public XSheetAnnotation oObj = null; - - /** - * Gets the author of annotation. <p> - * Has <b>OK</b> status if not null value returned. - */ - public void _getAuthor() { - String author = oObj.getAuthor(); - tRes.tested("getAuthor()", author != null); - } - - /** - * Gets the modification date of annotation. <p> - * Has <b>OK</b> status if not null value returned. - */ - public void _getDate() { - String date = oObj.getDate(); - tRes.tested("getDate()", date != null); - } - - /** - * Sets the string of annotation, then makes it visible and - * checks the value returned by <code>getIsVisible</code> method. <p> - * Has <b>OK</b> status if the method returns <code>true</code>. - */ - public void _getIsVisible() { - XSimpleText oText = UnoRuntime.queryInterface(XSimpleText.class, oObj); - oText.setString("XSheetAnnotation"); - oObj.setIsVisible(true); - boolean bVis = oObj.getIsVisible(); - tRes.tested("getIsVisible()", bVis); - } - - /** - * Gets the position of annotated cell and compares it to - * the position passed as relation. <p> - * Has <b>OK</b> status if these positions are equal and not - * null. - */ - public void _getPosition() { - boolean bResult = false; - CellAddress sCAddr = (CellAddress) tEnv.getObjRelation("CELLPOS") ; - if (sCAddr == null) throw new StatusException(Status.failed - ("Relation 'CELLPOS' not found")); - - CellAddress oCAddr = oObj.getPosition(); - - bResult = (oCAddr != null) && - ValueComparer.equalValue(oCAddr, sCAddr) ; - - tRes.tested("getPosition()", bResult); - } - - /** - * Sets the string of annotation, makes it hidden and then - * visible. Visibility is checked in both cases. <p> - * Has <b>OK</b> status if the <code>getIsVisible</code> method - * returns <code>flase</code> in the first case and <code>true</code> - * in the second. - */ - public void _setIsVisible() { - boolean bResult = true; - XSimpleText oText = UnoRuntime.queryInterface(XSimpleText.class, oObj); - oText.setString("XSheetAnnotation"); - oObj.setIsVisible(false); - boolean bVis = oObj.getIsVisible(); - if (!bVis) { - oObj.setIsVisible(true); - bVis = oObj.getIsVisible(); - if (bVis) { - bResult = true; - } - } - - tRes.tested("setIsVisible()", bResult); - } - -} // EOC _XSheetAnnotation - |