diff options
author | Jens Carl <j.carl43@gmx.de> | 2018-03-27 06:22:00 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2018-03-28 03:28:30 +0200 |
commit | 3fc835b79957b4ace99c1dc9526eda7549020951 (patch) | |
tree | 0cbc6d401ac96e8eb45cc1b51cab5c467e1b10d1 /qadevOOo | |
parent | e32b4c8a079e4b51b1028d2467b872ff5b8cdd3a (diff) |
tdf#45904 Move _XCalculatable Java test to C++
Change-Id: Ib1fac049d2a135074de45c17fbaa78b0af2bec91
Reviewed-on: https://gerrit.libreoffice.org/51929
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.ScModelObj.csv | 4 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XCalculatable.java | 98 |
3 files changed, 0 insertions, 103 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 6e8f20b69683..1f9af86d89b6 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -569,7 +569,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \ qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \ qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \ - qadevOOo/tests/java/ifc/sheet/_XCalculatable \ qadevOOo/tests/java/ifc/sheet/_XCellRangeData \ qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \ qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement \ 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 a1f591442897..7509197e7665 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv @@ -33,10 +33,6 @@ "ScModelObj";"com::sun::star::document::XEventsSupplier#optional";"getEvents()" "ScModelObj";"com::sun::star::util::XModifiable";"isModified()" "ScModelObj";"com::sun::star::util::XModifiable";"setModified()" -"ScModelObj";"com::sun::star::sheet::XCalculatable";"calculate()" -"ScModelObj";"com::sun::star::sheet::XCalculatable";"calculateAll()" -"ScModelObj";"com::sun::star::sheet::XCalculatable";"isAutomaticCalculationEnabled()" -"ScModelObj";"com::sun::star::sheet::XCalculatable";"enableAutomaticCalculation()" "ScModelObj";"com::sun::star::beans::XPropertySet#optional";"getPropertySetInfo()" "ScModelObj";"com::sun::star::beans::XPropertySet#optional";"setPropertyValue()" "ScModelObj";"com::sun::star::beans::XPropertySet#optional";"getPropertyValue()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java deleted file mode 100644 index 260b452b131c..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java +++ /dev/null @@ -1,98 +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.XCalculatable; -import com.sun.star.table.XCell; -import lib.MultiMethodTest; -import lib.Status; -import lib.StatusException; - -/** - * - */ -public class _XCalculatable extends MultiMethodTest { - public XCalculatable oObj = null; - private boolean bIsAutomaticCalculationEnabled = false; - private XCell[] xCells = null; - - /** - * Get object relation: four cells with values and formulas. - * @see mod._sc.ScModelObj - */ - @Override - public void before() { - xCells = (XCell[])tEnv.getObjRelation("XCalculatable.Cells"); - if (xCells == null || xCells.length != 3) - throw new StatusException(Status.failed("Couldn't find correct object relation 'XCalculatable.Cells'")); - - } - - /** - * Restore begin setting - */ - @Override - public void after() { - // reset to begin value - oObj.enableAutomaticCalculation(bIsAutomaticCalculationEnabled); - } - - - public void _calculate() { - requiredMethod("isAutomaticCalculationEnabled()"); - boolean result = true; - double ergValue1 = xCells[2].getValue(); - double sourceValue1 = xCells[0].getValue(); - xCells[0].setValue(sourceValue1 +1); - double ergValue2 = xCells[2].getValue(); - result &= ergValue1 == ergValue2; - oObj.calculate(); - ergValue2 = xCells[2].getValue(); - result &= ergValue1 != ergValue2; - tRes.tested("calculate()", result); - } - - public void _calculateAll() { - requiredMethod("isAutomaticCalculationEnabled()"); - boolean result = true; - double ergValue1 = xCells[2].getValue(); - double sourceValue1 = xCells[0].getValue(); - xCells[0].setValue(sourceValue1 +1); - double ergValue2 = xCells[2].getValue(); - result &= ergValue1 == ergValue2; - oObj.calculateAll(); - ergValue2 = xCells[2].getValue(); - result &= ergValue1 != ergValue2; - oObj.calculateAll(); - tRes.tested("calculateAll()", result); - } - - public void _enableAutomaticCalculation() { - bIsAutomaticCalculationEnabled = oObj.isAutomaticCalculationEnabled(); - oObj.enableAutomaticCalculation(!bIsAutomaticCalculationEnabled); - tRes.tested("enableAutomaticCalculation()", true); - } - - public void _isAutomaticCalculationEnabled() { - requiredMethod("enableAutomaticCalculation()"); - boolean result = oObj.isAutomaticCalculationEnabled(); - oObj.enableAutomaticCalculation(false); - tRes.tested("isAutomaticCalculationEnabled()", result != bIsAutomaticCalculationEnabled); - } - -} |