diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-11-01 20:30:32 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2017-11-03 03:20:07 +0100 |
commit | 2416d69ad4fa26b65d5b05a8575ac96af6b2c9a9 (patch) | |
tree | 330ec8c0b083307d89390193282d5b7eabf994b2 /qadevOOo | |
parent | 8c374022790b54834fa54615e1953c8ee30641a8 (diff) |
tdf#45904 Move Java _XSheetCondition tests to C++
Change-Id: I013ccd0258a567ba69d624a02a4d4daab5c7f4fa
Reviewed-on: https://gerrit.libreoffice.org/44181
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Tested-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
4 files changed, 0 insertions, 166 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 570a69d29e79..e85731f3f3a9 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -621,7 +621,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSheetCellRange \ qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer \ qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges \ - qadevOOo/tests/java/ifc/sheet/_XSheetCondition \ qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries \ qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry \ qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv index 7666b1eecf78..5de029653f0c 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv @@ -1,10 +1,2 @@ "ScTableConditionalEntry";"com::sun::star::sheet::XSheetConditionalEntry";"getStyleName()" "ScTableConditionalEntry";"com::sun::star::sheet::XSheetConditionalEntry";"setStyleName()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"getOperator()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"setOperator()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"getFormula1()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"setFormula1()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"getFormula2()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"setFormula2()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"getSourcePosition()" -"ScTableConditionalEntry";"com::sun::star::sheet::XSheetCondition";"setSourcePosition()" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv index 5ee5e9d6f919..6ece7b010e7c 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv @@ -1,11 +1,3 @@ -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"getOperator()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"setOperator()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"getFormula1()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"setFormula1()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"getFormula2()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"setFormula2()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"getSourcePosition()" -"ScTableValidationObj";"com::sun::star::sheet::XSheetCondition";"setSourcePosition()" "ScTableValidationObj";"com::sun::star::sheet::TableValidation";"Type" "ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ShowInputMessage" "ScTableValidationObj";"com::sun::star::sheet::TableValidation";"InputTitle" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java deleted file mode 100644 index 79a287b20917..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCondition.java +++ /dev/null @@ -1,149 +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 lib.MultiMethodTest; -import util.ValueChanger; - -import com.sun.star.sheet.ConditionOperator; -import com.sun.star.sheet.XSheetCondition; -import com.sun.star.table.CellAddress; - -/** -* Testing <code>com.sun.star.sheet.XSheetCondition</code> -* interface methods : -* <ul> -* <li><code> getOperator()</code></li> -* <li><code> setOperator()</code></li> -* <li><code> getFormula1()</code></li> -* <li><code> setFormula1()</code></li> -* <li><code> getFormula2()</code></li> -* <li><code> setFormula2()</code></li> -* <li><code> getSourcePosition()</code></li> -* <li><code> setSourcePosition()</code></li> -* </ul> <p> -* @see com.sun.star.sheet.XSheetCondition -*/ -public class _XSheetCondition extends MultiMethodTest { - public XSheetCondition oObj = null; - public String Formula1 = null; - public String Formula2 = null; - public ConditionOperator Operator = null; - public CellAddress SourcePosition = null; - - /** - * Test calls the method, checks and stores returned value. <p> - * Has <b> OK </b> status if returned vakue isn't null. <p> - */ - public void _getFormula1() { - Formula1 = oObj.getFormula1(); - tRes.tested("getFormula1()", Formula1 != null); - } - - /** - * Test calls the method, checks and stores returned value. <p> - * Has <b> OK </b> status if returned vakue isn't null. <p> - */ - public void _getFormula2() { - Formula2 = oObj.getFormula2(); - tRes.tested("getFormula2()", Formula2 != null); - } - - /** - * Test calls the method, checks and stores returned value. <p> - * Has <b> OK </b> status if returned vakue isn't null. <p> - */ - public void _getOperator() { - Operator = oObj.getOperator(); - tRes.tested("getOperator()", Operator != null); - } - - /** - * Test calls the method, checks and stores returned value. <p> - * Has <b> OK </b> status if returned vakue isn't null. <p> - */ - public void _getSourcePosition() { - SourcePosition = oObj.getSourcePosition(); - tRes.tested("getSourcePosition()", SourcePosition != null); - } - - /** - * Test sets new value of formula1, gets formula1 again and compares - * returned value with value that was stored by method - * <code>getFormula1()</code>. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getFormula1() </code> : to have value of 'Formula1' </li> - * </ul> - */ - public void _setFormula1() { - requiredMethod("getFormula1()"); - oObj.setFormula1("$Sheet1.$C$" + Thread.activeCount()); - tRes.tested("setFormula1()", !Formula1.equals( oObj.getFormula1() ) ); - } - - /** - * Test sets new value of formula2, gets formula2 again and compares - * returned value with value that was stored by method - * <code>getFormula2()</code>. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getFormula2() </code> : to have value of 'Formula2' </li> - * </ul> - */ - public void _setFormula2() { - requiredMethod("getFormula2()"); - oObj.setFormula2("$Sheet1.$A$" + Thread.activeCount()); - tRes.tested("setFormula2()", !Formula2.equals( oObj.getFormula2() ) ); - } - - /** - * Test sets new value of operator, gets operator and compares - * returned value with value that was set. <p> - * Has <b> OK </b> status if values aren't equal. <p> - */ - public void _setOperator() { - oObj.setOperator(ConditionOperator.BETWEEN); - tRes.tested("setOperator()", !Operator.equals( oObj.getOperator() ) ); - } - - /** - * Test change value that was stored by method - * <code>getSourcePosition()</code>, sets this new value, gets source - * position again and compares returned value with value that was set. <p> - * Has <b> OK </b> status if values aren't equal. <p> - * The following method tests are to be completed successfully before : - * <ul> - * <li> <code> getSourcePosition() </code> : to have value of source - * position </li> - * </ul> - */ - public void _setSourcePosition() { - requiredMethod("getSourcePosition()"); - oObj.setSourcePosition( - (CellAddress)ValueChanger.changePValue(SourcePosition)); - tRes.tested( - "setSourcePosition()", - !SourcePosition.equals( oObj.getSourcePosition() ) ); - } - -} // finish class _XSheetCondition - |