diff options
| -rw-r--r-- | poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java | 4 | ||||
| -rw-r--r-- | poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java index c471832703..bb7df1b287 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java @@ -170,6 +170,9 @@ public final class TestFormulaEvaluatorOnXSSF { @ParameterizedTest @MethodSource("data") void processFunctionRow(String targetFunctionName, int formulasRowIdx, int expectedValuesRowIdx) { + //DOLLAR function returns a string that is locale specific + assumeFalse(targetFunctionName.equalsIgnoreCase("DOLLAR")); + Row formulasRow = sheet.getRow(formulasRowIdx); Row expectedValuesRow = sheet.getRow(expectedValuesRowIdx); @@ -180,7 +183,6 @@ public final class TestFormulaEvaluatorOnXSSF { Cell c = formulasRow.getCell(colnum); assumeTrue(c != null); assumeTrue(c.getCellType() == CellType.FORMULA); - assumeFalse(targetFunctionName.equalsIgnoreCase("DOLLAR")); ignoredFormulaTestCase(c.getCellFormula()); CellValue actValue = evaluator.evaluate(c); diff --git a/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java index fc8d0b98af..4c22725b1e 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java +++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java @@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.util.ArrayList; import java.util.List; @@ -152,6 +153,9 @@ public final class TestFormulasFromSpreadsheet { @ParameterizedTest @MethodSource("data") void processFunctionRow(String targetFunctionName, int formulasRowIdx, int expectedValuesRowIdx) { + //DOLLAR function returns a string that is locale specific + assumeFalse(targetFunctionName.equalsIgnoreCase("DOLLAR")); + Row formulasRow = sheet.getRow(formulasRowIdx); Row expectedValuesRow = sheet.getRow(expectedValuesRowIdx); |