[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
Jens Carl
j.carl43 at gmx.de
Mon Aug 21 04:33:05 UTC 2017
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv | 10
qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java | 150 ----------
3 files changed, 161 deletions(-)
New commits:
commit 76da9aea1c956a4febfd530a5a53e820c1440734
Author: Jens Carl <j.carl43 at gmx.de>
Date: Sun Aug 20 06:56:17 2017 +0000
tdf#45904 Remove/disable obsolete _XPrintAreas Java tests
The _XPrintAreas test are already written in C++ since commit
b9337e22ce1dbf2eba0e8c8db294ae99f4111f91.
Change-Id: I282ef018d96e824d73cedc83994dc998ff732b3b
Reviewed-on: https://gerrit.libreoffice.org/41350
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 05cc3458436b..c777ff48ee76 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -615,7 +615,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XLabelRanges \
qadevOOo/tests/java/ifc/sheet/_XMultipleOperation \
qadevOOo/tests/java/ifc/sheet/_XNamedRanges \
- qadevOOo/tests/java/ifc/sheet/_XPrintAreas \
qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \
qadevOOo/tests/java/ifc/sheet/_XScenario \
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 1504f50f7f9e..ce12322be8e2 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -150,16 +150,6 @@
"ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"IsVisible"
"ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"PageStyle"
"ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"AutomaticPrintArea#optional"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getPrintAreas()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"setPrintAreas()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getPrintTitleColumns()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"setPrintTitleColumns()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getTitleColumns()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"setTitleColumns()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getPrintTitleRows()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"setPrintTitleRows()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getTitleRows()"
-"ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"setTitleRows()"
"ScTableSheetObj";"com::sun::star::sheet::XSheetAnnotationsSupplier";"getAnnotations()"
"ScTableSheetObj";"com::sun::star::table::XTableChartsSupplier";"getCharts()"
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java
deleted file mode 100644
index 476479edaecf..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java
+++ /dev/null
@@ -1,150 +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.XPrintAreas;
-import com.sun.star.table.CellRangeAddress;
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-import util.ValueComparer;
-
-/**
- *
- */
-public class _XPrintAreas extends MultiMethodTest {
- public XPrintAreas oObj = null;
- CellRangeAddress address = null;
- CellRangeAddress subaddress = null;
- CellRangeAddress titleColumns;
- CellRangeAddress titleRows;
-
- @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 _getPrintAreas() {
- requiredMethod("getPrintTitleColumns()");
- requiredMethod("getPrintTitleRows()");
- executeMethod("getTitleColumns()");
- executeMethod("getTitleRows()");
- CellRangeAddress[] printAreas = oObj.getPrintAreas();
- CellRangeAddress[] setValue = new CellRangeAddress[]{address};
- boolean ret = ValueComparer.equalValue(printAreas, setValue);
- // delete the print area
- oObj.setPrintAreas(null);
- printAreas = oObj.getPrintAreas();
- ret &= printAreas.length == 0;
-
- tRes.tested("getPrintAreas()", ret);
- }
-
- public void _getPrintTitleColumns() {
- requiredMethod("setPrintTitleColumns()");
- tRes.tested("getPrintTitleColumns()", !oObj.getPrintTitleColumns());
- }
-
- public void _getPrintTitleRows() {
- requiredMethod("setPrintTitleRows()");
- tRes.tested("getPrintTitleRows()", !oObj.getPrintTitleRows());
- }
-
- public void _getTitleColumns() {
- requiredMethod("setTitleColumns()");
- CellRangeAddress setValue = oObj.getTitleColumns();
- tRes.tested("getTitleColumns()", ValueComparer.equalValue(setValue,titleColumns));
- }
-
- public void _getTitleRows() {
- requiredMethod("setTitleRows()");
- CellRangeAddress setValue = oObj.getTitleRows();
- tRes.tested("getTitleRows()", ValueComparer.equalValue(setValue,titleRows));
- }
-
- public void _setPrintAreas() {
- boolean ret = false;
- CellRangeAddress[]setValue = new CellRangeAddress[]{subaddress};
- oObj.setPrintAreas(setValue);
- CellRangeAddress[]newVal = oObj.getPrintAreas();
- ret = ValueComparer.equalValue(newVal, setValue);
- setValue = new CellRangeAddress[]{address};
- oObj.setPrintAreas(setValue);
- newVal = oObj.getPrintAreas();
- ret &= ValueComparer.equalValue(newVal, setValue);
- tRes.tested("setPrintAreas()", ret);
- }
-
- public void _setPrintTitleColumns() {
- requiredMethod("setTitleColumns()");
- boolean ret = false;
- boolean value = oObj.getPrintTitleColumns();
- oObj.setPrintTitleColumns(!value);
- ret = value != oObj.getPrintTitleColumns();
- oObj.setPrintTitleColumns(false);
- tRes.tested("setPrintTitleColumns()", ret);
- }
-
- public void _setPrintTitleRows() {
- requiredMethod("setTitleRows()");
- boolean ret = false;
- boolean value = oObj.getPrintTitleRows();
- oObj.setPrintTitleRows(!value);
- ret = value != oObj.getPrintTitleRows();
- oObj.setPrintTitleRows(false);
- tRes.tested("setPrintTitleRows()", ret);
- }
-
- public void _setTitleColumns() {
- requiredMethod("setPrintAreas()");
- boolean ret = false;
- CellRangeAddress newVal = oObj.getTitleColumns();
- ret = ValueComparer.equalValue(newVal, new CellRangeAddress((short)0, 0, 0, 0, 0));
- // use first row of range as title column
- titleColumns = new CellRangeAddress();
- titleColumns.Sheet = address.Sheet;
- titleColumns.StartColumn = address.StartColumn;
- titleColumns.StartRow = address.StartRow;
- titleColumns.EndColumn = address.EndColumn;
- titleColumns.EndRow = address.StartRow;
- oObj.setTitleColumns(titleColumns);
- tRes.tested("setTitleColumns()", ret);
- }
-
- public void _setTitleRows() {
- requiredMethod("setPrintAreas()");
- boolean ret = false;
- CellRangeAddress newVal = oObj.getTitleRows();
- ret = ValueComparer.equalValue(newVal, new CellRangeAddress((short)0, 0, 0, 0, 0));
- // use first column of range as title row
- titleRows = new CellRangeAddress();
- titleRows.Sheet = address.Sheet;
- titleRows.StartColumn = address.StartColumn;
- titleRows.StartRow = address.StartRow;
- titleRows.EndColumn = address.StartColumn;
- titleRows.EndRow = address.EndRow;
- oObj.setTitleColumns(titleRows);
- tRes.tested("setTitleRows()", ret);
- }
-
-}
More information about the Libreoffice-commits
mailing list