diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-08-20 06:26:57 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-21 06:29:32 +0200 |
commit | 557ad5279a29aa89101286dd76fcc669ac4548b9 (patch) | |
tree | 78f98b5951aaf2db33f5a7ea0942e7ce7e2dc48e /qadevOOo | |
parent | 5b517e43e21885bb0cf4342865d70218b2298ec8 (diff) |
tdf#45904 Remove/disable obsolete _XNamedRange tests
The _XNamedRange tests are already written in C++ since commit
b9337e22ce1dbf2eba0e8c8db294ae99f4111f91.
Change-Id: I0b19653f99de108e76999629927260f1cfddeb8a
Reviewed-on: https://gerrit.libreoffice.org/41348
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-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.ScNamedRangeObj.csv | 6 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XNamedRange.java | 201 |
3 files changed, 0 insertions, 208 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index dbf725e84c1f..05cc3458436b 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -614,7 +614,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XLabelRange \ qadevOOo/tests/java/ifc/sheet/_XLabelRanges \ qadevOOo/tests/java/ifc/sheet/_XMultipleOperation \ - qadevOOo/tests/java/ifc/sheet/_XNamedRange \ qadevOOo/tests/java/ifc/sheet/_XNamedRanges \ qadevOOo/tests/java/ifc/sheet/_XPrintAreas \ qadevOOo/tests/java/ifc/sheet/_XRangeSelection \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv index 98e1beeccd8a..a022a86eb032 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangeObj.csv @@ -1,9 +1,3 @@ "ScNamedRangeObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()" "ScNamedRangeObj";"com::sun::star::container::XNamed";"getName()" "ScNamedRangeObj";"com::sun::star::container::XNamed";"setName()" -"ScNamedRangeObj";"com::sun::star::sheet::XNamedRange";"getContent()" -"ScNamedRangeObj";"com::sun::star::sheet::XNamedRange";"setContent()" -"ScNamedRangeObj";"com::sun::star::sheet::XNamedRange";"getReferencePosition()" -"ScNamedRangeObj";"com::sun::star::sheet::XNamedRange";"setReferencePosition()" -"ScNamedRangeObj";"com::sun::star::sheet::XNamedRange";"getType()" -"ScNamedRangeObj";"com::sun::star::sheet::XNamedRange";"setType()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java deleted file mode 100644 index 110a0b03f6bd..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java +++ /dev/null @@ -1,201 +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 java.util.Random; -import java.util.StringTokenizer; - -import lib.MultiMethodTest; - -import com.sun.star.sheet.NamedRangeFlag; -import com.sun.star.sheet.XNamedRange; -import com.sun.star.table.CellAddress; - -/** -* Testing <code>com.sun.star.sheet.XNamedRange</code> -* interface methods : -* <ul> -* <li><code> getContent()</code></li> -* <li><code> setContent()</code></li> -* <li><code> getReferencePosition()</code></li> -* <li><code> setReferencePosition()</code></li> -* <li><code> getType()</code></li> -* <li><code> setType()</code></li> -* </ul> <p> -* After test completion object environment has to be recreated. -* @see com.sun.star.sheet.XNamedRange -*/ -public class _XNamedRange extends MultiMethodTest { - - public XNamedRange oObj = null; - String sContent = ""; - int type = 0; - CellAddress CA = null; - - /** - * Test calls the method and compares returned value to value that was set - * by method <code>setContent()</code>. <p> - * Has <b> OK </b> status if values are equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> setContent() </code> : to have current content </li> - * </ul> - */ - public void _getContent() { - requiredMethod("setContent()"); - String content = oObj.getContent(); - log.println("Returned content is \"" + content + "\""); - boolean bResult = content.equals(sContent); - tRes.tested("getContent()", bResult); - } - - /** - * Test creates and stores random content and calls the method. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _setContent() { - sContent = getRandomContent("A1;A4:C5;=B2"); - log.println("Set content to \"" + sContent + "\""); - oObj.setContent(sContent); - - tRes.tested("setContent()", true); - } - - /** - * Test calls the method and compares returned value to value that was set - * by method <code>setType()</code>. <p> - * Has <b> OK </b> status if values are equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> setType() </code> : to have current type </li> - * </ul> - */ - public void _getType() { - requiredMethod("setType()"); - - int rtype = oObj.getType(); - log.println("Returned type is " + rtype); - - tRes.tested("getType()", type == rtype); - } - - /** - * Test sets random type and stores it. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _setType() { - /* - * The type must be 0 or a combination of the NamedRangeFlag - * constants and controls if the named range is listed in - * dialogs prompting for special ranges - * - * NamedRangeFlag: COLUMN_HEADER - * FILTER_CRITERIA - * PRINT_AREA - * ROW_HEADER - * - */ - boolean bResult = true; - int types[] = { 0, - NamedRangeFlag.COLUMN_HEADER, - NamedRangeFlag.FILTER_CRITERIA, - NamedRangeFlag.PRINT_AREA, - NamedRangeFlag.ROW_HEADER - }; - - Random rnd = new Random(); - type = types[rnd.nextInt(5)]; - - oObj.setType(type); - log.println("The type was set to " + type); - - tRes.tested("setType()", bResult); - } - - /** - * Test calls the method and compares returned value to value that was set - * by method <code>setReferencePosition()</code>. <p> - * Has <b> OK </b> status if all fields of values are equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> setReferencePosition() </code> : to have current reference - * position </li> - * </ul> - */ - public void _getReferencePosition() { - requiredMethod("setReferencePosition()"); - - CellAddress rCA = oObj.getReferencePosition(); - log.println("getReferencePosition returned (" + - rCA.Sheet + ", " + - rCA.Column + ", " + rCA.Row + ")" ); - - boolean bResult = rCA.Sheet == CA.Sheet; - bResult &= rCA.Column == CA.Column; - bResult &= rCA.Row == CA.Row; - - tRes.tested("getReferencePosition()", bResult); - } - - /** - * Test creates and stores cell address and calls the method. <p> - * Has <b> OK </b> status if the method successfully returns. <p> - */ - public void _setReferencePosition() { - CA = new CellAddress((short)0, 2, 3); - oObj.setReferencePosition(CA); - log.println("ReferencePosition was set to (" + - CA.Sheet + ", " + - CA.Column + ", " + CA.Row + ")"); - - tRes.tested("setReferencePosition()", true); - } - - - /** - * Method make string of random content. - * @return string of random content - */ - String getRandomContent(String str) { - - String gRS = "none"; - Random rnd = new Random(); - - StringTokenizer ST = new StringTokenizer(str, ";"); - int nr = rnd.nextInt(ST.countTokens()); - if (nr < 1) nr++; - - for (int i = 1; i < nr + 1; i++) - gRS = ST.nextToken(); - - return gRS; - - } - - /** - * Forces object environment recreation. - */ - @Override - protected void after() { - disposeEnvironment(); - } - -} - - |