Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.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.HSSFEvaluationWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -27,7 +27,7 @@ import org.apache.poi.ss.formula.eval.Er 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 Hex2Dec} @@ -44,13 +44,13 @@ public final class TestHex2Dec { private static void confirmValue(String msg, String number1, String expected) { ValueEval result = invokeValue(number1); assertEquals(NumberEval.class, result.getClass()); - assertEquals(msg, expected, ((NumberEval) result).getStringValue()); + 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 @@ -93,8 +93,7 @@ public final class TestHex2Dec { wb.createSheet(); HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb); WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, (sheetIndex, rowIndex, columnIndex) -> true, null); - return new OperationEvaluationContext(workbookEvaluator, - workbook, 0, 0, 0, null); + return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null); } @Test
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.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 IF() as loaded from a test data spreadsheet.<p> */ public class TestIFFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestIFFunctionFromSpreadsheet.class, "IfFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java Thu Dec 24 18:42:29 2020 @@ -19,14 +19,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.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test cases for IPMT() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.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 ImReal() as loaded from a test data spreadsheet.<p> */ public class TestImRealFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestImRealFunctionsFromSpreadsheet.class, "ImRealFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.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 Imaginary() as loaded from a test data spreadsheet.<p> */ public class TestImaginaryFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestImaginaryFunctionsFromSpreadsheet.class, "ImaginaryFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.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.Arrays; @@ -35,7 +35,7 @@ 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 org.junit.jupiter.api.Test; /** * Tests for the INDEX() function.</p> Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.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 INDEX() as loaded from a test data spreadsheet.<p> */ public final class TestIndexFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestIndexFunctionFromSpreadsheet.class, "IndexFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,7 @@ package org.apache.poi.ss.formula.functions; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; @@ -32,7 +31,7 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaEvaluator; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for the INDIRECT() function.</p> @@ -175,35 +174,26 @@ public final class TestIndirect { // 2 level recursion confirm(feB, cellB, "INDIRECT(\"[MyBook]Sheet2!A1\")", 50); // set up (and check) first level confirm(feA, cellA, "INDIRECT(\"'[Figures for January]Sheet1'!A11\")", 50); // points to cellB - + wbB.close(); wbA.close(); } - private static void confirm(FormulaEvaluator fe, Cell cell, String formula, - double expectedResult) { + private static void confirm(FormulaEvaluator fe, Cell cell, String formula, double expectedResult) { fe.clearAllCachedResultValues(); cell.setCellFormula(formula); CellValue cv = fe.evaluate(cell); - if (cv.getCellType() != CellType.NUMERIC) { - fail("expected numeric cell type but got " + cv.formatAsString()); - } + assertEquals(CellType.NUMERIC, cv.getCellType(), "expected numeric cell type but got " + cv.formatAsString()); assertEquals(expectedResult, cv.getNumberValue(), 0.0); } - - private static void confirm(FormulaEvaluator fe, Cell cell, String formula, - ErrorEval expectedResult) { + + private static void confirm(FormulaEvaluator fe, Cell cell, String formula, ErrorEval expectedResult) { fe.clearAllCachedResultValues(); cell.setCellFormula(formula); CellValue cv = fe.evaluate(cell); - if (cv.getCellType() != CellType.ERROR) { - fail("expected error cell type but got " + cv.formatAsString()); - } + assertEquals(CellType.ERROR, cv.getCellType(), "expected error cell type but got " + cv.formatAsString()); int expCode = expectedResult.getErrorCode(); - if (cv.getErrorValue() != expCode) { - fail("Expected error '" + ErrorEval.getText(expCode) - + "' but got '" + cv.formatAsString() + "'."); - } + assertEquals(expCode, cv.getErrorValue(), "Expected error '" + ErrorEval.getText(expCode) + "' but got '" + cv.formatAsString() + "'."); } @Test Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ 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 INDIRECT() as loaded from a test data spreadsheet.<p> @@ -29,8 +29,7 @@ import org.junit.runners.Parameterized.P * more easily. */ public final class TestIndirectFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestIndirectFunctionFromSpreadsheet.class, "IndirectFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java Thu Dec 24 18:42:29 2020 @@ -19,7 +19,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.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -29,7 +29,7 @@ import org.apache.poi.hssf.usermodel.HSS 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; /** * Test for Excel function INTERCEPT() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.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.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -27,7 +27,7 @@ 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.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link Irr} @@ -40,28 +40,28 @@ public final class TestIrr { double[] incomes = {-4000d, 1200d, 1410d, 1875d, 1050d}; double irr = Irr.irr(incomes); double irrRounded = Math.round(irr * 1000d) / 1000d; - assertEquals("irr", 0.143d, irrRounded, 0); + assertEquals(0.143d, irrRounded, 0); // http://www.techonthenet.com/excel/formulas/irr.php incomes = new double[]{-7500d, 3000d, 5000d, 1200d, 4000d}; irr = Irr.irr(incomes); irrRounded = Math.round(irr * 100d) / 100d; - assertEquals("irr", 0.28d, irrRounded, 0); + assertEquals(0.28d, irrRounded, 0); incomes = new double[]{-10000d, 3400d, 6500d, 1000d}; irr = Irr.irr(incomes); irrRounded = Math.round(irr * 100d) / 100d; - assertEquals("irr", 0.05, irrRounded, 0); + assertEquals(0.05, irrRounded, 0); incomes = new double[]{100d, -10d, -110d}; irr = Irr.irr(incomes); irrRounded = Math.round(irr * 100d) / 100d; - assertEquals("irr", 0.1, irrRounded, 0); + assertEquals(0.1, irrRounded, 0); incomes = new double[]{-70000d, 12000, 15000}; irr = Irr.irr(incomes, -0.1); irrRounded = Math.round(irr * 100d) / 100d; - assertEquals("irr", -0.44, irrRounded, 0); + assertEquals(-0.44, irrRounded, 0); } @Test @@ -92,7 +92,6 @@ public final class TestIrr { HSSFSheet sheet = wb.getSheet("IRR-NPV"); HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb); StringBuilder failures = new StringBuilder(); - int failureCount = 0; // TODO YK: Formulas in rows 16 and 17 operate with ArrayPtg which isn't yet supported // FormulaEvaluator as of r1041407 throws "Unexpected ptg class (org.apache.poi.ss.formula.ptg.ArrayPtg)" for(int rownum = 9; rownum <= 15; rownum++){ @@ -105,7 +104,6 @@ public final class TestIrr { if(failures.length() > 0) failures.append('\n'); failures.append("Row[" + (cellA.getRowIndex() + 1)+ "]: " + cellA.getCellFormula() + " "); failures.append(e.getMessage()); - failureCount++; } HSSFCell cellC = row.getCell(2); //IRR-NPV relationship: NPV(IRR(values), values) = 0 @@ -116,17 +114,15 @@ public final class TestIrr { if(failures.length() > 0) failures.append('\n'); failures.append("Row[" + (cellC.getRowIndex() + 1)+ "]: " + cellC.getCellFormula() + " "); failures.append(e.getMessage()); - failureCount++; } } - - assertEquals("IRR assertions failed", 0, failures.length()); + assertEquals(0, failures.length(), "IRR assertions failed"); } private static void assertFormulaResult(CellValue cv, HSSFCell cell){ double actualValue = cv.getNumberValue(); double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel - assertEquals("Invalid formula result: " + cv, CellType.NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType(), "Invalid formula result: " + cv); assertEquals(expectedValue, actualValue, 1E-4); // should agree within 0.01% } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.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 org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; @@ -27,7 +27,7 @@ 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.Test; +import org.junit.jupiter.api.Test; /** * Tests for Excel function ISBLANK() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.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; /** * Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.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.ss.formula.eval.BlankEval; import org.apache.poi.ss.formula.eval.BoolEval; @@ -25,7 +25,7 @@ import org.apache.poi.ss.formula.eval.Er 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 Excel function LEN() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.functions; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -31,8 +31,8 @@ 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.CellReference; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * LogicalFunction unit tests. @@ -44,7 +44,7 @@ public class TestLogicalFunction { private Cell cell1; private Cell cell2; - @Before + @BeforeEach public void setUp() throws IOException { try (Workbook wb = new HSSFWorkbook()) { buildWorkbook(wb); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.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 for logical ISxxx functions as loaded from a test data spreadsheet.<p> */ public class TestLogicalFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestLogicalFunctionsFromSpreadsheet.class, "LogicalFunctionsTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ 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 lookup functions (VLOOKUP, HLOOKUP, LOOKUP, MATCH) as loaded from a test data spreadsheet.<p> @@ -31,8 +31,7 @@ import org.junit.runners.Parameterized.P * more easily. */ public final class TestLookupFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestLookupFunctionsFromSpreadsheet.class, "LookupFunctionsTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,9 @@ package org.apache.poi.ss.formula.functions; -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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.apache.poi.ss.formula.eval.AreaEval; import org.apache.poi.ss.formula.eval.BoolEval; @@ -27,7 +28,7 @@ import org.apache.poi.ss.formula.eval.Nu import org.apache.poi.ss.formula.eval.NumericValueEval; 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; /** * Test cases for MATCH() @@ -52,9 +53,7 @@ public final class TestMatch { } private static void confirmInt(int expected, ValueEval actualEval) { - if(!(actualEval instanceof NumericValueEval)) { - fail("Expected numeric result but had " + actualEval); - } + assertTrue(actualEval instanceof NumericValueEval, "Expected numeric result but had " + actualEval); NumericValueEval nve = (NumericValueEval)actualEval; assertEquals(expected, nve.getNumberValue(), 0); } @@ -283,7 +282,7 @@ public final class TestMatch { confirmInt(2, invokeMatch(new NumberEval(5), ae, MATCH_LARGEST_LTE)); - assertEquals("Should return #REF! for invalid match type", - ErrorEval.REF_INVALID, invokeMatch(new StringEval("Ben"), ae, MATCH_INVALID)); + assertEquals(ErrorEval.REF_INVALID, invokeMatch(new StringEval("Ben"), ae, MATCH_INVALID), + "Should return #REF! for invalid match type"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ 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 Match functions as loaded from a test data spreadsheet.<p> @@ -29,8 +29,7 @@ import org.junit.runners.Parameterized.P * more easily. */ public final class TestMatchFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestMatchFunctionsFromSpreadsheet.class, "MatchFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java Thu Dec 24 18:42:29 2020 @@ -20,10 +20,10 @@ */ package org.apache.poi.ss.formula.functions; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ss.formula.functions.XYNumericFunction.Accumulator; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -37,22 +37,22 @@ public class TestMathX extends BaseTestN double d; d = MathX.acosh(0); - assertTrue("Acosh 0 is NaN", Double.isNaN(d)); + assertTrue( Double.isNaN(d), "Acosh 0 is NaN" ); d = MathX.acosh(1); - assertEquals("Acosh 1 ", 0, d); + assertDouble("Acosh 1 ", 0, d); d = MathX.acosh(-1); - assertTrue("Acosh -1 is NaN", Double.isNaN(d)); + assertTrue( Double.isNaN(d), "Acosh -1 is NaN" ); d = MathX.acosh(100); - assertEquals("Acosh 100 ", 5.298292366d, d); + assertDouble("Acosh 100 ", 5.298292366d, d); d = MathX.acosh(101.001); - assertEquals("Acosh 101.001 ", 5.308253091d, d); + assertDouble("Acosh 101.001 ", 5.308253091d, d); d = MathX.acosh(200000); - assertEquals("Acosh 200000 ", 12.89921983d, d); + assertDouble("Acosh 200000 ", 12.89921983d, d); } @@ -61,25 +61,25 @@ public class TestMathX extends BaseTestN double d; d = MathX.asinh(0); - assertEquals("asinh 0", d, 0); + assertDouble("asinh 0", d, 0); d = MathX.asinh(1); - assertEquals("asinh 1 ", 0.881373587, d); + assertDouble("asinh 1 ", 0.881373587, d); d = MathX.asinh(-1); - assertEquals("asinh -1 ", -0.881373587, d); + assertDouble("asinh -1 ", -0.881373587, d); d = MathX.asinh(-100); - assertEquals("asinh -100 ", -5.298342366, d); + assertDouble("asinh -100 ", -5.298342366, d); d = MathX.asinh(100); - assertEquals("asinh 100 ", 5.298342366, d); + assertDouble("asinh 100 ", 5.298342366, d); d = MathX.asinh(200000); - assertEquals("asinh 200000", 12.899219826096400, d); + assertDouble("asinh 200000", 12.899219826096400, d); d = MathX.asinh(-200000); - assertEquals("asinh -200000 ", -12.899223853137, d); + assertDouble("asinh -200000 ", -12.899223853137, d); } @@ -87,31 +87,31 @@ public class TestMathX extends BaseTestN public void testAtanh() { double d; d = MathX.atanh(0); - assertEquals("atanh 0", d, 0); + assertDouble("atanh 0", d, 0); d = MathX.atanh(1); - assertEquals("atanh 1 ", Double.POSITIVE_INFINITY, d); + assertDouble("atanh 1 ", Double.POSITIVE_INFINITY, d); d = MathX.atanh(-1); - assertEquals("atanh -1 ", Double.NEGATIVE_INFINITY, d); + assertDouble("atanh -1 ", Double.NEGATIVE_INFINITY, d); d = MathX.atanh(-100); - assertEquals("atanh -100 ", Double.NaN, d); + assertDouble("atanh -100 ", Double.NaN, d); d = MathX.atanh(100); - assertEquals("atanh 100 ", Double.NaN, d); + assertDouble("atanh 100 ", Double.NaN, d); d = MathX.atanh(200000); - assertEquals("atanh 200000", Double.NaN, d); + assertDouble("atanh 200000", Double.NaN, d); d = MathX.atanh(-200000); - assertEquals("atanh -200000 ", Double.NaN, d); + assertDouble("atanh -200000 ", Double.NaN, d); d = MathX.atanh(0.1); - assertEquals("atanh 0.1", 0.100335348, d); + assertDouble("atanh 0.1", 0.100335348, d); d = MathX.atanh(-0.1); - assertEquals("atanh -0.1 ", -0.100335348, d); + assertDouble("atanh -0.1 ", -0.100335348, d); } @@ -119,31 +119,31 @@ public class TestMathX extends BaseTestN public void testCosh() { double d; d = MathX.cosh(0); - assertEquals("cosh 0", 1, d); + assertDouble("cosh 0", 1, d); d = MathX.cosh(1); - assertEquals("cosh 1 ", 1.543080635, d); + assertDouble("cosh 1 ", 1.543080635, d); d = MathX.cosh(-1); - assertEquals("cosh -1 ", 1.543080635, d); + assertDouble("cosh -1 ", 1.543080635, d); d = MathX.cosh(-100); - assertEquals("cosh -100 ", 1.344058570908070E+43, d); + assertDouble("cosh -100 ", 1.344058570908070E+43, d); d = MathX.cosh(100); - assertEquals("cosh 100 ", 1.344058570908070E+43, d); + assertDouble("cosh 100 ", 1.344058570908070E+43, d); d = MathX.cosh(15); - assertEquals("cosh 15", 1634508.686, d); + assertDouble("cosh 15", 1634508.686, d); d = MathX.cosh(-15); - assertEquals("cosh -15 ", 1634508.686, d); + assertDouble("cosh -15 ", 1634508.686, d); d = MathX.cosh(0.1); - assertEquals("cosh 0.1", 1.005004168, d); + assertDouble("cosh 0.1", 1.005004168, d); d = MathX.cosh(-0.1); - assertEquals("cosh -0.1 ", 1.005004168, d); + assertDouble("cosh -0.1 ", 1.005004168, d); } @@ -151,31 +151,31 @@ public class TestMathX extends BaseTestN public void testTanh() { double d; d = MathX.tanh(0); - assertEquals("tanh 0", 0, d); + assertDouble("tanh 0", 0, d); d = MathX.tanh(1); - assertEquals("tanh 1 ", 0.761594156, d); + assertDouble("tanh 1 ", 0.761594156, d); d = MathX.tanh(-1); - assertEquals("tanh -1 ", -0.761594156, d); + assertDouble("tanh -1 ", -0.761594156, d); d = MathX.tanh(-100); - assertEquals("tanh -100 ", -1, d); + assertDouble("tanh -100 ", -1, d); d = MathX.tanh(100); - assertEquals("tanh 100 ", 1, d); + assertDouble("tanh 100 ", 1, d); d = MathX.tanh(15); - assertEquals("tanh 15", 1, d); + assertDouble("tanh 15", 1, d); d = MathX.tanh(-15); - assertEquals("tanh -15 ", -1, d); + assertDouble("tanh -15 ", -1, d); d = MathX.tanh(0.1); - assertEquals("tanh 0.1", 0.099667995, d); + assertDouble("tanh 0.1", 0.099667995, d); d = MathX.tanh(-0.1); - assertEquals("tanh -0.1 ", -0.099667995, d); + assertDouble("tanh -0.1 ", -0.099667995, d); } @@ -189,11 +189,11 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; double m = MathX.max(d); - assertEquals("Max ", 20.1, m); + assertDouble("Max ", 20.1, m); d = new double[1000]; m = MathX.max(d); - assertEquals("Max ", 0, m); + assertDouble("Max ", 0, m); d[0] = -1.1; d[1] = 2.1; d[2] = -3.1; d[3] = 4.1; d[4] = -5.1; d[5] = 6.1; d[6] = -7.1; d[7] = 8.1; @@ -201,7 +201,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = 14.1; d[14] = -15.1; d[15] = 16.1; d[16] = -17.1; d[17] = 18.1; d[18] = -19.1; d[19] = 20.1; m = MathX.max(d); - assertEquals("Max ", 20.1, m); + assertDouble("Max ", 20.1, m); d = new double[20]; d[0] = -1.1; d[1] = -2.1; d[2] = -3.1; d[3] = -4.1; @@ -210,7 +210,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = -14.1; d[14] = -15.1; d[15] = -16.1; d[16] = -17.1; d[17] = -18.1; d[18] = -19.1; d[19] = -20.1; m = MathX.max(d); - assertEquals("Max ", -1.1, m); + assertDouble("Max ", -1.1, m); } @@ -224,7 +224,7 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; double m = MathX.min(d); - assertEquals("Min ", 0, m); + assertDouble("Min ", 0, m); d = new double[20]; d[0] = 1.1; d[1] = 2.1; d[2] = 3.1; d[3] = 4.1; @@ -234,11 +234,11 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; m = MathX.min(d); - assertEquals("Min ", 1.1, m); + assertDouble("Min ", 1.1, m); d = new double[1000]; m = MathX.min(d); - assertEquals("Min ", 0, m); + assertDouble("Min ", 0, m); d[0] = -1.1; d[1] = 2.1; d[2] = -3.1; d[3] = 4.1; d[4] = -5.1; d[5] = 6.1; d[6] = -7.1; d[7] = 8.1; @@ -246,7 +246,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = 14.1; d[14] = -15.1; d[15] = 16.1; d[16] = -17.1; d[17] = 18.1; d[18] = -19.1; d[19] = 20.1; m = MathX.min(d); - assertEquals("Min ", -19.1, m); + assertDouble("Min ", -19.1, m); d = new double[20]; d[0] = -1.1; d[1] = -2.1; d[2] = -3.1; d[3] = -4.1; @@ -255,20 +255,20 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = -14.1; d[14] = -15.1; d[15] = -16.1; d[16] = -17.1; d[17] = -18.1; d[18] = -19.1; d[19] = -20.1; m = MathX.min(d); - assertEquals("Min ", -20.1, m); + assertDouble("Min ", -20.1, m); } @Test public void testProduct() { - assertEquals("Product ", 0, MathX.product(null)); - assertEquals("Product ", 0, MathX.product(new double[] {})); - assertEquals("Product ", 0, MathX.product(new double[] {1, 0})); - - assertEquals("Product ", 1, MathX.product(new double[] { 1 })); - assertEquals("Product ", 1, MathX.product(new double[] { 1, 1 })); - assertEquals("Product ", 10, MathX.product(new double[] { 10, 1 })); - assertEquals("Product ", -2, MathX.product(new double[] { 2, -1 })); - assertEquals("Product ", 99988000209999d, MathX.product(new double[] { 99999, 99999, 9999 })); + assertDouble("Product ", 0, MathX.product(null)); + assertDouble("Product ", 0, MathX.product(new double[] {})); + assertDouble("Product ", 0, MathX.product(new double[] {1, 0})); + + assertDouble("Product ", 1, MathX.product(new double[] { 1 })); + assertDouble("Product ", 1, MathX.product(new double[] { 1, 1 })); + assertDouble("Product ", 10, MathX.product(new double[] { 10, 1 })); + assertDouble("Product ", -2, MathX.product(new double[] { 2, -1 })); + assertDouble("Product ", 99988000209999d, MathX.product(new double[] { 99999, 99999, 9999 })); double[] d = new double[100]; d[0] = 1.1; d[1] = 2.1; d[2] = 3.1; d[3] = 4.1; @@ -278,7 +278,7 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; double m = MathX.product(d); - assertEquals("Product ", 0, m); + assertDouble("Product ", 0, m); d = new double[20]; d[0] = 1.1; d[1] = 2.1; d[2] = 3.1; d[3] = 4.1; @@ -288,11 +288,11 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; m = MathX.product(d); - assertEquals("Product ", 3459946360003355534d, m); + assertDouble("Product ", 3459946360003355534d, m); d = new double[1000]; m = MathX.product(d); - assertEquals("Product ", 0, m); + assertDouble("Product ", 0, m); d = new double[20]; d[0] = -1.1; d[1] = -2.1; d[2] = -3.1; d[3] = -4.1; @@ -301,29 +301,29 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = -14.1; d[14] = -15.1; d[15] = -16.1; d[16] = -17.1; d[17] = -18.1; d[18] = -19.1; d[19] = -20.1; m = MathX.product(d); - assertEquals("Product ", 3459946360003355534d, m); + assertDouble("Product ", 3459946360003355534d, m); } @Test public void testMod() { //example from Excel help - assertEquals(1.0, MathX.mod(3, 2)); - assertEquals(1.0, MathX.mod(-3, 2)); - assertEquals(-1.0, MathX.mod(3, -2)); - assertEquals(-1.0, MathX.mod(-3, -2)); - - assertEquals(0.0, MathX.mod(0, 2)); - assertEquals(Double.NaN, MathX.mod(3, 0)); - assertEquals(1.4, MathX.mod(3.4, 2)); - assertEquals(-1.4, MathX.mod(-3.4, -2)); - assertEquals(0.6000000000000001, MathX.mod(-3.4, 2.0));// should actually be 0.6 - assertEquals(-0.6000000000000001, MathX.mod(3.4, -2.0));// should actually be -0.6 - assertEquals(3.0, MathX.mod(3, Double.MAX_VALUE)); - assertEquals(2.0, MathX.mod(Double.MAX_VALUE, 3)); + assertDouble(1.0, MathX.mod(3, 2)); + assertDouble(1.0, MathX.mod(-3, 2)); + assertDouble(-1.0, MathX.mod(3, -2)); + assertDouble(-1.0, MathX.mod(-3, -2)); + + assertDouble(0.0, MathX.mod(0, 2)); + assertDouble(Double.NaN, MathX.mod(3, 0)); + assertDouble(1.4, MathX.mod(3.4, 2)); + assertDouble(-1.4, MathX.mod(-3.4, -2)); + assertDouble(0.6000000000000001, MathX.mod(-3.4, 2.0));// should actually be 0.6 + assertDouble(-0.6000000000000001, MathX.mod(3.4, -2.0));// should actually be -0.6 + assertDouble(3.0, MathX.mod(3, Double.MAX_VALUE)); + assertDouble(2.0, MathX.mod(Double.MAX_VALUE, 3)); // Bugzilla 50033 - assertEquals(1.0, MathX.mod(13, 12)); + assertDouble(1.0, MathX.mod(13, 12)); } @Test @@ -331,47 +331,47 @@ public class TestMathX extends BaseTestN int n=100; int k=50; double d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 1.00891344545564E29, d); + assertDouble("NChooseK ", 1.00891344545564E29, d); n = -1; k = 1; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", Double.NaN, d); + assertDouble("NChooseK ", Double.NaN, d); n = 1; k = -1; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", Double.NaN, d); + assertDouble("NChooseK ", Double.NaN, d); n = 0; k = 1; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", Double.NaN, d); + assertDouble("NChooseK ", Double.NaN, d); n = 1; k = 0; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 1, d); + assertDouble("NChooseK ", 1, d); n = 10; k = 9; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 10, d); + assertDouble("NChooseK ", 10, d); n = 10; k = 10; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 1, d); + assertDouble("NChooseK ", 1, d); n = 10; k = 1; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 10, d); + assertDouble("NChooseK ", 10, d); n = 1000; k = 1; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 1000, d); // awesome ;) + assertDouble("NChooseK ", 1000, d); // awesome ;) n = 1000; k = 2; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 499500, d); // awesome ;) + assertDouble("NChooseK ", 499500, d); // awesome ;) n = 13; k = 7; d = MathX.nChooseK(n, k); - assertEquals("NChooseK ", 1716, d); + assertDouble("NChooseK ", 1716, d); } @@ -383,48 +383,48 @@ public class TestMathX extends BaseTestN double d; - assertEquals("Sign ", minus, MathX.sign(minus)); - assertEquals("Sign ", plus, MathX.sign(plus)); - assertEquals("Sign ", zero, MathX.sign(zero)); + assertDouble("Sign ", minus, MathX.sign(minus)); + assertDouble("Sign ", plus, MathX.sign(plus)); + assertDouble("Sign ", zero, MathX.sign(zero)); d = 0; - assertEquals("Sign ", zero, MathX.sign(d)); + assertDouble("Sign ", zero, MathX.sign(d)); d = -1.000001; - assertEquals("Sign ", minus, MathX.sign(d)); + assertDouble("Sign ", minus, MathX.sign(d)); d = -.000001; - assertEquals("Sign ", minus, MathX.sign(d)); + assertDouble("Sign ", minus, MathX.sign(d)); d = -1E-200; - assertEquals("Sign ", minus, MathX.sign(d)); + assertDouble("Sign ", minus, MathX.sign(d)); d = Double.NEGATIVE_INFINITY; - assertEquals("Sign ", minus, MathX.sign(d)); + assertDouble("Sign ", minus, MathX.sign(d)); d = -200.11; - assertEquals("Sign ", minus, MathX.sign(d)); + assertDouble("Sign ", minus, MathX.sign(d)); d = -2000000000000.11; - assertEquals("Sign ", minus, MathX.sign(d)); + assertDouble("Sign ", minus, MathX.sign(d)); d = 1.000001; - assertEquals("Sign ", plus, MathX.sign(d)); + assertDouble("Sign ", plus, MathX.sign(d)); d = .000001; - assertEquals("Sign ", plus, MathX.sign(d)); + assertDouble("Sign ", plus, MathX.sign(d)); d = 1E-200; - assertEquals("Sign ", plus, MathX.sign(d)); + assertDouble("Sign ", plus, MathX.sign(d)); d = Double.POSITIVE_INFINITY; - assertEquals("Sign ", plus, MathX.sign(d)); + assertDouble("Sign ", plus, MathX.sign(d)); d = 200.11; - assertEquals("Sign ", plus, MathX.sign(d)); + assertDouble("Sign ", plus, MathX.sign(d)); d = 2000000000000.11; - assertEquals("Sign ", plus, MathX.sign(d)); + assertDouble("Sign ", plus, MathX.sign(d)); } @@ -432,31 +432,31 @@ public class TestMathX extends BaseTestN public void testSinh() { double d; d = MathX.sinh(0); - assertEquals("sinh 0", 0, d); + assertDouble("sinh 0", 0, d); d = MathX.sinh(1); - assertEquals("sinh 1 ", 1.175201194, d); + assertDouble("sinh 1 ", 1.175201194, d); d = MathX.sinh(-1); - assertEquals("sinh -1 ", -1.175201194, d); + assertDouble("sinh -1 ", -1.175201194, d); d = MathX.sinh(-100); - assertEquals("sinh -100 ", -1.344058570908070E+43, d); + assertDouble("sinh -100 ", -1.344058570908070E+43, d); d = MathX.sinh(100); - assertEquals("sinh 100 ", 1.344058570908070E+43, d); + assertDouble("sinh 100 ", 1.344058570908070E+43, d); d = MathX.sinh(15); - assertEquals("sinh 15", 1634508.686, d); + assertDouble("sinh 15", 1634508.686, d); d = MathX.sinh(-15); - assertEquals("sinh -15 ", -1634508.686, d); + assertDouble("sinh -15 ", -1634508.686, d); d = MathX.sinh(0.1); - assertEquals("sinh 0.1", 0.10016675, d); + assertDouble("sinh 0.1", 0.10016675, d); d = MathX.sinh(-0.1); - assertEquals("sinh -0.1 ", -0.10016675, d); + assertDouble("sinh -0.1 ", -0.10016675, d); } @@ -470,11 +470,11 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; double s = MathX.sum(d); - assertEquals("Sum ", 212, s); + assertDouble("Sum ", 212, s); d = new double[1000]; s = MathX.sum(d); - assertEquals("Sum ", 0, s); + assertDouble("Sum ", 0, s); d[0] = -1.1; d[1] = 2.1; d[2] = -3.1; d[3] = 4.1; d[4] = -5.1; d[5] = 6.1; d[6] = -7.1; d[7] = 8.1; @@ -482,7 +482,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = 14.1; d[14] = -15.1; d[15] = 16.1; d[16] = -17.1; d[17] = 18.1; d[18] = -19.1; d[19] = 20.1; s = MathX.sum(d); - assertEquals("Sum ", 10, s); + assertDouble("Sum ", 10, s); d[0] = -1.1; d[1] = -2.1; d[2] = -3.1; d[3] = -4.1; d[4] = -5.1; d[5] = -6.1; d[6] = -7.1; d[7] = -8.1; @@ -490,7 +490,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = -14.1; d[14] = -15.1; d[15] = -16.1; d[16] = -17.1; d[17] = -18.1; d[18] = -19.1; d[19] = -20.1; s = MathX.sum(d); - assertEquals("Sum ", -212, s); + assertDouble("Sum ", -212, s); } @@ -504,11 +504,11 @@ public class TestMathX extends BaseTestN d[16] = 17.1; d[17] = 18.1; d[18] = 19.1; d[19] = 20.1; double s = MathX.sumsq(d); - assertEquals("Sumsq ", 2912.2, s); + assertDouble("Sumsq ", 2912.2, s); d = new double[1000]; s = MathX.sumsq(d); - assertEquals("Sumsq ", 0, s); + assertDouble("Sumsq ", 0, s); d[0] = -1.1; d[1] = 2.1; d[2] = -3.1; d[3] = 4.1; d[4] = -5.1; d[5] = 6.1; d[6] = -7.1; d[7] = 8.1; @@ -516,7 +516,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = 14.1; d[14] = -15.1; d[15] = 16.1; d[16] = -17.1; d[17] = 18.1; d[18] = -19.1; d[19] = 20.1; s = MathX.sumsq(d); - assertEquals("Sumsq ", 2912.2, s); + assertDouble("Sumsq ", 2912.2, s); d[0] = -1.1; d[1] = -2.1; d[2] = -3.1; d[3] = -4.1; d[4] = -5.1; d[5] = -6.1; d[6] = -7.1; d[7] = -8.1; @@ -524,7 +524,7 @@ public class TestMathX extends BaseTestN d[12] = -13.1; d[13] = -14.1; d[14] = -15.1; d[15] = -16.1; d[16] = -17.1; d[17] = -18.1; d[18] = -19.1; d[19] = -20.1; s = MathX.sumsq(d); - assertEquals("Sumsq ", 2912.2, s); + assertDouble("Sumsq ", 2912.2, s); } @Test @@ -534,27 +534,27 @@ public class TestMathX extends BaseTestN n = 0; s = MathX.factorial(n); - assertEquals("Factorial ", 1, s); + assertDouble("Factorial ", 1, s); n = 1; s = MathX.factorial(n); - assertEquals("Factorial ", 1, s); + assertDouble("Factorial ", 1, s); n = 10; s = MathX.factorial(n); - assertEquals("Factorial ", 3628800, s); + assertDouble("Factorial ", 3628800, s); n = 99; s = MathX.factorial(n); - assertEquals("Factorial ", 9.33262154439E+155, s); + assertDouble("Factorial ", 9.33262154439E+155, s); n = -1; s = MathX.factorial(n); - assertEquals("Factorial ", Double.NaN, s); + assertDouble("Factorial ", Double.NaN, s); n = Integer.MAX_VALUE; s = MathX.factorial(n); - assertEquals("Factorial ", Double.POSITIVE_INFINITY, s); + assertDouble("Factorial ", Double.POSITIVE_INFINITY, s); } @Test @@ -651,7 +651,7 @@ public class TestMathX extends BaseTestN for (int i = 0; i < xarr.length; i++) { result += acc.accumulate(xarr[i], yarr[i]); } - assertEquals(expectedResult, result); + assertDouble(expectedResult, result); } @Test @@ -660,70 +660,70 @@ public class TestMathX extends BaseTestN int p; d = 0; p = 0; - assertEquals("round ", 0, MathX.round(d, p)); + assertDouble("round ", 0, MathX.round(d, p)); d = 10; p = 0; - assertEquals("round ", 10, MathX.round(d, p)); + assertDouble("round ", 10, MathX.round(d, p)); d = 123.23; p = 0; - assertEquals("round ", 123, MathX.round(d, p)); + assertDouble("round ", 123, MathX.round(d, p)); d = -123.23; p = 0; - assertEquals("round ", -123, MathX.round(d, p)); + assertDouble("round ", -123, MathX.round(d, p)); d = 123.12; p = 2; - assertEquals("round ", 123.12, MathX.round(d, p)); + assertDouble("round ", 123.12, MathX.round(d, p)); d = 88.123459; p = 5; - assertEquals("round ", 88.12346, MathX.round(d, p)); + assertDouble("round ", 88.12346, MathX.round(d, p)); d = 0; p = 2; - assertEquals("round ", 0, MathX.round(d, p)); + assertDouble("round ", 0, MathX.round(d, p)); d = 0; p = -1; - assertEquals("round ", 0, MathX.round(d, p)); + assertDouble("round ", 0, MathX.round(d, p)); d = 0.01; p = -1; - assertEquals("round ", 0, MathX.round(d, p)); + assertDouble("round ", 0, MathX.round(d, p)); d = 123.12; p = -2; - assertEquals("round ", 100, MathX.round(d, p)); + assertDouble("round ", 100, MathX.round(d, p)); d = 88.123459; p = -3; - assertEquals("round ", 0, MathX.round(d, p)); + assertDouble("round ", 0, MathX.round(d, p)); d = 49.00000001; p = -1; - assertEquals("round ", 50, MathX.round(d, p)); + assertDouble("round ", 50, MathX.round(d, p)); d = 149.999999; p = -2; - assertEquals("round ", 100, MathX.round(d, p)); + assertDouble("round ", 100, MathX.round(d, p)); d = 150.0; p = -2; - assertEquals("round ", 200, MathX.round(d, p)); + assertDouble("round ", 200, MathX.round(d, p)); d = 2162.615d; p = 2; - assertEquals("round ", 2162.62d, MathX.round(d, p)); + assertDouble("round ", 2162.62d, MathX.round(d, p)); d = 0.049999999999999975d; p = 2; - assertEquals("round ", 0.05d, MathX.round(d, p)); + assertDouble("round ", 0.05d, MathX.round(d, p)); d = 0.049999999999999975d; p = 1; - assertEquals("round ", 0.1d, MathX.round(d, p)); + assertDouble("round ", 0.1d, MathX.round(d, p)); d = Double.NaN; p = 1; - assertEquals("round ", Double.NaN, MathX.round(d, p)); + assertDouble("round ", Double.NaN, MathX.round(d, p)); d = Double.POSITIVE_INFINITY; p = 1; - assertEquals("round ", Double.NaN, MathX.round(d, p)); + assertDouble("round ", Double.NaN, MathX.round(d, p)); d = Double.NEGATIVE_INFINITY; p = 1; - assertEquals("round ", Double.NaN, MathX.round(d, p)); + assertDouble("round ", Double.NaN, MathX.round(d, p)); d = Double.MAX_VALUE; p = 1; - assertEquals("round ", Double.MAX_VALUE, MathX.round(d, p)); + assertDouble("round ", Double.MAX_VALUE, MathX.round(d, p)); d = Double.MIN_VALUE; p = 1; - assertEquals("round ", 0.0d, MathX.round(d, p)); + assertDouble("round ", 0.0d, MathX.round(d, p)); } @Test @@ -732,70 +732,70 @@ public class TestMathX extends BaseTestN int p; d = 0; p = 0; - assertEquals("roundDown ", 0, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0, MathX.roundDown(d, p)); d = 10; p = 0; - assertEquals("roundDown ", 10, MathX.roundDown(d, p)); + assertDouble("roundDown ", 10, MathX.roundDown(d, p)); d = 123.99; p = 0; - assertEquals("roundDown ", 123, MathX.roundDown(d, p)); + assertDouble("roundDown ", 123, MathX.roundDown(d, p)); d = -123.99; p = 0; - assertEquals("roundDown ", -123, MathX.roundDown(d, p)); + assertDouble("roundDown ", -123, MathX.roundDown(d, p)); d = 123.99; p = 2; - assertEquals("roundDown ", 123.99, MathX.roundDown(d, p)); + assertDouble("roundDown ", 123.99, MathX.roundDown(d, p)); d = 88.123459; p = 5; - assertEquals("roundDown ", 88.12345, MathX.roundDown(d, p)); + assertDouble("roundDown ", 88.12345, MathX.roundDown(d, p)); d = 0; p = 2; - assertEquals("roundDown ", 0, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0, MathX.roundDown(d, p)); d = 0; p = -1; - assertEquals("roundDown ", 0, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0, MathX.roundDown(d, p)); d = 0.01; p = -1; - assertEquals("roundDown ", 0, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0, MathX.roundDown(d, p)); d = 199.12; p = -2; - assertEquals("roundDown ", 100, MathX.roundDown(d, p)); + assertDouble("roundDown ", 100, MathX.roundDown(d, p)); d = 88.123459; p = -3; - assertEquals("roundDown ", 0, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0, MathX.roundDown(d, p)); d = 99.00000001; p = -1; - assertEquals("roundDown ", 90, MathX.roundDown(d, p)); + assertDouble("roundDown ", 90, MathX.roundDown(d, p)); d = 100.00001; p = -2; - assertEquals("roundDown ", 100, MathX.roundDown(d, p)); + assertDouble("roundDown ", 100, MathX.roundDown(d, p)); d = 150.0; p = -2; - assertEquals("roundDown ", 100, MathX.roundDown(d, p)); + assertDouble("roundDown ", 100, MathX.roundDown(d, p)); d = 0.0499999999999975d; p = 2; - assertEquals("roundDown ", 0.04d, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0.04d, MathX.roundDown(d, p)); d = 0.049999999999999975d; p = 1; - assertEquals("roundDown ", 0.0d, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0.0d, MathX.roundDown(d, p)); d = Double.NaN; p = 1; - assertEquals("roundDown ", Double.NaN, MathX.roundDown(d, p)); + assertDouble("roundDown ", Double.NaN, MathX.roundDown(d, p)); d = Double.POSITIVE_INFINITY; p = 1; - assertEquals("roundDown ", Double.NaN, MathX.roundDown(d, p)); + assertDouble("roundDown ", Double.NaN, MathX.roundDown(d, p)); d = Double.NEGATIVE_INFINITY; p = 1; - assertEquals("roundDown ", Double.NaN, MathX.roundDown(d, p)); + assertDouble("roundDown ", Double.NaN, MathX.roundDown(d, p)); d = Double.MAX_VALUE; p = 1; - assertEquals("roundDown ", Double.MAX_VALUE, MathX.roundDown(d, p)); + assertDouble("roundDown ", Double.MAX_VALUE, MathX.roundDown(d, p)); d = Double.MIN_VALUE; p = 1; - assertEquals("roundDown ", 0.0d, MathX.roundDown(d, p)); + assertDouble("roundDown ", 0.0d, MathX.roundDown(d, p)); d = 3987 * 0.2; p = 2; - assertEquals("roundDown ", 797.40, MathX.round(d, p)); + assertDouble("roundDown ", 797.40, MathX.round(d, p)); } @Test @@ -804,75 +804,75 @@ public class TestMathX extends BaseTestN int p; d = 0; p = 0; - assertEquals("roundUp ", 0, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0, MathX.roundUp(d, p)); d = 10; p = 0; - assertEquals("roundUp ", 10, MathX.roundUp(d, p)); + assertDouble("roundUp ", 10, MathX.roundUp(d, p)); d = 123.23; p = 0; - assertEquals("roundUp ", 124, MathX.roundUp(d, p)); + assertDouble("roundUp ", 124, MathX.roundUp(d, p)); d = -123.23; p = 0; - assertEquals("roundUp ", -124, MathX.roundUp(d, p)); + assertDouble("roundUp ", -124, MathX.roundUp(d, p)); d = 123.12; p = 2; - assertEquals("roundUp ", 123.12, MathX.roundUp(d, p)); + assertDouble("roundUp ", 123.12, MathX.roundUp(d, p)); d = 88.123459; p = 5; - assertEquals("roundUp ", 88.12346, MathX.roundUp(d, p)); + assertDouble("roundUp ", 88.12346, MathX.roundUp(d, p)); d = 0; p = 2; - assertEquals("roundUp ", 0, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0, MathX.roundUp(d, p)); d = 0; p = -1; - assertEquals("roundUp ", 0, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0, MathX.roundUp(d, p)); d = 0.01; p = -1; - assertEquals("roundUp ", 10, MathX.roundUp(d, p)); + assertDouble("roundUp ", 10, MathX.roundUp(d, p)); d = 123.12; p = -2; - assertEquals("roundUp ", 200, MathX.roundUp(d, p)); + assertDouble("roundUp ", 200, MathX.roundUp(d, p)); d = 88.123459; p = -3; - assertEquals("roundUp ", 1000, MathX.roundUp(d, p)); + assertDouble("roundUp ", 1000, MathX.roundUp(d, p)); d = 49.00000001; p = -1; - assertEquals("roundUp ", 50, MathX.roundUp(d, p)); + assertDouble("roundUp ", 50, MathX.roundUp(d, p)); d = 149.999999; p = -2; - assertEquals("roundUp ", 200, MathX.roundUp(d, p)); + assertDouble("roundUp ", 200, MathX.roundUp(d, p)); d = 150.0; p = -2; - assertEquals("roundUp ", 200, MathX.roundUp(d, p)); + assertDouble("roundUp ", 200, MathX.roundUp(d, p)); d = 0.049999999999999975d; p = 2; - assertEquals("roundUp ", 0.05d, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0.05d, MathX.roundUp(d, p)); d = 0.049999999999999975d; p = 1; - assertEquals("roundUp ", 0.1d, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0.1d, MathX.roundUp(d, p)); d = Double.NaN; p = 1; - assertEquals("roundUp ", Double.NaN, MathX.roundUp(d, p)); + assertDouble("roundUp ", Double.NaN, MathX.roundUp(d, p)); d = Double.POSITIVE_INFINITY; p = 1; - assertEquals("roundUp ", Double.NaN, MathX.roundUp(d, p)); + assertDouble("roundUp ", Double.NaN, MathX.roundUp(d, p)); d = Double.NEGATIVE_INFINITY; p = 1; - assertEquals("roundUp ", Double.NaN, MathX.roundUp(d, p)); + assertDouble("roundUp ", Double.NaN, MathX.roundUp(d, p)); d = Double.MAX_VALUE; p = 1; - assertEquals("roundUp ", Double.MAX_VALUE, MathX.roundUp(d, p)); + assertDouble("roundUp ", Double.MAX_VALUE, MathX.roundUp(d, p)); // Excel's min positive value is several orders of magnitude larger than Java's (Java 8: 4.9e-324, Excel 2016 on Windows 10: 2.2259157957E-308) d = Double.MIN_VALUE; p = 1; - assertEquals("roundUp ", 0.0d, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0.0d, MathX.roundUp(d, p)); d = 2.2259157957E-308; p = 1; - assertEquals("roundUp ", 0.1d, MathX.roundUp(d, p)); + assertDouble("roundUp ", 0.1d, MathX.roundUp(d, p)); //github-43: https://github.com/apache/poi/pull/43 // "ROUNDUP(3987*0.2, 2) currently fails by returning 797.41") d = 3987 * 0.2; p = 2; - assertEquals("roundUp ", 797.40, MathX.roundUp(d, p)); + assertDouble("roundUp ", 797.40, MathX.roundUp(d, p)); } @Test @@ -881,84 +881,84 @@ public class TestMathX extends BaseTestN double s; d = 0; s = 0; - assertEquals("ceiling ", 0, MathX.ceiling(d, s)); + assertDouble("ceiling ", 0, MathX.ceiling(d, s)); d = 1; s = 0; - assertEquals("ceiling ", 0, MathX.ceiling(d, s)); + assertDouble("ceiling ", 0, MathX.ceiling(d, s)); d = 0; s = 1; - assertEquals("ceiling ", 0, MathX.ceiling(d, s)); + assertDouble("ceiling ", 0, MathX.ceiling(d, s)); d = -1; s = 0; - assertEquals("ceiling ", 0, MathX.ceiling(d, s)); + assertDouble("ceiling ", 0, MathX.ceiling(d, s)); d = 0; s = -1; - assertEquals("ceiling ", 0, MathX.ceiling(d, s)); + assertDouble("ceiling ", 0, MathX.ceiling(d, s)); d = 10; s = 1.11; - assertEquals("ceiling ", 11.1, MathX.ceiling(d, s)); + assertDouble("ceiling ", 11.1, MathX.ceiling(d, s)); d = 11.12333; s = 0.03499; - assertEquals("ceiling ", 11.12682, MathX.ceiling(d, s)); + assertDouble("ceiling ", 11.12682, MathX.ceiling(d, s)); d = -11.12333; s = 0.03499; - assertEquals("ceiling ", Double.NaN, MathX.ceiling(d, s)); + assertDouble("ceiling ", Double.NaN, MathX.ceiling(d, s)); d = 11.12333; s = -0.03499; - assertEquals("ceiling ", Double.NaN, MathX.ceiling(d, s)); + assertDouble("ceiling ", Double.NaN, MathX.ceiling(d, s)); d = -11.12333; s = -0.03499; - assertEquals("ceiling ", -11.12682, MathX.ceiling(d, s)); + assertDouble("ceiling ", -11.12682, MathX.ceiling(d, s)); d = 100; s = 0.001; - assertEquals("ceiling ", 100, MathX.ceiling(d, s)); + assertDouble("ceiling ", 100, MathX.ceiling(d, s)); d = -0.001; s = -9.99; - assertEquals("ceiling ", -9.99, MathX.ceiling(d, s)); + assertDouble("ceiling ", -9.99, MathX.ceiling(d, s)); d = 4.42; s = 0.05; - assertEquals("ceiling ", 4.45, MathX.ceiling(d, s)); + assertDouble("ceiling ", 4.45, MathX.ceiling(d, s)); d = 0.05; s = 4.42; - assertEquals("ceiling ", 4.42, MathX.ceiling(d, s)); + assertDouble("ceiling ", 4.42, MathX.ceiling(d, s)); d = 0.6666; s = 3.33; - assertEquals("ceiling ", 3.33, MathX.ceiling(d, s)); + assertDouble("ceiling ", 3.33, MathX.ceiling(d, s)); d = 2d/3; s = 3.33; - assertEquals("ceiling ", 3.33, MathX.ceiling(d, s)); + assertDouble("ceiling ", 3.33, MathX.ceiling(d, s)); // samples from http://www.excelfunctions.net/Excel-Ceiling-Function.html // and https://support.office.com/en-us/article/CEILING-function-0a5cd7c8-0720-4f0a-bd2c-c943e510899f d = 22.25; s = 0.1; - assertEquals("ceiling ", 22.3, MathX.ceiling(d, s)); + assertDouble("ceiling ", 22.3, MathX.ceiling(d, s)); d = 22.25; s = 0.5; - assertEquals("ceiling ", 22.5, MathX.ceiling(d, s)); + assertDouble("ceiling ", 22.5, MathX.ceiling(d, s)); d = 22.25; s = 1; - assertEquals("ceiling ", 23, MathX.ceiling(d, s)); + assertDouble("ceiling ", 23, MathX.ceiling(d, s)); d = 22.25; s = 10; - assertEquals("ceiling ", 30, MathX.ceiling(d, s)); + assertDouble("ceiling ", 30, MathX.ceiling(d, s)); d = 22.25; s = 20; - assertEquals("ceiling ", 40, MathX.ceiling(d, s)); + assertDouble("ceiling ", 40, MathX.ceiling(d, s)); d = -22.25; s = -0.1; - assertEquals("ceiling ", -22.3, MathX.ceiling(d, s)); + assertDouble("ceiling ", -22.3, MathX.ceiling(d, s)); d = -22.25; s = -1; - assertEquals("ceiling ", -23, MathX.ceiling(d, s)); + assertDouble("ceiling ", -23, MathX.ceiling(d, s)); d = -22.25; s = -5; - assertEquals("ceiling ", -25, MathX.ceiling(d, s)); + assertDouble("ceiling ", -25, MathX.ceiling(d, s)); d = 22.25; s = 1; - assertEquals("ceiling ", 23, MathX.ceiling(d, s)); + assertDouble("ceiling ", 23, MathX.ceiling(d, s)); d = 22.25; s = -1; - assertEquals("ceiling ", Double.NaN, MathX.ceiling(d, s)); + assertDouble("ceiling ", Double.NaN, MathX.ceiling(d, s)); d = -22.25; s = 1; - assertEquals("ceiling ", -22, MathX.ceiling(d, s)); // returns an error in Excel 2007 & earlier + assertDouble("ceiling ", -22, MathX.ceiling(d, s)); // returns an error in Excel 2007 & earlier d = -22.25; s = -1; - assertEquals("ceiling ", -23, MathX.ceiling(d, s)); + assertDouble("ceiling ", -23, MathX.ceiling(d, s)); // test cases for newer versions of Excel where d can be negative for d = -11.12333; s = 0.03499; - assertEquals("ceiling ", -11.09183, MathX.ceiling(d, s)); + assertDouble("ceiling ", -11.09183, MathX.ceiling(d, s)); } @Test @@ -967,69 +967,69 @@ public class TestMathX extends BaseTestN double s; d = 0; s = 0; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); d = 1; s = 0; - assertEquals("floor ", Double.NaN, MathX.floor(d, s)); + assertDouble("floor ", Double.NaN, MathX.floor(d, s)); d = 0; s = 1; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); d = -1; s = 0; - assertEquals("floor ", Double.NaN, MathX.floor(d, s)); + assertDouble("floor ", Double.NaN, MathX.floor(d, s)); d = 0; s = -1; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); d = 10; s = 1.11; - assertEquals("floor ", 9.99, MathX.floor(d, s)); + assertDouble("floor ", 9.99, MathX.floor(d, s)); d = 11.12333; s = 0.03499; - assertEquals("floor ", 11.09183, MathX.floor(d, s)); + assertDouble("floor ", 11.09183, MathX.floor(d, s)); d = -11.12333; s = 0.03499; - assertEquals("floor ", Double.NaN, MathX.floor(d, s)); + assertDouble("floor ", Double.NaN, MathX.floor(d, s)); d = 11.12333; s = -0.03499; - assertEquals("floor ", Double.NaN, MathX.floor(d, s)); + assertDouble("floor ", Double.NaN, MathX.floor(d, s)); d = -11.12333; s = -0.03499; - assertEquals("floor ", -11.09183, MathX.floor(d, s)); + assertDouble("floor ", -11.09183, MathX.floor(d, s)); d = 100; s = 0.001; - assertEquals("floor ", 100, MathX.floor(d, s)); + assertDouble("floor ", 100, MathX.floor(d, s)); d = -0.001; s = -9.99; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); d = 4.42; s = 0.05; - assertEquals("floor ", 4.4, MathX.floor(d, s)); + assertDouble("floor ", 4.4, MathX.floor(d, s)); d = 0.05; s = 4.42; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); d = 0.6666; s = 3.33; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); d = 2d/3; s = 3.33; - assertEquals("floor ", 0, MathX.floor(d, s)); + assertDouble("floor ", 0, MathX.floor(d, s)); // samples from http://www.excelfunctions.net/Excel-Ceiling-Function.html // and https://support.office.com/en-us/article/CEILING-function-0a5cd7c8-0720-4f0a-bd2c-c943e510899f d = 3.7; s = 2; - assertEquals("floor ", 2, MathX.floor(d, s)); + assertDouble("floor ", 2, MathX.floor(d, s)); d = -2.5; s = -2; - assertEquals("floor ", -2, MathX.floor(d, s)); + assertDouble("floor ", -2, MathX.floor(d, s)); d = 2.5; s = -2; - assertEquals("floor ", Double.NaN, MathX.floor(d, s)); + assertDouble("floor ", Double.NaN, MathX.floor(d, s)); d = 1.58; s = 0.1; - assertEquals("floor ", 1.5, MathX.floor(d, s)); + assertDouble("floor ", 1.5, MathX.floor(d, s)); d = 0.234; s = 0.01; - assertEquals("floor ", 0.23, MathX.floor(d, s)); + assertDouble("floor ", 0.23, MathX.floor(d, s)); // see bug 62839 d = -123; s = 10; - assertEquals("floor ", -130, MathX.floor(d, s)); + assertDouble("floor ", -130, MathX.floor(d, s)); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.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.ss.formula.eval.AreaEval; import org.apache.poi.ss.formula.eval.BlankEval; @@ -27,7 +27,7 @@ import org.apache.poi.ss.formula.eval.Nu import org.apache.poi.ss.formula.eval.RefEval; 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 Excel function MID() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.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.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -30,7 +30,7 @@ import org.apache.poi.ss.formula.eval.Er import org.apache.poi.ss.formula.eval.EvaluationException; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link org.apache.poi.ss.formula.functions.Mirr} @@ -51,28 +51,28 @@ public final class TestMirr { double[] values = {-120000d, 39000d, 30000d, 21000d, 37000d, 46000d, reinvestRate, financeRate}; // MIRR should not failed with these parameters mirrValue = mirr.evaluate(values); - assertEquals("mirr", 0.126094130366, mirrValue, 0.0000000001); + assertEquals(0.126094130366, mirrValue, 0.0000000001); reinvestRate = 0.05; financeRate = 0.08; values = new double[]{-7500d, 3000d, 5000d, 1200d, 4000d, reinvestRate, financeRate}; // MIRR should not failed with these parameters mirrValue = mirr.evaluate(values); - assertEquals("mirr", 0.18736225093, mirrValue, 0.0000000001); + assertEquals(0.18736225093, mirrValue, 0.0000000001); reinvestRate = 0.065; financeRate = 0.1; values = new double[]{-10000, 3400d, 6500d, 1000d, reinvestRate, financeRate}; // MIRR should not failed with these parameters mirrValue = mirr.evaluate(values); - assertEquals("mirr", 0.07039493966, mirrValue, 0.0000000001); + assertEquals(0.07039493966, mirrValue, 0.0000000001); reinvestRate = 0.07; financeRate = 0.01; values = new double[]{-10000d, -3400d, -6500d, -1000d, reinvestRate, financeRate}; // MIRR should not failed with these parameters mirrValue = mirr.evaluate(values); - assertEquals("mirr", -1, mirrValue, 0.0); + assertEquals(-1, mirrValue, 0.0); } @@ -83,13 +83,9 @@ public final class TestMirr { double reinvestRate = 0.05; double financeRate = 0.08; double[] incomes = {120000d, 39000d, 30000d, 21000d, 37000d, 46000d, reinvestRate, financeRate}; - try { - mirr.evaluate(incomes); - } catch (EvaluationException e) { - assertEquals(ErrorEval.DIV_ZERO, e.getErrorEval()); - return; - } - fail("MIRR should failed with all these positives values"); + + EvaluationException e = assertThrows(EvaluationException.class, () -> mirr.evaluate(incomes)); + assertEquals(ErrorEval.DIV_ZERO, e.getErrorEval()); } @Test @@ -141,13 +137,13 @@ public final class TestMirr { CellValue cv = fe.evaluate(cellA); assertEquals(ErrorEval.DIV_ZERO.getErrorCode(), cv.getErrorValue()); - assertEquals("IRR assertions failed", 0, failureCount); + assertEquals(0, failureCount, "IRR assertions failed"); } private static void assertFormulaResult(CellValue cv, HSSFCell cell) { double actualValue = cv.getNumberValue(); double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel - assertEquals("Invalid formula result: " + cv, CellType.NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType(), "Invalid formula result: " + cv); assertEquals(expectedValue, actualValue, 1E-8); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java Thu Dec 24 18:42:29 2020 @@ -17,15 +17,15 @@ 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 org.apache.poi.ss.SpreadsheetVersion; 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.ValueEval; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestMultiOperandNumericFunction { @@ -36,7 +36,7 @@ public class TestMultiOperandNumericFunc protected double evaluate(double[] values) throws EvaluationException { return 0; } - + }; assertEquals(SpreadsheetVersion.EXCEL2007.getMaxFunctionArgs(), fun.getMaxNumOperands()); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.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; @@ -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.CellType; import org.apache.poi.ss.usermodel.FormulaError; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FinanceFunction#NPER} Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.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.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -26,7 +26,7 @@ import org.apache.poi.hssf.usermodel.HSS import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellValue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link Npv} @@ -91,7 +91,7 @@ public final class TestNpv { } } - assertEquals("IRR evaluations failed", 0, failureCount); + assertEquals(0, failureCount, "IRR evaluations failed"); } private static void assertFormulaResult(CellValue cv, HSSFCell cell){ Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.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.Oct2Dec} @@ -40,13 +40,13 @@ public final class TestOct2Dec { private static void confirmValue(String msg, String number1, String expected) { ValueEval result = invokeValue(number1); assertEquals(NumberEval.class, result.getClass()); - assertEquals(msg, expected, ((NumberEval) result).getStringValue()); + 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 Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,9 @@ package org.apache.poi.ss.formula.functions; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -31,7 +30,9 @@ import org.apache.poi.ss.formula.functio import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Workbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; /** * Tests for OFFSET function implementation @@ -40,42 +41,21 @@ import org.junit.Test; */ public final class TestOffset { - private static void confirmDoubleConvert(double doubleVal, int expected) { - try { - assertEquals(expected, Offset.evaluateIntArg(new NumberEval(doubleVal), -1, -1)); - } catch (EvaluationException e) { - fail("Unexpected error '" + e.getErrorEval() + "'."); - } - } /** * Excel's double to int conversion (for function 'OFFSET()') behaves more like Math.floor(). * Note - negative values are not symmetrical * Fractional values are silently truncated. * Truncation is toward negative infinity. */ - @Test - public void testDoubleConversion() { - - confirmDoubleConvert(100.09, 100); - confirmDoubleConvert(100.01, 100); - confirmDoubleConvert(100.00, 100); - confirmDoubleConvert(99.99, 99); - - confirmDoubleConvert(+2.01, +2); - confirmDoubleConvert(+2.00, +2); - confirmDoubleConvert(+1.99, +1); - confirmDoubleConvert(+1.01, +1); - confirmDoubleConvert(+1.00, +1); - confirmDoubleConvert(+0.99, 0); - confirmDoubleConvert(+0.01, 0); - confirmDoubleConvert( 0.00, 0); - confirmDoubleConvert(-0.01, -1); - confirmDoubleConvert(-0.99, -1); - confirmDoubleConvert(-1.00, -1); - confirmDoubleConvert(-1.01, -2); - confirmDoubleConvert(-1.99, -2); - confirmDoubleConvert(-2.00, -2); - confirmDoubleConvert(-2.01, -3); + @ParameterizedTest + @CsvSource({ + "100.09, 100", "100.01, 100", "100.00, 100", "99.99, 99", "+2.01, +2", + "+2.00, +2", "+1.99, +1", "+1.01, +1", "+1.00, +1", "+0.99, 0", + "+0.01, 0", "0.00, 0","-0.01, -1", "-0.99, -1", "-1.00, -1", + "-1.01, -2", "-1.99, -2", "-2.00, -2", "-2.01, -3" + }) + public void testDoubleConversion(double doubleVal, int expected) throws EvaluationException { + assertEquals(expected, Offset.evaluateIntArg(new NumberEval(doubleVal), -1, -1)); } @Test Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java Thu Dec 24 18:42:29 2020 @@ -19,14 +19,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.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test cases for PPMT() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
