summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2017-08-22 06:13:04 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-23 23:38:50 +0200
commit494b7089b741c2944f72e2e4e9ea68aa500eb2d1 (patch)
tree19ff34d573e5465e3380c735f44339da0c16918f
parentda25c627f71eede6256b629336bf3fe30d89ace5 (diff)
tdf#45904 Remove/disable obsolete _XSheetOutline Java tests
The _XSheetOutline tests are already written in C++ since commit b9337e22ce1dbf2eba0e8c8db294ae99f4111f91. Change-Id: I0803df8dec6fd2f18e89c7bd8b8d15d0e4ee4aa2 Reviewed-on: https://gerrit.libreoffice.org/41408 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv7
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java137
3 files changed, 0 insertions, 145 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index a1ed436b45ff..0360b4f288eb 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -633,7 +633,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor \
qadevOOo/tests/java/ifc/sheet/_XSheetLinkable \
qadevOOo/tests/java/ifc/sheet/_XSheetOperation \
- qadevOOo/tests/java/ifc/sheet/_XSheetOutline \
qadevOOo/tests/java/ifc/sheet/_XSheetPageBreak \
qadevOOo/tests/java/ifc/sheet/_XSpreadsheet \
qadevOOo/tests/java/ifc/sheet/_XSpreadsheetDocument \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index ce12322be8e2..2dbb627cf654 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -27,13 +27,6 @@
"ScTableSheetObj";"com::sun::star::util::XSearchable";"findAll()"
"ScTableSheetObj";"com::sun::star::util::XSearchable";"findFirst()"
"ScTableSheetObj";"com::sun::star::util::XSearchable";"findNext()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"group()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"ungroup()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"autoOutline()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"clearOutline()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"hideDetail()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"showDetail()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetOutline";"showLevel()"
"ScTableSheetObj";"com::sun::star::table::XColumnRowRange";"getColumns()"
"ScTableSheetObj";"com::sun::star::table::XColumnRowRange";"getRows()"
"ScTableSheetObj";"com::sun::star::sheet::XSheetFilterable";"createFilterDescriptor()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java
deleted file mode 100644
index 7471ea4a6df4..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java
+++ /dev/null
@@ -1,137 +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 com.sun.star.sheet.XCellRangesQuery;
-import com.sun.star.sheet.XSheetCellRanges;
-import lib.MultiMethodTest;
-
-import com.sun.star.sheet.XSheetOutline;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.table.TableOrientation;
-import com.sun.star.uno.UnoRuntime;
-import lib.Status;
-import lib.StatusException;
-
-/**
- *
- */
-public class _XSheetOutline extends MultiMethodTest {
- public XSheetOutline oObj = null;
- CellRangeAddress address = null;
- CellRangeAddress subaddress = null;
-
- @Override
- public void before() {
- address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress");
- subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress");
- if (address == null)
- throw new StatusException(Status.failed("Object relation CellRangeAddress not found"));
- if (subaddress == null)
- throw new StatusException(Status.failed("Object relation CellRangeSubAddress not found"));
- }
-
- public void _autoOutline() {
- executeMethod("ungroup()");
- boolean result = false;
- oObj.autoOutline(address);
- // initially the range is grouped and shown
- result = isCellShown(subaddress);
- oObj.hideDetail(address);
- // here only a part of the address is hidden: subaddress must be that part
- result &= !isCellShown(subaddress);
- tRes.tested("autoOutline()", result);
- }
-
- public void _clearOutline() {
- executeMethod("autoOutline()");
- boolean result = false;
- oObj.clearOutline();
- result = isCellShown(subaddress);
- oObj.hideDetail(address);
- result &= isCellShown(subaddress);
- tRes.tested("clearOutline()", result);
- }
-
- public void _group() {
- oObj.group(address, TableOrientation.COLUMNS);
- oObj.group(address, TableOrientation.ROWS);
- tRes.tested("group()", true);
- }
-
- public void _ungroup() {
- executeMethod("showDetail()");
- oObj.ungroup(address, TableOrientation.COLUMNS);
- oObj.ungroup(address, TableOrientation.ROWS);
- oObj.hideDetail(address);
- tRes.tested("ungroup()", isCellShown(address));
- }
-
- public void _hideDetail() {
- requiredMethod("group()");
- oObj.hideDetail(address);
- tRes.tested("hideDetail()", !isCellShown(address));
- }
-
- public void _showDetail() {
- executeMethod("showLevel()");
- oObj.showDetail(address);
- tRes.tested("showDetail()", isCellShown(address));
- }
-
- public void _showLevel() {
- executeMethod("hideDetail()");
- boolean result = false;
- oObj.showLevel((short)2, TableOrientation.COLUMNS);
- oObj.showLevel((short)2, TableOrientation.ROWS);
- result = isCellShown(address);
- oObj.showLevel((short)0, TableOrientation.COLUMNS);
- oObj.showLevel((short)0, TableOrientation.ROWS);
-
- result &= !isCellShown(address);
- tRes.tested("showLevel()", result);
- }
-
- private boolean isCellShown(CellRangeAddress range) {
- boolean isNotShown = true;
- XCellRangesQuery xCellRangesQuery = UnoRuntime.queryInterface(XCellRangesQuery.class, oObj);
- if (xCellRangesQuery != null) {
- XSheetCellRanges xRanges = xCellRangesQuery.queryVisibleCells();
- CellRangeAddress[] visibleRanges = xRanges.getRangeAddresses();
- for (int i=0; i<visibleRanges.length; i++) {
- isNotShown &= dotIsOutsideRange(range.StartRow, range.StartColumn, visibleRanges[i]);
- isNotShown &= dotIsOutsideRange(range.StartRow, range.EndColumn, visibleRanges[i]);
- isNotShown &= dotIsOutsideRange(range.EndRow, range.StartColumn, visibleRanges[i]);
- isNotShown &= dotIsOutsideRange(range.EndRow, range.EndColumn, visibleRanges[i]);
- log.println(isNotShown?"\tisOutSide":"\tisInside");
- }
- }
- return !isNotShown;
- }
-
- private boolean dotIsOutsideRange(int dotRow, int dotColumn, CellRangeAddress range) {
- log.println("Checking dot(" + dotRow + "," + dotColumn + ") against row["
- + range.StartRow + ":" + range.EndRow + "] column["
- + range.StartColumn + ":" + range.EndColumn + "]");
- boolean isInside = true;
- if (dotRow >= range.StartRow && dotRow <= range.EndRow)
- if (dotColumn >= range.StartColumn && dotColumn <= range.EndColumn)
- isInside = false;
- return isInside;
- }
-}