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/05 18:54:59 UTC
svn commit: r1895602 - in /poi/trunk/poi/src: main/java/org/apache/poi/ss/formula/functions/LookupUtils.java test/java/org/apache/poi/ss/formula/atp/TestXLookupFunction.java
Author: fanningpj
Date: Sun Dec 5 18:54:58 2021
New Revision: 1895602
URL: http://svn.apache.org/viewvc?rev=1895602&view=rev
Log:
fix broken xlookup test
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestXLookupFunction.java
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=1895602&r1=1895601&r2=1895602&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 Sun Dec 5 18:54:58 2021
@@ -760,7 +760,10 @@ public final class LookupUtils {
break;
}
if (result.isTypeMismatch()) {
- handleMidValueTypeMismatch(lookupComparer, vector, bsi, i, reverse);
+ int newIdx = handleMidValueTypeMismatch(lookupComparer, vector, bsi, i, reverse);
+ if (newIdx >= 0) {
+ return newIdx;
+ }
} else if (reverse) {
bsi.narrowSearch(i, result.isGreaterThan());
} else {
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestXLookupFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestXLookupFunction.java?rev=1895602&r1=1895601&r2=1895602&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestXLookupFunction.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestXLookupFunction.java Sun Dec 5 18:54:58 2021
@@ -127,8 +127,7 @@ public class TestXLookupFunction {
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = wb.getSheetAt(0).getRow(1).createCell(6);
assertDouble(fe, cell, "XLOOKUP(E2,C2:C7,B2:B7,0,1,-2)", 0.37);
- //TODO next assertion is not working and needs investigation
- //assertDouble(fe, cell, "XLOOKUP(9700,C2:C7,B2:B7,0,0,-2)", 0.1);
+ assertDouble(fe, cell, "XLOOKUP(9700,C2:C7,B2:B7,0,0,-2)", 0.1);
assertDouble(fe, cell, "XLOOKUP(39474,C2:C7,B2:B7,0,0,-2)", 0);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org