[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
Jens Carl
j.carl43 at gmx.de
Sun Aug 6 22:49:13 UTC 2017
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv | 1
qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java | 105 -------------
3 files changed, 107 deletions(-)
New commits:
commit a9a5a55e0284638deb87c69699ab37a456908900
Author: Jens Carl <j.carl43 at gmx.de>
Date: Sat Aug 5 05:42:39 2017 +0000
tdf#45904 Remove/disable obsolete _XGoalSeek Java test
The _XGoalSeek test is already written in C++ since commit
ce6f47a4588e2c6e115fcc4980f575d3002ca603.
Change-Id: I898bcbf5e41751610fdc3f40cf7d6f6094df68c4
Reviewed-on: https://gerrit.libreoffice.org/40785
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 f68fca900db2..3804778bf22e 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/_XEnhancedMouseClickBroadcaster \
qadevOOo/tests/java/ifc/sheet/_XFormulaQuery \
qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \
- qadevOOo/tests/java/ifc/sheet/_XGoalSeek \
qadevOOo/tests/java/ifc/sheet/_XHeaderFooterContent \
qadevOOo/tests/java/ifc/sheet/_XLabelRange \
qadevOOo/tests/java/ifc/sheet/_XLabelRanges \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
index fbd045be3319..97c52331d984 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
@@ -48,7 +48,6 @@
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
"ScModelObj";"com::sun::star::sheet::XDocumentAuditing";"refreshArrows()"
-"ScModelObj";"com::sun::star::sheet::XGoalSeek";"seekGoal()"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"NamedRanges"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"DatabaseRanges"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"ColumnLabelRanges"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
deleted file mode 100644
index 88b768361dd9..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
+++ /dev/null
@@ -1,105 +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.container.XIndexAccess;
-import com.sun.star.sheet.GoalResult;
-import com.sun.star.sheet.XGoalSeek;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.CellAddress;
-import com.sun.star.uno.UnoRuntime;
-import lib.MultiMethodTest;
-import lib.StatusException;
-
-/**
- *
- */
-public class _XGoalSeek extends MultiMethodTest {
- public XGoalSeek oObj = null;
- XSpreadsheet xSheet = null;
- CellAddress aFormula = null;
- CellAddress aValue = null;
-
- @Override
- public void before() {
- Exception ex = null;
- // get two sheets
- try {
- XSpreadsheetDocument xSpreadsheetDocument = UnoRuntime.queryInterface(XSpreadsheetDocument.class, oObj);
- XSpreadsheets oSheets = xSpreadsheetDocument.getSheets();
- XIndexAccess oIndexSheets = UnoRuntime.queryInterface(
- XIndexAccess.class, oSheets);
- xSheet = UnoRuntime.queryInterface(
- XSpreadsheet.class, oIndexSheets.getByIndex(1));
- }
- catch(com.sun.star.lang.IndexOutOfBoundsException e) {
- ex = e;
- }
- catch(com.sun.star.lang.WrappedTargetException e) {
- ex = e;
- }
- catch(NullPointerException e) {
- ex = e;
- }
- if (ex != null) {
- throw new StatusException("Could not get a sheet.", ex);
- }
-
- // set value and formula
- try {
- xSheet.getCellByPosition(3, 4).setValue(9);
- xSheet.getCellByPosition(3, 5).setFormula("= SQRT(D5)");
- aValue = new CellAddress((short)1, 3, 4);
- aFormula = new CellAddress((short)1, 3, 5);
- }
- catch(Exception e) {
- throw new StatusException("Could not get set formulas on the sheet.", e);
- }
- }
-
- public void _seekGoal() {
- boolean result = true;
- double divergence = 0.01;
- GoalResult goal = oObj.seekGoal(aFormula, aValue, "4");
- log.println("Goal Result: " + goal.Result + " Divergence: " + goal.Divergence);
- result &= goal.Divergence < divergence;
- result &= goal.Result > 16 - divergence || goal.Result < 16 + divergence;
-
- goal = oObj.seekGoal(aFormula, aValue, "-4");
- log.println("Goal Result: " + goal.Result + " Divergence: " + goal.Divergence);
- result &= goal.Divergence > 1/divergence;
- result &= goal.Result < divergence || goal.Result > -divergence;
-
- // just curious: let goal seek find a limiting value
- try {
- xSheet.getCellByPosition(3, 4).setValue(0.8);
- xSheet.getCellByPosition(3, 5).setFormula("= (D5 ^ 2 - 1) / (D5 - 1)");
- }
- catch(Exception e) {
- System.out.println("caught exception: " + e);
- }
- goal = oObj.seekGoal(aFormula, aValue, "2");
- log.println("Goal Result: " + goal.Result + " Divergence: " + goal.Divergence);
- result &= goal.Divergence < divergence;
- result &= goal.Result > 16 - divergence || goal.Result < 16 + divergence;
-
- tRes.tested("seekGoal()", result);
- }
-}
More information about the Libreoffice-commits
mailing list