From d6e6f426f52f989642da783a5322647ea31685ed Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Sat, 4 Sep 2010 09:48:34 +0000 Subject: [PATCH] fixed LEFT and RIGHT to return #VALUE! when called with a negative operand, see Bugzilla 49841 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@992570 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../formula/functions/TextFunction.java | 6 +- .../formula/functions/TestLeftRight.java | 73 +++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 7668ebc6f6..40ad949571 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 49841 - fixed LEFT and RIGHT to return #VALUE! when called with a negative operand 49783 - fixed evaluation of XSSF workbooks containing formulas with reference errors (#REF!) 49751 - fixed fetching names of user defined styles in HSSFCellStyle.getUserStyleName() 48900 - support for protecting a XSSF workbook diff --git a/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java b/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java index 6e7e83a8c3..6a2206f13e 100644 --- a/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java +++ b/src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java @@ -173,7 +173,11 @@ public abstract class TextFunction implements Function { } catch (EvaluationException e) { return e.getErrorEval(); } - + + if(index < 0) { + return ErrorEval.VALUE_INVALID; + } + String result; if (_isLeft) { result = arg.substring(0, Math.min(arg.length(), index)); diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java new file mode 100644 index 0000000000..055e493680 --- /dev/null +++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java @@ -0,0 +1,73 @@ +/* ==================================================================== + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + +package org.apache.poi.hssf.record.formula.functions; + +import org.apache.poi.hssf.record.formula.eval.ErrorEval; +import org.apache.poi.hssf.record.formula.eval.NumberEval; +import org.apache.poi.hssf.record.formula.eval.StringEval; +import org.apache.poi.hssf.record.formula.eval.ValueEval; + +import junit.framework.TestCase; + +/** + * + * Test cases for {@link TextFunction#LEFT} and {@link TextFunction#RIGHT} + * + * @author Brendan Nolan + * + */ +public class TestLeftRight extends TestCase { + + private static final NumberEval NEGATIVE_OPERAND = new NumberEval(-1.0); + private static final StringEval ANY_STRING_VALUE = new StringEval("ANYSTRINGVALUE"); + + + private static ValueEval invokeLeft(ValueEval text, ValueEval operand) { + ValueEval[] args = new ValueEval[] { text, operand }; + return TextFunction.LEFT.evaluate(args, -1, (short)-1); + } + + private static ValueEval invokeRight(ValueEval text, ValueEval operand) { + ValueEval[] args = new ValueEval[] { text, operand }; + return TextFunction.RIGHT.evaluate(args, -1, (short)-1); + } + + public void testLeftRight_bug49841() { + + try { + invokeLeft(ANY_STRING_VALUE, NEGATIVE_OPERAND); + invokeRight(ANY_STRING_VALUE, NEGATIVE_OPERAND); + } catch (StringIndexOutOfBoundsException e) { + fail("Identified bug 49841"); + } + + } + + public void testLeftRightNegativeOperand() { + + assertEquals(ErrorEval.VALUE_INVALID, invokeRight(ANY_STRING_VALUE, NEGATIVE_OPERAND)); + assertEquals(ErrorEval.VALUE_INVALID, invokeLeft(ANY_STRING_VALUE, NEGATIVE_OPERAND)); + + } + + + + + + +}