Author: fanningpj
Date: Fri Feb 25 18:25:35 2022
New Revision: 1898421
URL: http://svn.apache.org/viewvc?rev=1898421&view=rev
Log:
[bug-65915] possible issue in boolean function support
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java?rev=1898421&r1=1898420&r2=1898421&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
Fri Feb 25 18:25:35 2022
@@ -139,11 +139,14 @@ public abstract class BooleanFunction im
@Override
public ValueEval evaluateArray(ValueEval[] args, int srcRowIndex, int
srcColumnIndex) {
- if (args.length != 1) {
- return ErrorEval.VALUE_INVALID;
+ if (args.length == 1) {
+ return evaluateOneArrayArg(args[0], srcRowIndex, srcColumnIndex,
+ vA -> evaluate(new ValueEval[]{vA}, srcRowIndex,
srcColumnIndex));
+ } else if (args.length == 2) {
+ return evaluateTwoArrayArgs(args[0], args[1], srcRowIndex,
srcColumnIndex,
+ (vA, vB) -> evaluate(new ValueEval[]{vA, vB}, srcRowIndex,
srcColumnIndex));
}
- return evaluateOneArrayArg(args[0], srcRowIndex, srcColumnIndex,
- vA -> evaluate(new ValueEval[]{vA}, srcRowIndex,
srcColumnIndex));
+ return ErrorEval.VALUE_INVALID;
}
private static ValueEval evaluateFalse(ValueEval[] args, int srcRowIndex,
int srcColumnIndex) {
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java?rev=1898421&r1=1898420&r2=1898421&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
Fri Feb 25 18:25:35 2022
@@ -23,6 +23,7 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.util.CellRangeAddress;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -31,6 +32,7 @@ import static org.apache.poi.ss.util.Uti
import static org.apache.poi.ss.util.Utils.assertBoolean;
import static org.apache.poi.ss.util.Utils.assertDouble;
import static org.apache.poi.ss.util.Utils.assertString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link BooleanFunction#OR}
@@ -88,6 +90,20 @@ final class TestOrFunction {
}
}
+ @Test
+ void testBug65915ArrayFunction() throws IOException {
+ //https://bz.apache.org/bugzilla/show_bug.cgi?id=65915
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ HSSFSheet sheet = wb.createSheet();
+ HSSFRow row = sheet.createRow(0);
+ HSSFCell cell = row.createCell(0);
+ sheet.setArrayFormula("INDEX({1},1,IF(OR(FALSE,FALSE),1,1))", new
CellRangeAddress(0, 0, 0, 0));
+ fe.evaluateAll();
+ assertEquals(1.0, cell.getNumericCellValue());
+ }
+ }
+
private HSSFWorkbook initWorkbook1() {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
