You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/12/29 22:00:44 UTC
svn commit: r1896513 - in /poi/trunk: poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
Author: fanningpj
Date: Wed Dec 29 22:00:43 2021
New Revision: 1896513
URL: http://svn.apache.org/viewvc?rev=1896513&view=rev
Log:
fix tests
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java?rev=1896513&r1=1896512&r2=1896513&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java Wed Dec 29 22:00:43 2021
@@ -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());
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java?rev=1896513&r1=1896512&r2=1896513&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/OperatorEnum.java Wed Dec 29 22:00:43 2021
@@ -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;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java?rev=1896513&r1=1896512&r2=1896513&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java Wed Dec 29 22:00:43 2021
@@ -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++;
}
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org