Bug 64986: Support missing or blank match_type for function Match

Excel and LibreOffice use the default value in this case

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884959 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/poi/ss/formula/eval/ErrorEval.java

@@ -77,7 +77,7 @@ public final class ErrorEval implements ValueEval {
         return "~non~std~err(" + errorCode + ")~";
     }
 
-    private FormulaError _error;
+    private final FormulaError _error;
     private ErrorEval(FormulaError error) {
         _error = error;
         evals.put(error, this);

src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java

@@ -26,5 +26,5 @@ package org.apache.poi.ss.formula.eval;
  */
 public interface NumericValueEval extends ValueEval {
 
-    public abstract double getNumberValue();
+    double getNumberValue();
 }

src/java/org/apache/poi/ss/formula/functions/Match.java

@@ -18,8 +18,10 @@
 package org.apache.poi.ss.formula.functions;
 
 import org.apache.poi.ss.formula.TwoDEval;
+import org.apache.poi.ss.formula.eval.BlankEval;
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.MissingArgEval;
 import org.apache.poi.ss.formula.eval.NumberEval;
 import org.apache.poi.ss.formula.eval.NumericValueEval;
 import org.apache.poi.ss.formula.eval.OperandResolver;
@@ -177,7 +179,12 @@ public final class Match extends Var2or3ArgFunction {
 				throw new EvaluationException(ErrorEval.VALUE_INVALID);
 			}
 			// if the string parses as a number, it is OK
-			return d.doubleValue();
+			return d;
+		}
+		if (match_type instanceof MissingArgEval || match_type instanceof BlankEval) {
+			// Excel-Online ignores a missing match-type and
+			// uses the default-value instead
+			return 1;
 		}
 		throw new RuntimeException("Unexpected match_type type (" + match_type.getClass().getName() + ")");
 	}

src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java

@@ -119,7 +119,6 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
@@ -3638,4 +3637,28 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
             }
         }
     }
+
+    @Test
+    public void test64986() throws IOException {
+        XSSFWorkbook w = new XSSFWorkbook();
+        XSSFSheet s = w.createSheet();
+        XSSFRow r = s.createRow(0);
+        XSSFCell c = r.createCell(0);
+        c.setCellFormula("MATCH(\"VAL\",B1:B11,)");
+
+        FormulaEvaluator evaluator = w.getCreationHelper().createFormulaEvaluator();
+        CellValue value = evaluator.evaluate(c);
+        assertEquals(CellType.ERROR, value.getCellType());
+        assertEquals(ErrorEval.NA.getErrorCode(), value.getErrorValue());
+
+        // put a value in place so the match should find something
+        Cell val = r.createCell(1);
+        val.setCellValue("VAL");
+
+        // clear and check that now we find a match
+        evaluator.clearAllCachedResultValues();
+        value = evaluator.evaluate(c);
+        assertEquals(CellType.NUMERIC, value.getCellType());
+        assertEquals(1, value.getNumberValue(), 0.01);
+    }
 }