diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-11-11 01:34:27 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2017-11-24 18:59:02 +0100 |
commit | befef6ff30f4eb6d3c61c1542839661d7f823dc4 (patch) | |
tree | fc73a6047db038b781318746ceeb6eade9569a38 /qadevOOo | |
parent | add intro-highres.png to list of brandables in configure (diff) | |
download | core-befef6ff30f4eb6d3c61c1542839661d7f823dc4.tar.gz core-befef6ff30f4eb6d3c61c1542839661d7f823dc4.zip |
tdf#45904 Move _XSheetAnnotationAnchor Java test to C++
Fixes #i109517 for sc.ScCellObj by adding a note/comment during
the set up of the test in sccellobj.cxx and allows to re-enabled
the test.
Change-Id: Ic7aa6bcb2606f555a76612a6f50c200d738674db
Reviewed-on: https://gerrit.libreoffice.org/44617
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv | 1 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java | 121 |
3 files changed, 0 insertions, 123 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 4ee5633c5650..0064c67a5dcf 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -609,7 +609,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XRangeSelection \ qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \ qadevOOo/tests/java/ifc/sheet/_XScenario \ - qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \ qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv index ef1c845ab31b..a844cd884d23 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv @@ -152,7 +152,6 @@ "ScCellObj";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getDirectPropertyValuesTolerant()" "ScCellObj";"com::sun::star::text::XTextFieldsSupplier";"getTextFields()" "ScCellObj";"com::sun::star::text::XTextFieldsSupplier";"getTextFieldMasters()" -"ScCellObj";"com::sun::star::sheet::XSheetAnnotationAnchor";"getAnnotation()" "ScCellObj";"com::sun::star::style::CharacterProperties";"CharFontName" "ScCellObj";"com::sun::star::style::CharacterProperties";"CharFontStyleName" "ScCellObj";"com::sun::star::style::CharacterProperties";"CharFontFamily" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java deleted file mode 100644 index 8c33d9f4542e..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java +++ /dev/null @@ -1,121 +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.XSheetAnnotation; -import com.sun.star.sheet.XSheetAnnotationAnchor; -import com.sun.star.table.CellAddress; -import com.sun.star.text.XSimpleText; -import com.sun.star.uno.UnoRuntime; - -/** -* Testing <code>com.sun.star.sheet.XSheetAnnotationAnchor</code> -* interface methods : -* <ul> -* <li><code> getAnnotation()</code></li> -* </ul> -* @see com.sun.star.sheet.XSheetAnnotationAnchor -*/ -public class _XSheetAnnotationAnchor extends MultiMethodTest { - - public XSheetAnnotationAnchor oObj = null; - protected XSheetAnnotation anno = null; - - public void _getAnnotation() { - anno = oObj.getAnnotation(); - tRes.tested("getAnnotation()",checkAnnotation()); - } - - protected boolean checkAnnotation() { - boolean res = true; - res &= check_getAuthor(); - res &= check_getDate(); - res &= check_getIsVisible(); - res &= check_getPosition(); - res &= check_setIsVisible(); - return res; - } - - /** - * Gets the author of annotation. <p> - * Returns <b>true</b> if not null value returned. - */ - protected boolean check_getAuthor() { - String author = anno.getAuthor(); - return (author != null); - } - - /** - * Gets the modification date of annotation. <p> - * Returns <b>true</b> if not null value returned. - */ - protected boolean check_getDate() { - String date = anno.getDate(); - return (date != null); - } - - /** - * Sets the string of annotation, then makes it visible and - * checks the value returned by <code>getIsVisible</code> method. <p> - * Returns <b>true</b> if the method returns <code>true</code>. - */ - protected boolean check_getIsVisible() { - XSimpleText oText = UnoRuntime.queryInterface(XSimpleText.class, anno); - oText.setString("XSheetAnnotation"); - anno.setIsVisible(true); - boolean bVis = anno.getIsVisible(); - return bVis; - } - - /** - * Gets the position of annotated cell - * Returns <b>true</b> if this position is not null. - */ - protected boolean check_getPosition() { - CellAddress oCAddr = anno.getPosition(); - return (oCAddr != null); - } - - /** - * Sets the string of annotation, makes it hidden and then - * visible. Visibility is checked in both cases. <p> - * Returns <b>true</b> if the <code>getIsVisible</code> method - * returns <code>false</code> in the first case and <code>true</code> - * in the second. - */ - protected boolean check_setIsVisible() { - boolean bResult = true; - XSimpleText oText = UnoRuntime.queryInterface(XSimpleText.class, anno); - oText.setString("XSheetAnnotation"); - anno.setIsVisible(false); - boolean bVis = anno.getIsVisible(); - if (!bVis) { - anno.setIsVisible(true); - bVis = anno.getIsVisible(); - if (bVis) { - bResult = true; - } - } - - return bResult; - } - -}
\ No newline at end of file |