You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/12/24 18:42:38 UTC
svn commit: r1884783 [32/40] - in /poi:
site/src/documentation/content/xdocs/ trunk/ trunk/sonar/
trunk/sonar/integration-test/ trunk/sonar/ooxml/
trunk/src/excelant/poi-ant-contrib/
trunk/src/excelant/testcases/org/apache/poi/ss/excelant/ trunk/src/ex...
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,10 @@
package org.apache.poi.ss.formula.function;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.lang.reflect.InvocationTargetException;
@@ -26,9 +28,9 @@ import org.apache.poi.hssf.HSSFTestDataS
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.RecordFormatException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests reading from a sample spreadsheet some built-in functions that were not properly
@@ -44,7 +46,7 @@ public final class TestReadMissingBuiltI
private static HSSFWorkbook wb;
private static HSSFSheet _sheet;
- @BeforeClass
+ @BeforeAll
public static void initSheet() {
wb = HSSFTestDataSamples.openSampleWorkbook(SAMPLE_SPREADSHEET_FILE_NAME);
try {
@@ -54,9 +56,8 @@ public final class TestReadMissingBuiltI
InvocationTargetException ite = (InvocationTargetException) e.getCause();
if(ite.getTargetException() instanceof RuntimeException) {
RuntimeException re = (RuntimeException) ite.getTargetException();
- if(re.getMessage().equals("Invalid built-in function index (189)")) {
- fail("DPRODUCT() registered with wrong index");
- }
+ assertNotEquals("Invalid built-in function index (189)", re.getMessage(),
+ "DPRODUCT() registered with wrong index");
}
}
// some other unexpected error
@@ -64,7 +65,7 @@ public final class TestReadMissingBuiltI
}
}
- @AfterClass
+ @AfterAll
public static void closeResources() throws Exception {
wb.close();
}
@@ -76,9 +77,8 @@ public final class TestReadMissingBuiltI
formula = getCellFormula(0);
} catch (IllegalStateException e) {
if(e.getMessage().startsWith("Too few arguments")) {
- if(e.getMessage().indexOf("AttrPtg") > 0) {
- fail("tAttrVolatile not supported in FormulaParser.toFormulaString");
- }
+ assertFalse(e.getMessage().contains("AttrPtg"),
+ "tAttrVolatile not supported in FormulaParser.toFormulaString");
fail("NOW() registered with 1 arg instead of 0");
}
if(e.getMessage().startsWith("too much stuff")) {
@@ -89,31 +89,25 @@ public final class TestReadMissingBuiltI
}
assertEquals("DATEDIF(NOW(),NOW(),\"d\")", formula);
}
-
+
@Test
public void testDdb() {
String formula = getCellFormula(1);
- if("externalflag(1,1,1,1,1)".equals(formula)) {
- fail("DDB() not registered");
- }
+ assertNotEquals("externalflag(1,1,1,1,1)", formula, "DDB() not registered");
assertEquals("DDB(1,1,1,1,1)", formula);
}
-
+
@Test
public void testAtan() {
String formula = getCellFormula(2);
- if("ARCTAN(1)".equals(formula)) {
- fail("func ix 18 registered as ARCTAN() instead of ATAN()");
- }
+ assertNotEquals("ARCTAN(1)", formula, "func ix 18 registered as ARCTAN() instead of ATAN()");
assertEquals("ATAN(1)", formula);
}
@Test
public void testUsdollar() {
String formula = getCellFormula(3);
- if("YEN(1)".equals(formula)) {
- fail("func ix 204 registered as YEN() instead of USDOLLAR()");
- }
+ assertNotEquals("YEN(1)", formula, "func ix 204 registered as YEN() instead of USDOLLAR()");
assertEquals("USDOLLAR(1)", formula);
}
@@ -123,35 +117,29 @@ public final class TestReadMissingBuiltI
try {
formula = getCellFormula(4);
} catch (IllegalStateException e) {
- if(e.getMessage().startsWith("too much stuff")) {
- fail("DBCS() not registered");
- }
+ assertFalse(e.getMessage().startsWith("too much stuff"), "DBCS() not registered");
// some other unexpected error
throw e;
} catch (NegativeArraySizeException e) {
fail("found err- DBCS() registered with -1 args");
}
- if("JIS(\"abc\")".equals(formula)) {
- fail("func ix 215 registered as JIS() instead of DBCS()");
- }
+ assertNotEquals("JIS(\"abc\")", formula, "func ix 215 registered as JIS() instead of DBCS()");
assertEquals("DBCS(\"abc\")", formula);
}
-
+
@Test
public void testIsnontext() {
String formula;
try {
formula = getCellFormula(5);
} catch (IllegalStateException e) {
- if(e.getMessage().startsWith("too much stuff")) {
- fail("ISNONTEXT() registered with wrong index");
- }
+ assertFalse(e.getMessage().startsWith("too much stuff"), "ISNONTEXT() registered with wrong index");
// some other unexpected error
throw e;
}
assertEquals("ISNONTEXT(\"abc\")", formula);
}
-
+
@Test
public void testDproduct() {
String formula = getCellFormula(6);
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+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 java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Locale;
+import java.util.stream.Stream;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -34,16 +34,14 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
+import org.apache.poi.ss.util.CellReference;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-@RunWith(Parameterized.class)
public abstract class BaseTestFunctionsFromSpreadsheet {
/**
@@ -68,26 +66,13 @@ public abstract class BaseTestFunctionsF
}
- @Parameter()
- public String testName;
- @Parameter(value = 1)
- public String filename;
- @Parameter(value = 2)
- public HSSFSheet sheet;
- @Parameter(value = 3)
- public int formulasRowIdx;
- @Parameter(value = 4)
- public HSSFFormulaEvaluator evaluator;
- @Parameter(value = 5)
- public int precisionColumnIndex;
-
- protected static Collection<Object[]> data(Class<? extends BaseTestFunctionsFromSpreadsheet> clazz, String filename) throws Exception {
+ protected static Stream<Arguments> data(Class<? extends BaseTestFunctionsFromSpreadsheet> clazz, String filename) throws Exception {
HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook(filename);
confirmReadMeSheet(workbook, clazz);
- List<Object[]> data = new ArrayList<>();
+ List<Arguments> data = new ArrayList<>();
int nSheets = workbook.getNumberOfSheets();
for(int sheetIdx=1; sheetIdx< nSheets; sheetIdx++) {
@@ -96,11 +81,11 @@ public abstract class BaseTestFunctionsF
}
workbook.close();
-
- return data;
+
+ return data.stream();
}
- private static void processFunctionGroup(List<Object[]> data, HSSFSheet sheet, final int startRowIndex, String filename) {
+ private static void processFunctionGroup(List<Arguments> data, HSSFSheet sheet, final int startRowIndex, String filename) {
HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(sheet.getWorkbook());
int precisionColumnIndex = -1;
@@ -118,7 +103,7 @@ public abstract class BaseTestFunctionsF
if(r == null) {
continue;
}
- String newMarkerValue = getCellTextValue(r, SS.COLUMN_INDEX_MARKER, "marker");
+ String newMarkerValue = getCellTextValue(r, SS.COLUMN_INDEX_MARKER, "marker");
if(SS.TEST_CASES_END_MARKER.equalsIgnoreCase(newMarkerValue)) {
// normal exit point
return;
@@ -140,14 +125,17 @@ public abstract class BaseTestFunctionsF
if (testName.isEmpty()) {
testName = evalCell.getCellFormula();
}
-
- data.add(new Object[]{testName, filename, sheet, rowIndex, evaluator, precisionColumnIndex});
+
+ data.add(Arguments.of(testName, filename, sheet, rowIndex, evaluator, precisionColumnIndex));
}
fail("Missing end marker '" + SS.TEST_CASES_END_MARKER + "' on sheet '" + sheet.getSheetName() + "'");
}
- @Test
- public void processFunctionRow() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void processFunctionRow(
+ String testName, String filename, HSSFSheet sheet, int formulasRowIdx, HSSFFormulaEvaluator evaluator, int precisionColumnIndex
+ ) throws Exception {
HSSFRow r = sheet.getRow(formulasRowIdx);
HSSFCell evalCell = r.getCell(SS.COLUMN_INDEX_EVALUATION);
HSSFCell expectedCell = r.getCell(SS.COLUMN_INDEX_EXPECTED_RESULT);
@@ -159,29 +147,29 @@ public abstract class BaseTestFunctionsF
CellValue actualValue = evaluator.evaluate(evalCell);
- assertNotNull(msg + " - Bad setup data expected value is null", expectedCell);
- assertNotNull(msg + " - actual value was null", actualValue);
+ assertNotNull(expectedCell, msg + " - Bad setup data expected value is null");
+ assertNotNull(actualValue, msg + " - actual value was null");
if (expectedCell.getCellType() == CellType.ERROR) {
int expectedErrorCode = expectedCell.getErrorCellValue();
- assertEquals(msg, CellType.ERROR, actualValue.getCellType());
- assertEquals(msg, ErrorEval.getText(expectedErrorCode), actualValue.formatAsString());
- assertEquals(msg, expectedErrorCode, actualValue.getErrorValue());
- assertEquals(msg, ErrorEval.getText(expectedErrorCode), ErrorEval.getText(actualValue.getErrorValue()));
+ assertEquals(CellType.ERROR, actualValue.getCellType(), msg);
+ assertEquals(ErrorEval.getText(expectedErrorCode), actualValue.formatAsString(), msg);
+ assertEquals(expectedErrorCode, actualValue.getErrorValue(), msg);
+ assertEquals(ErrorEval.getText(expectedErrorCode), ErrorEval.getText(actualValue.getErrorValue()), msg);
return;
}
// unexpected error
- assertNotEquals(msg, CellType.ERROR, actualValue.getCellType());
+ assertNotEquals(CellType.ERROR, actualValue.getCellType(), msg);
assertNotEquals(msg, formatValue(expectedCell), ErrorEval.getText(actualValue.getErrorValue()));
// wrong type error
- assertEquals(msg, expectedCell.getCellType(), actualValue.getCellType());
+ assertEquals(expectedCell.getCellType(), actualValue.getCellType(), msg);
final CellType expectedCellType = expectedCell.getCellType();
switch (expectedCellType) {
case BOOLEAN:
- assertEquals(msg, expectedCell.getBooleanCellValue(), actualValue.getBooleanValue());
+ assertEquals(expectedCell.getBooleanCellValue(), actualValue.getBooleanValue(), msg);
break;
case FORMULA: // will never be used, since we will call method after formula evaluation
fail("Cannot expect formula as result of formula evaluation: " + msg);
@@ -191,7 +179,7 @@ public abstract class BaseTestFunctionsF
assertEquals(expectedCell.getNumericCellValue(), actualValue.getNumberValue(), precision);
break;
case STRING:
- assertEquals(msg, expectedCell.getRichStringCellValue().getString(), actualValue.getStringValue());
+ assertEquals(expectedCell.getRichStringCellValue().getString(), actualValue.getStringValue(), msg);
break;
default:
fail("Unexpected cell type: " + expectedCellType);
@@ -205,11 +193,11 @@ public abstract class BaseTestFunctionsF
*/
private static void confirmReadMeSheet(HSSFWorkbook workbook, Class<? extends BaseTestFunctionsFromSpreadsheet> clazz) {
String firstSheetName = workbook.getSheetName(0);
- assertTrue("First sheet's name was '" + firstSheetName + "' but expected '" + SS.README_SHEET_NAME + "'",
- firstSheetName.equalsIgnoreCase(SS.README_SHEET_NAME));
+ assertTrue(firstSheetName.equalsIgnoreCase(SS.README_SHEET_NAME),
+ "First sheet's name was '" + firstSheetName + "' but expected '" + SS.README_SHEET_NAME + "'");
HSSFSheet sheet = workbook.getSheetAt(0);
String specifiedClassName = sheet.getRow(2).getCell(0).getRichStringCellValue().getString();
- assertEquals("Test class name in spreadsheet comment", clazz.getName(), specifiedClassName);
+ assertEquals(clazz.getName(), specifiedClassName, "Test class name in spreadsheet comment");
HSSFRow precisionRow = sheet.getRow(11);
HSSFCell precisionCell = precisionRow == null ? null : precisionRow.getCell(0);
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java Thu Dec 24 18:42:29 2020
@@ -20,7 +20,7 @@
*/
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
@@ -37,35 +37,30 @@ public abstract class BaseTestNumeric {
* for comparing doubles. DO NOT use that.
* TODO: This class should really be in an abstract super class
* to avoid code duplication across this project.
- * @param message
- * @param baseval
- * @param checkval
*/
- public static void assertEquals(String message, double baseval, double checkval, double almostZero, double diffToleranceFactor) {
+ public static void assertDouble(String message, double baseval, double checkval, double almostZero, double diffToleranceFactor) {
double posZero = Math.abs(almostZero);
double negZero = -1 * posZero;
if (Double.isNaN(baseval)) {
- assertTrue(message+": Expected " + baseval + " but was " + checkval
- , Double.isNaN(baseval));
+ assertTrue(Double.isNaN(baseval), message+": Expected " + baseval + " but was " + checkval);
}
else if (Double.isInfinite(baseval)) {
- assertTrue(message+": Expected " + baseval + " but was " + checkval
- , Double.isInfinite(baseval) && ((baseval<0) == (checkval<0)));
+ assertTrue(Double.isInfinite(baseval) && ((baseval<0) == (checkval<0)), message+": Expected " + baseval + " but was " + checkval);
}
else {
- assertTrue(message+": Expected " + baseval + " but was " + checkval
- ,baseval != 0
- ? Math.abs(baseval - checkval) <= Math.abs(diffToleranceFactor * baseval)
- : checkval < posZero && checkval > negZero);
+ assertTrue(baseval != 0
+ ? Math.abs(baseval - checkval) <= Math.abs(diffToleranceFactor * baseval)
+ : checkval < posZero && checkval > negZero,
+ message+": Expected " + baseval + " but was " + checkval);
}
}
- public static void assertEquals(String msg, double baseval, double checkval) {
- assertEquals(msg, baseval, checkval, POS_ZERO, DIFF_TOLERANCE_FACTOR);
+ public static void assertDouble(String msg, double baseval, double checkval) {
+ assertDouble(msg, baseval, checkval, POS_ZERO, DIFF_TOLERANCE_FACTOR);
}
- public static void assertEquals(double baseval, double checkval) {
- assertEquals("", baseval, checkval, POS_ZERO, DIFF_TOLERANCE_FACTOR);
+ public static void assertDouble(double baseval, double checkval) {
+ assertDouble("", baseval, checkval, POS_ZERO, DIFF_TOLERANCE_FACTOR);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NotImplementedException;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java Thu Dec 24 18:42:29 2020
@@ -16,14 +16,14 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestAddress {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestAreas {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for Excel function AVERAGE()
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java Thu Dec 24 18:42:29 2020
@@ -17,18 +17,17 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.WorkbookEvaluator;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Bin2Dec}
@@ -44,14 +43,14 @@ public final class TestBin2Dec {
private static void confirmValue(String msg, String number1, String expected) {
ValueEval result = invokeValue(number1);
- assertEquals("Had: " + result, NumberEval.class, result.getClass());
- assertEquals(msg, expected, ((NumberEval) result).getStringValue());
+ assertEquals(NumberEval.class, result.getClass(), "Had: " + result);
+ assertEquals(expected, ((NumberEval) result).getStringValue(), msg);
}
private static void confirmValueError(String msg, String number1, ErrorEval numError) {
ValueEval result = invokeValue(number1);
assertEquals(ErrorEval.class, result.getClass());
- assertEquals(msg, numError, result);
+ assertEquals(numError, result, msg);
}
@Test
@@ -95,15 +94,8 @@ public final class TestBin2Dec {
HSSFWorkbook wb = new HSSFWorkbook();
wb.createSheet();
HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
- WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-
- @Override
- public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
- return true;
- }
- }, null);
- return new OperationEvaluationContext(workbookEvaluator,
- workbook, 0, 0, 0, null);
+ WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, (sheetIndex, rowIndex, columnIndex) -> true, null);
+ return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null);
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,15 @@
package org.apache.poi.ss.formula.functions;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
-import java.util.Collection;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests boolean functions as loaded from a test data spreadsheet.<p>
*/
public class TestBooleanFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestBooleanFunctionsFromSpreadsheet.class, "BooleanFunctionsTestCaseData.xls");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
@@ -25,8 +25,8 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for YEAR / MONTH / DAY / HOUR / MINUTE / SECOND
@@ -36,7 +36,7 @@ public final class TestCalendarFieldFunc
private HSSFCell cell11;
private HSSFFormulaEvaluator evaluator;
- @Before
+ @BeforeEach
public void setUp() {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet("new sheet");
@@ -108,7 +108,7 @@ public final class TestCalendarFieldFunc
cell11.setCellFormula(formulaText);
evaluator.clearAllCachedResultValues();
CellValue cv = evaluator.evaluate(cell11);
- assertEquals("Wrong result type", CellType.NUMERIC, cv.getCellType());
+ assertEquals(CellType.NUMERIC, cv.getCellType(), "Wrong result type");
double actualValue = cv.getNumberValue();
assertEquals(expectedResult, actualValue, 0);
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java Thu Dec 24 18:42:29 2020
@@ -16,14 +16,14 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestClean {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java Thu Dec 24 18:42:29 2020
@@ -16,12 +16,12 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Code}
@@ -37,13 +37,13 @@ public class TestCode {
private static void confirmValue(String msg, String number1, String expected) {
ValueEval result = invokeValue(number1);
assertEquals(StringEval.class, result.getClass());
- assertEquals(msg, expected, ((StringEval) result).getStringValue());
+ assertEquals(expected, ((StringEval) result).getStringValue(), msg);
}
private static void confirmValueError(String msg, String number1, ErrorEval numError) {
ValueEval result = invokeValue(number1);
assertEquals(ErrorEval.class, result.getClass());
- assertEquals(msg, numError, result);
+ assertEquals(numError, result, msg);
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,15 @@
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests CODE() as loaded from a test data spreadsheet.<p>
*/
public class TestCodeFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestCodeFunctionsFromSpreadsheet.class, "CodeFunctionTestCaseData.xls");
}
}
\ No newline at end of file
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java Thu Dec 24 18:42:29 2020
@@ -16,12 +16,12 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Complex}
@@ -37,13 +37,13 @@ public class TestComplex {
private static void confirmValue(String msg, String real_num, String i_num, String suffix, String expected) {
ValueEval result = invokeValue(real_num, i_num, suffix);
assertEquals(StringEval.class, result.getClass());
- assertEquals(msg, expected, ((StringEval) result).getStringValue());
+ assertEquals(expected, ((StringEval) result).getStringValue(), msg);
}
private static void confirmValueError(String msg, String real_num, String i_num, String suffix, ErrorEval numError) {
ValueEval result = invokeValue(real_num, i_num, suffix);
assertEquals(ErrorEval.class, result.getClass());
- assertEquals(msg, numError, result);
+ assertEquals(numError, result, msg);
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,15 @@
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests COMPLEX() as loaded from a test data spreadsheet.<p>
*/
public class TestComplexFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestComplexFunctionsFromSpreadsheet.class, "ComplexFunctionTestCaseData.xls");
}
}
\ No newline at end of file
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -41,7 +41,7 @@ import org.apache.poi.ss.usermodel.CellT
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.util.CellReference;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for COUNT(), COUNTA() COUNTIF(), COUNTBLANK()
@@ -151,7 +151,7 @@ public final class TestCountFuncs {
assertNotNull(mp);
StringEval seA = new StringEval("aa"); // this should not match the criteria '<>aa'
StringEval seB = new StringEval("bb"); // this should match
- assertFalse("Identified bug 46647", mp.matches(seA) && !mp.matches(seB));
+ assertFalse(mp.matches(seA) && !mp.matches(seB), "Identified bug 46647");
assertFalse(mp.matches(seA));
assertTrue(mp.matches(seB));
@@ -420,10 +420,8 @@ public final class TestCountFuncs {
double expectedValue = cellRef.getNumericCellValue();
double actualValue = evaluator.evaluate(cellFmla).getNumberValue();
- assertEquals(
- "Problem with a formula at " +
- new CellReference(cellFmla).formatAsString() + "[" + cellFmla.getCellFormula()+"] ",
- expectedValue, actualValue, 0.0001);
+ assertEquals(expectedValue, actualValue, 0.0001,
+ "Problem with a formula at " + new CellReference(cellFmla).formatAsString() + "[" + cellFmla.getCellFormula()+"] ");
}
// string criteria
@@ -434,10 +432,8 @@ public final class TestCountFuncs {
double expectedValue = cellRef.getNumericCellValue();
double actualValue = evaluator.evaluate(cellFmla).getNumberValue();
- assertEquals(
- "Problem with a formula at " +
- new CellReference(cellFmla).formatAsString() + "[" + cellFmla.getCellFormula()+"] ",
- expectedValue, actualValue, 0.0001);
+ assertEquals(expectedValue, actualValue, 0.0001,
+ "Problem with a formula at " + new CellReference(cellFmla).formatAsString() + "[" + cellFmla.getCellFormula()+"] ");
}
}
@@ -533,11 +529,8 @@ public final class TestCountFuncs {
CellValue cv = fe.evaluate(cellA);
double actualValue = cv.getNumberValue();
double expectedValue = cellC.getNumericCellValue();
- assertEquals(
- "Problem with a formula at " + new CellReference(cellA).formatAsString()
- + ": " + cellA.getCellFormula() + " :"
- + "Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ",
- expectedValue, actualValue, 0.0001);
+ assertEquals(expectedValue, actualValue, 0.0001,
+ "Problem with a formula at " + new CellReference(cellA).formatAsString() + ": " + cellA.getCellFormula() + " :Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ");
}
HSSFSheet sheet2 = wb.getSheet("MSDN Example 2");
@@ -552,12 +545,9 @@ public final class TestCountFuncs {
double actualValue = cv.getNumberValue();
double expectedValue = cellC.getNumericCellValue();
- assertEquals(
- "Problem with a formula at " +
- new CellReference(cellA).formatAsString() + "[" + cellA.getCellFormula()+"]: "
- + "Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ",
- expectedValue, actualValue, 0.0001);
-
+ assertEquals(expectedValue, actualValue, 0.0001,
+ "Problem with a formula at " + new CellReference(cellA).formatAsString() + "[" +
+ cellA.getCellFormula()+"]: Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ");
}
}
@@ -589,6 +579,6 @@ public final class TestCountFuncs {
}
}
- assertEquals(failureCount + " " + functionName + " evaluations failed.", 0, failureCount);
+ assertEquals(0, failureCount, failureCount + " " + functionName + " evaluations failed.");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -16,16 +16,15 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests DGET() as loaded from a test data spreadsheet.
*/
public class TestDGetFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestDGetFunctionsFromSpreadsheet.class, "DGet.xls");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -16,16 +16,15 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests D*() functions as loaded from a test data spreadsheet.
*/
public class TestDStarFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestDStarFunctionsFromSpreadsheet.class, "DStar.xls");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
@@ -25,9 +25,9 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* @author Pavel Krupets (pkrupets at palmtreebusiness dot com)
@@ -37,7 +37,7 @@ public final class TestDate {
private HSSFCell cell11;
private HSSFFormulaEvaluator evaluator;
- @Before
+ @BeforeEach
public void setUp() {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet("new sheet");
@@ -50,7 +50,7 @@ public final class TestDate {
* TODO - create MissingArgEval and modify the formula evaluator to handle this
*/
@Test
- @Ignore
+ @Disabled
public void testSomeArgumentsMissing() {
confirm("DATE(, 1, 0)", 0.0);
confirm("DATE(, 1, 1)", 1.0);
@@ -87,7 +87,7 @@ public final class TestDate {
cell11.setCellFormula(formulaText);
evaluator.clearAllCachedResultValues();
CellValue cv = evaluator.evaluate(cell11);
- assertEquals("Wrong result type", CellType.NUMERIC, cv.getCellType());
+ assertEquals(CellType.NUMERIC, cv.getCellType(), "Wrong result type");
double actualValue = cv.getNumberValue();
assertEquals(expectedResult, actualValue, 0);
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,12 @@
package org.apache.poi.ss.formula.functions;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
-import java.util.Collection;
+import org.junit.jupiter.params.provider.Arguments;
public class TestDateTimeToNumberFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestDateTimeToNumberFromSpreadsheet.class, "DateTimeToNumberTestCases.xls");
}
}
\ No newline at end of file
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Locale;
@@ -27,9 +27,9 @@ import org.apache.poi.ss.formula.eval.Nu
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests for Excel function DATEVALUE()
@@ -38,12 +38,12 @@ import org.junit.Test;
*/
public final class TestDateValue {
- @BeforeClass
+ @BeforeAll
public static void init() {
LocaleUtil.setUserLocale(Locale.US);
}
- @AfterClass
+ @AfterAll
public static void clear() {
LocaleUtil.setUserLocale(null);
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Calendar;
import java.util.Date;
@@ -29,7 +29,7 @@ import org.apache.poi.ss.formula.eval.Nu
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestDays360 {
@@ -60,7 +60,7 @@ public final class TestDays360 {
// longer time spans
confirm(562, 2008, 8, 11, 2010, 3, 3);
confirm(916, 2007, 2, 23, 2009, 9, 9);
-
+
// other tests
confirm(1, makeDate(1993, 2, 28), makeDate(1993, 3, 1), false);
confirm(1, makeDate(1996, 2, 29), makeDate(1996, 3, 1), false);
@@ -78,7 +78,7 @@ public final class TestDays360 {
confirm(expResult, makeDate(y1, m1, d1), makeDate(y2, m2, d2), false);
confirm(-expResult, makeDate(y2, m2, d2), makeDate(y1, m1, d1), false);
}
-
+
/**
* The <tt>method</tt> parameter only makes a difference when the second parameter
* is the last day of the month that does <em>not</em> have 30 days.
@@ -148,17 +148,17 @@ public final class TestDays360 {
} else {
ve = invokeDays360(convert(firstArg), convert(secondArg));
}
- assertTrue("wrong return type (" + ve.getClass().getName() + ")", ve instanceof NumberEval);
+ assertTrue(ve instanceof NumberEval, "wrong return type (" + ve.getClass().getName() + ")");
NumberEval numberEval = (NumberEval) ve;
String err = String.format(Locale.ROOT, "days360(%tF,%tF,%b) wrong result", firstArg, secondArg, method);
- assertEquals(err, expResult, numberEval.getNumberValue(), 0);
+ assertEquals(expResult, numberEval.getNumberValue(), 0, err);
}
-
+
private static ValueEval invokeDays360(ValueEval...args) {
return new Days360().evaluate(args, -1, -1);
}
-
+
private static NumberEval convert(Date d) {
return new NumberEval(DateUtil.getExcelDate(d));
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,10 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.WorkbookEvaluator;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -31,7 +30,7 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Dec2Bin}
@@ -52,14 +51,14 @@ public final class TestDec2Bin {
private static void confirmValue(String msg, String number1, String expected) {
ValueEval result = invokeValue(number1);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
- assertEquals(msg, expected, ((StringEval) result).getStringValue());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
+ assertEquals(expected, ((StringEval) result).getStringValue(), msg);
}
private static void confirmValueError(String msg, String number1, ErrorEval numError) {
ValueEval result = invokeValue(number1);
assertEquals(ErrorEval.class, result.getClass());
- assertEquals(msg, numError, result);
+ assertEquals(numError, result, msg);
}
@Test
@@ -115,15 +114,8 @@ public final class TestDec2Bin {
cell.setCellValue("1");
HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
- WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-
- @Override
- public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
- return true;
- }
- }, null);
- return new OperationEvaluationContext(workbookEvaluator,
- workbook, 0, 0, 0, null);
+ WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, (sheetIndex, rowIndex, columnIndex) -> true, null);
+ return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null);
}
@Test
@@ -133,7 +125,7 @@ public final class TestDec2Bin {
ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
assertEquals("1101", ((StringEval) result).getStringValue());
}
@@ -144,7 +136,7 @@ public final class TestDec2Bin {
ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
// TODO: documentation and behavior do not match here!
assertEquals("1101", ((StringEval) result).getStringValue());
}
@@ -156,7 +148,7 @@ public final class TestDec2Bin {
ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
ValueEval result = new Dec2Bin().evaluate(args, ctx);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
// TODO: documentation and behavior do not match here!
assertEquals("1101", ((StringEval) result).getStringValue());
}
@@ -242,15 +234,12 @@ public final class TestDec2Bin {
public void testBackAndForth() {
for (int i = -512; i < 512; i++) {
ValueEval result = invokeValue(Integer.toString(i));
- assertEquals("Had: " + result, StringEval.class,
- result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
ValueEval back = invokeBack(((StringEval) result).getStringValue());
- assertEquals("Had: " + back, NumberEval.class,
- back.getClass());
+ assertEquals(NumberEval.class, back.getClass(), "Had: " + back);
- assertEquals(Integer.toString(i),
- ((NumberEval) back).getStringValue());
+ assertEquals(Integer.toString(i), ((NumberEval) back).getStringValue());
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,10 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.WorkbookEvaluator;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -31,7 +30,7 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Dec2Hex}
@@ -58,19 +57,19 @@ public final class TestDec2Hex {
private static void confirmValue(String msg, String number1, String number2, String expected) {
ValueEval result = invokeValue(number1, number2);
assertEquals(StringEval.class, result.getClass());
- assertEquals(msg, expected, ((StringEval) result).getStringValue());
+ assertEquals(expected, ((StringEval) result).getStringValue(), msg);
}
private static void confirmValue(String msg, String number1, String expected) {
ValueEval result = invokeValue(number1);
assertEquals(StringEval.class, result.getClass());
- assertEquals(msg, expected, ((StringEval) result).getStringValue());
+ assertEquals(expected, ((StringEval) result).getStringValue(), msg);
}
private static void confirmValueError(String msg, String number1, String number2, ErrorEval numError) {
ValueEval result = invokeValue(number1, number2);
assertEquals(ErrorEval.class, result.getClass());
- assertEquals(msg, numError, result);
+ assertEquals(numError, result, msg);
}
@Test
@@ -98,11 +97,11 @@ public final class TestDec2Hex {
assertEquals("2147483648", maxIntPlusOne);
confirmValue("Converts INT_MAX + 1 to hexadecimal", maxIntPlusOne, "80000000");
- String maxLong = Long.toString(549755813887l);
+ String maxLong = Long.toString(549755813887L);
assertEquals("549755813887", maxLong);
confirmValue("Converts the max supported value to hexadecimal", maxLong, "7FFFFFFFFF");
- String minLong = Long.toString(-549755813888l);
+ String minLong = Long.toString(-549755813888L);
assertEquals("-549755813888", minLong);
confirmValue("Converts the min supported value to hexadecimal", minLong, "FF80000000");
}
@@ -139,15 +138,8 @@ public final class TestDec2Hex {
cell.setCellValue("-8");
HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
- WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-
- @Override
- public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
- return true;
- }
- }, null);
- return new OperationEvaluationContext(workbookEvaluator,
- workbook, 0, 0, 0, null);
+ WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, (sheetIndex, rowIndex, columnIndex) -> true, null);
+ return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null);
}
@Test
@@ -157,7 +149,7 @@ public final class TestDec2Hex {
ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
assertEquals("7B", ((StringEval) result).getStringValue());
}
@@ -168,7 +160,7 @@ public final class TestDec2Hex {
ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
assertEquals("0000007B", ((StringEval) result).getStringValue());
}
@@ -179,7 +171,7 @@ public final class TestDec2Hex {
ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
ValueEval result = new Dec2Hex().evaluate(args, ctx);
- assertEquals("Had: " + result, StringEval.class, result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
assertEquals("0000007B", ((StringEval) result).getStringValue());
}
@@ -242,15 +234,12 @@ public final class TestDec2Hex {
public void testBackAndForth() {
for (int i = -512; i < 512; i++) {
ValueEval result = invokeValue(Integer.toString(i));
- assertEquals("Had: " + result, StringEval.class,
- result.getClass());
+ assertEquals(StringEval.class, result.getClass(), "Had: " + result);
ValueEval back = invokeBack(((StringEval) result).getStringValue());
- assertEquals("Had: " + back, NumberEval.class,
- back.getClass());
+ assertEquals(NumberEval.class, back.getClass(), "Had: " + back);
- assertEquals(Integer.toString(i),
- ((NumberEval) back).getStringValue());
+ assertEquals(Integer.toString(i), ((NumberEval) back).getStringValue());
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link org.apache.poi.ss.formula.functions.Delta}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -16,16 +16,15 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests DELTA() as loaded from a test data spreadsheet.<p>
*/
public class TestDeltaFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestDeltaFunctionsFromSpreadsheet.class, "DeltaFunctionTestCaseData.xls");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Calendar;
import java.util.Date;
@@ -30,7 +30,7 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.usermodel.FormulaError;
import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEDate {
@@ -53,7 +53,7 @@ public class TestEDate {
NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(startDate), new NumberEval(monthInc)}, null);
assertEquals(expectedResult, result.getNumberValue(), 0);
}
-
+
@Test
public void testEDateInvalidValues() {
EDate eDate = new EDate();
@@ -87,9 +87,9 @@ public class TestEDate {
instance.add(Calendar.MONTH, offset);
assertEquals(resultDate, instance.getTime());
}
-
+
@Test
- public void testBug56688() {
+ public void testBug56688() {
EDate eDate = new EDate();
NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(1000), new RefEvalImplementation(new NumberEval(0))}, null);
assertEquals(1000d, result.getNumberValue(), 0);
@@ -119,11 +119,9 @@ public class TestEDate {
public void testEDateBlankRefValueEval() {
EDate eDate = new EDate();
NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new RefEvalImplementation(BlankEval.instance), new NumberEval(0)}, null);
- assertEquals("0 startDate triggers BAD_DATE currently, thus -1.0!",
- -1.0d, result.getNumberValue(), 0);
+ assertEquals(-1.0d, result.getNumberValue(), 0, "0 startDate triggers BAD_DATE currently, thus -1.0!");
result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(1), new RefEvalImplementation(BlankEval.instance)}, null);
- assertEquals("Blank is handled as 0 otherwise",
- 1.0d, result.getNumberValue(), 0);
+ assertEquals(1.0d, result.getNumberValue(), 0, "Blank is handled as 0 otherwise");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Calendar;
import java.util.Date;
@@ -32,7 +32,7 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.usermodel.FormulaError;
import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEOMonth {
@@ -76,10 +76,10 @@ public class TestEOMonth {
@Test
public void testEOMonthZeroDate() {
NumberEval result = (NumberEval) eOMonth.evaluate(new ValueEval[] {new NumberEval(0), new NumberEval(0)}, ec);
- assertEquals("0 startDate is 1900-01-00", DATE_1900_01_31, result.getNumberValue(), 0);
+ assertEquals(DATE_1900_01_31, result.getNumberValue(), 0, "0 startDate is 1900-01-00");
result = (NumberEval) eOMonth.evaluate(new ValueEval[] {new NumberEval(0), new NumberEval(1)}, ec);
- assertEquals("0 startDate is 1900-01-00", DATE_1900_02_28, result.getNumberValue(), 0);
+ assertEquals(DATE_1900_02_28, result.getNumberValue(), 0, "0 startDate is 1900-01-00");
}
@Test
@@ -114,7 +114,7 @@ public class TestEOMonth {
};
NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec);
Date actDate = DateUtil.getJavaDate(result.getNumberValue());
-
+
assertEquals(expDate, actDate);
}
}
@@ -136,17 +136,17 @@ public class TestEOMonth {
@Test
public void testEOMonthBlankValueEval() {
NumberEval evaluate = (NumberEval) eOMonth.evaluate(new ValueEval[] {BlankEval.instance, new NumberEval(0)}, ec);
- assertEquals("Blank is handled as 0", DATE_1900_01_31, evaluate.getNumberValue(), 0);
+ assertEquals(DATE_1900_01_31, evaluate.getNumberValue(), 0, "Blank is handled as 0");
}
@Test
public void testEOMonthBlankRefValueEval() {
ValueEval[] ve1 = {new RefEvalImplementation(BlankEval.instance), new NumberEval(1)};
NumberEval result = (NumberEval) eOMonth.evaluate(ve1, ec);
- assertEquals("Blank is handled as 0", DATE_1900_02_28, result.getNumberValue(), 0);
+ assertEquals(DATE_1900_02_28, result.getNumberValue(), 0, "Blank is handled as 0");
ValueEval[] ve2 = {new NumberEval(1), new RefEvalImplementation(BlankEval.instance)};
result = (NumberEval) eOMonth.evaluate(ve2, ec);
- assertEquals("Blank is handled as 0", DATE_1900_01_31, result.getNumberValue(), 0);
+ assertEquals(DATE_1900_01_31, result.getNumberValue(), 0, "Blank is handled as 0");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,15 @@
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests FactDouble() as loaded from a test data spreadsheet.<p>
*/
public class TestFactDoubleFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestFactDoubleFunctionsFromSpreadsheet.class, "FactDoubleFunctionTestCaseData.xls");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java Thu Dec 24 18:42:29 2020
@@ -21,7 +21,7 @@
package org.apache.poi.ss.formula.functions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
@@ -38,38 +38,38 @@ public class TestFinanceLib extends Base
r = 0; n = 3; y = 2; p = 7; t = true;
f = FinanceLib.fv(r, n, y, p, t);
x = -13;
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
r = 1; n = 10; y = 100; p = 10000; t = false;
f = FinanceLib.fv(r, n, y, p, t);
x = -10342300;
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
r = 1; n = 10; y = 100; p = 10000; t = true;
f = FinanceLib.fv(r, n, y, p, t);
x = -10444600;
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
r = 2; n = 12; y = 120; p = 12000; t = false;
f = FinanceLib.fv(r, n, y, p, t);
x = -6409178400d;
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
r = 2; n = 12; y = 120; p = 12000; t = true;
f = FinanceLib.fv(r, n, y, p, t);
x = -6472951200d;
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
// cross tests with pv
r = 2.95; n = 13; y = 13000; p = -4406.78544294496; t = false;
f = FinanceLib.fv(r, n, y, p, t);
x = 333891.230010986; // as returned by excel
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
r = 2.95; n = 13; y = 13000; p = -17406.7852148156; t = true;
f = FinanceLib.fv(r, n, y, p, t);
x = 333891.230102539; // as returned by excel
- assertEquals("fv ", x, f);
+ assertDouble("fv ", x, f);
}
@@ -83,22 +83,22 @@ public class TestFinanceLib extends Base
r = 1; v = new double[]{100, 200, 300, 400};
npv = FinanceLib.npv(r, v);
x = 162.5;
- assertEquals("npv ", x, npv);
+ assertDouble("npv ", x, npv);
r = 2.5; v = new double[]{1000, 666.66666, 333.33, 12.2768416};
npv = FinanceLib.npv(r, v);
x = 347.99232604144827;
- assertEquals("npv ", x, npv);
+ assertDouble("npv ", x, npv);
r = 12.33333; v = new double[]{1000, 0, -900, -7777.5765};
npv = FinanceLib.npv(r, v);
x = 74.3742433377061;
- assertEquals("npv ", x, npv);
+ assertDouble("npv ", x, npv);
r = 0.05; v = new double[]{200000, 300000.55, 400000, 1000000, 6000000, 7000000, -300000};
npv = FinanceLib.npv(r, v);
x = 11342283.4233124;
- assertEquals("npv ", x, npv);
+ assertDouble("npv ", x, npv);
}
@Test
@@ -110,29 +110,29 @@ public class TestFinanceLib extends Base
r = 0; n = 3; p = 2; f = 7; t = true;
y = FinanceLib.pmt(r, n, p, f, t);
x = -3;
- assertEquals("pmt ", x, y);
+ assertDouble("pmt ", x, y);
// cross check with pv
r = 1; n = 10; p = -109.66796875; f = 10000; t = false;
y = FinanceLib.pmt(r, n, p, f, t);
x = 100;
- assertEquals("pmt ", x, y);
+ assertDouble("pmt ", x, y);
r = 1; n = 10; p = -209.5703125; f = 10000; t = true;
y = FinanceLib.pmt(r, n, p, f, t);
x = 100;
- assertEquals("pmt ", x, y);
+ assertDouble("pmt ", x, y);
// cross check with fv
r = 2; n = 12; f = -6409178400d; p = 12000; t = false;
y = FinanceLib.pmt(r, n, p, f, t);
x = 120;
- assertEquals("pmt ", x, y);
+ assertDouble("pmt ", x, y);
r = 2; n = 12; f = -6472951200d; p = 12000; t = true;
y = FinanceLib.pmt(r, n, p, f, t);
x = 120;
- assertEquals("pmt ", x, y);
+ assertDouble("pmt ", x, y);
}
@Test
@@ -144,38 +144,38 @@ public class TestFinanceLib extends Base
r = 0; n = 3; y = 2; f = 7; t = true;
f = FinanceLib.pv(r, n, y, f, t);
x = -13;
- assertEquals("pv ", x, f);
+ assertDouble("pv ", x, f);
r = 1; n = 10; y = 100; f = 10000; t = false;
p = FinanceLib.pv(r, n, y, f, t);
x = -109.66796875;
- assertEquals("pv ", x, p);
+ assertDouble("pv ", x, p);
r = 1; n = 10; y = 100; f = 10000; t = true;
p = FinanceLib.pv(r, n, y, f, t);
x = -209.5703125;
- assertEquals("pv ", x, p);
+ assertDouble("pv ", x, p);
r = 2.95; n = 13; y = 13000; f = 333891.23; t = false;
p = FinanceLib.pv(r, n, y, f, t);
x = -4406.78544294496;
- assertEquals("pv ", x, p);
+ assertDouble("pv ", x, p);
r = 2.95; n = 13; y = 13000; f = 333891.23; t = true;
p = FinanceLib.pv(r, n, y, f, t);
x = -17406.7852148156;
- assertEquals("pv ", x, p);
+ assertDouble("pv ", x, p);
// cross tests with fv
r = 2; n = 12; y = 120; f = -6409178400d; t = false;
p = FinanceLib.pv(r, n, y, f, t);
x = 12000;
- assertEquals("pv ", x, p);
+ assertDouble("pv ", x, p);
r = 2; n = 12; y = 120; f = -6472951200d; t = true;
p = FinanceLib.pv(r, n, y, f, t);
x = 12000;
- assertEquals("pv ", x, p);
+ assertDouble("pv ", x, p);
}
@@ -187,28 +187,28 @@ public class TestFinanceLib extends Base
r = 0; y = 7; p = 2; f = 3; t = false;
n = FinanceLib.nper(r, y, p, f, t);
x = -0.71428571429; // can you believe it? excel returns nper as a fraction!??
- assertEquals("nper ", x, n);
+ assertDouble("nper ", x, n);
// cross check with pv
r = 1; y = 100; p = -109.66796875; f = 10000; t = false;
n = FinanceLib.nper(r, y, p, f, t);
x = 10;
- assertEquals("nper ", x, n);
+ assertDouble("nper ", x, n);
r = 1; y = 100; p = -209.5703125; f = 10000; t = true;
n = FinanceLib.nper(r, y, p, f, t);
x = 10;
- assertEquals("nper ", x, n);
+ assertDouble("nper ", x, n);
// cross check with fv
r = 2; y = 120; f = -6409178400d; p = 12000; t = false;
n = FinanceLib.nper(r, y, p, f, t);
x = 12;
- assertEquals("nper ", x, n);
+ assertDouble("nper ", x, n);
r = 2; y = 120; f = -6472951200d; p = 12000; t = true;
n = FinanceLib.nper(r, y, p, f, t);
x = 12;
- assertEquals("nper ", x, n);
+ assertDouble("nper ", x, n);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -27,7 +27,7 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Financed}
@@ -57,7 +57,7 @@ public final class TestFind {
confirmError(fe, cell, "find(\"k\", \"haystack\",0)", FormulaError.VALUE);
confirmError(fe, cell, "find(#DIV/0!, #N/A, #REF!)", FormulaError.DIV0);
confirmError(fe, cell, "find(2, #N/A, #REF!)", FormulaError.NA);
-
+
wb.close();
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -34,15 +34,15 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public final class TestFixed {
private HSSFCell cell11;
private HSSFFormulaEvaluator evaluator;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet sheet = wb.createSheet("new sheet");
@@ -86,14 +86,14 @@ public final class TestFixed {
// rounding propagation
confirm("FIXED(99.9,0,TRUE)", "100");
}
-
+
@Test
public void testOptionalParams() {
Fixed fixed = new Fixed();
ValueEval evaluate = fixed.evaluate(0, 0, new NumberEval(1234.56789));
assertTrue(evaluate instanceof StringEval);
assertEquals("1,234.57", ((StringEval)evaluate).getStringValue());
-
+
evaluate = fixed.evaluate(0, 0, new NumberEval(1234.56789), new NumberEval(1));
assertTrue(evaluate instanceof StringEval);
assertEquals("1,234.6", ((StringEval)evaluate).getStringValue());
@@ -113,17 +113,17 @@ public final class TestFixed {
cell11.setCellFormula(formulaText);
evaluator.clearAllCachedResultValues();
CellValue cv = evaluator.evaluate(cell11);
- assertEquals("Wrong result type: " + cv.formatAsString(), CellType.STRING, cv.getCellType());
+ assertEquals(CellType.STRING, cv.getCellType(), "Wrong result type: " + cv.formatAsString());
String actualValue = cv.getStringValue();
assertEquals(expectedResult, actualValue);
}
-
+
private void confirmValueError(String formulaText) {
cell11.setCellFormula(formulaText);
evaluator.clearAllCachedResultValues();
CellValue cv = evaluator.evaluate(cell11);
- assertTrue("Wrong result type: " + cv.formatAsString(),
- cv.getCellType() == CellType.ERROR
- && cv.getErrorValue() == FormulaError.VALUE.getCode());
+ assertTrue(cv.getCellType() == CellType.ERROR
+ && cv.getErrorValue() == FormulaError.VALUE.getCode(),
+ "Wrong result type: " + cv.formatAsString());
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,15 @@
package org.apache.poi.ss.formula.functions;
-import java.util.Collection;
+import java.util.stream.Stream;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests FIXED() as loaded from a test data spreadsheet.
*/
public class TestFixedFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
- @Parameters(name="{0}")
- public static Collection<Object[]> data() throws Exception {
+ public static Stream<Arguments> data() throws Exception {
return data(TestFixedFunctionsFromSpreadsheet.class, "57003-FixedFunctionTestCaseData.xls");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java Thu Dec 24 18:42:29 2020
@@ -16,14 +16,19 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
+import static org.apache.poi.ss.formula.functions.Frequency.histogram;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellRange;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-import static org.apache.poi.ss.formula.functions.Frequency.histogram;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
/**
* Testcase for the function FREQUENCY(data, bins)
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java Thu Dec 24 18:42:29 2020
@@ -16,11 +16,17 @@
==================================================================== */
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.eval.*;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.poi.ss.formula.eval.BlankEval;
+import org.apache.poi.ss.formula.eval.BoolEval;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.MissingArgEval;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.junit.jupiter.api.Test;
/**
* From Excel documentation at https://support.office.com/en-us/article/geomean-function-db1ac48d-25a5-40a0-ab83-0b38980e40d5:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org