pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896513 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-12-29 22:00:43 +00:00
parent efe404a2c7
commit 8210bdb0c8
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
View File

@ -80,8 +80,8 @@ class TestVlookup {
Cell cell = row.createCell(0);
cell.setCellFormula("vlookup(A2,B1:B5,2,false)");
CreationHelper crateHelper = wb.getCreationHelper();
FormulaEvaluator eval = crateHelper.createFormulaEvaluator();
CreationHelper createHelper = wb.getCreationHelper();
FormulaEvaluator eval = createHelper.createFormulaEvaluator();
CellValue value = eval.evaluate(cell);
assertFalse(value.getBooleanValue());
@ -97,8 +97,8 @@ class TestVlookup {
Cell cell = row.createCell(0);
cell.setCellFormula("vlookup(A2,B1:B5,2,)");
CreationHelper crateHelper = wb.getCreationHelper();
FormulaEvaluator eval = crateHelper.createFormulaEvaluator();
CreationHelper createHelper = wb.getCreationHelper();
FormulaEvaluator eval = createHelper.createFormulaEvaluator();
CellValue value = eval.evaluate(cell);
assertFalse(value.getBooleanValue());
@ -114,8 +114,8 @@ class TestVlookup {
Cell cell = row.createCell(0);
cell.setCellFormula("vlookup(A2,B1:B5,,)");
CreationHelper crateHelper = wb.getCreationHelper();
FormulaEvaluator eval = crateHelper.createFormulaEvaluator();
CreationHelper createHelper = wb.getCreationHelper();
FormulaEvaluator eval = createHelper.createFormulaEvaluator();
CellValue value = eval.evaluate(cell);
assertFalse(value.getBooleanValue());
@ -131,8 +131,8 @@ class TestVlookup {
Cell cell = row.createCell(0);
cell.setCellFormula("vlookup(A2,,,)");
CreationHelper crateHelper = wb.getCreationHelper();
FormulaEvaluator eval = crateHelper.createFormulaEvaluator();
CreationHelper createHelper = wb.getCreationHelper();
FormulaEvaluator eval = createHelper.createFormulaEvaluator();
CellValue value = eval.evaluate(cell);
assertFalse(value.getBooleanValue());

3
poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java
View File

@ -131,8 +131,7 @@ enum OperatorEnum {
if (v1 == null) {
return true; // non-null not equal null, returns true
}
// need to avoid instanceof, to work around a 1.6 compiler bug
if (cellValue.getClass() == String.class) {
if (cellValue instanceof String) {
return cellValue.toString().compareToIgnoreCase(v1.toString()) == 0;
}
return cellValue.compareTo(v1) != 0;

5
poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
View File

@ -123,9 +123,8 @@ public final class LookupUtils {
@Override
public Integer next() {
pos++;
if (pos > getSize()) throw new NoSuchElementException();
return pos;
if (!hasNext()) throw new NoSuchElementException();
return pos++;
}
};
}