Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-65915] possible issue in boolean function support 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1898421 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-02-25 18:25:35 +00:00
parent ba252f20b5
commit 18a5720eeb
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
View File

@ -139,11 +139,14 @@ public abstract class BooleanFunction implements Function,ArrayFunction {
@Override @Override
public ValueEval evaluateArray(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { public ValueEval evaluateArray(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
if (args.length != 1) { if (args.length == 1) {
return ErrorEval.VALUE_INVALID; 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, return ErrorEval.VALUE_INVALID;
vA -> evaluate(new ValueEval[]{vA}, srcRowIndex, srcColumnIndex));
} }
private static ValueEval evaluateFalse(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { private static ValueEval evaluateFalse(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {

16
poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
View File

@ -23,6 +23,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.OperationEvaluationContext; import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.util.CellRangeAddress;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.IOException; import java.io.IOException;
@ -31,6 +32,7 @@ import static org.apache.poi.ss.util.Utils.addRow;
import static org.apache.poi.ss.util.Utils.assertBoolean; 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.assertDouble;
import static org.apache.poi.ss.util.Utils.assertString; import static org.apache.poi.ss.util.Utils.assertString;
import static org.junit.jupiter.api.Assertions.assertEquals;
/** /**
* Tests for {@link BooleanFunction#OR} * 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() { private HSSFWorkbook initWorkbook1() {
HSSFWorkbook wb = new HSSFWorkbook(); HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet(); HSSFSheet sheet = wb.createSheet();