Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,16 @@ 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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.fail; 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.apache.poi.ss.usermodel.FormulaError; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestPmt { @@ -40,9 +42,7 @@ public final class TestPmt { */ private static NumberEval invokeNormal(ValueEval[] args) { ValueEval ev = invoke(args); - if(ev instanceof ErrorEval) { - fail("Normal evaluation failed with error code: " + ev); - } + assertFalse(ev instanceof ErrorEval, "Normal evaluation failed with error code: " + ev); return (NumberEval) ev; } @@ -74,9 +74,7 @@ public final class TestPmt { ValueEval ev = invoke(args); if(ev instanceof ErrorEval) { ErrorEval err = (ErrorEval) ev; - if(err.getErrorCode() == FormulaError.VALUE.getCode()) { - fail("Identified bug 44691"); - } + assertNotEquals(FormulaError.VALUE.getCode(), err.getErrorCode(), "Identified bug 44691"); } confirm(-44.3206, invokeNormal(args));
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.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.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 POISSON(x,mean,cumulative) Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java Thu Dec 24 18:42:29 2020 @@ -21,10 +21,10 @@ import org.apache.poi.ss.formula.eval.Mi 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; -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; public class TestProduct { @Test Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java Thu Dec 24 18:42:29 2020 @@ -16,13 +16,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 Quotient} @@ -38,13 +38,13 @@ public class TestQuotient { private static void confirmValue(String msg, String numerator, String denominator, String expected) { ValueEval result = invokeValue(numerator, denominator); assertEquals(NumberEval.class, result.getClass()); - assertEquals(msg, expected, ((NumberEval) result).getStringValue()); + assertEquals(expected, ((NumberEval) result).getStringValue(), msg); } private static void confirmValueError(String msg, String numerator, String denominator, ErrorEval numError) { ValueEval result = invokeValue(numerator, denominator); 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/TestQuotientFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.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 QUOTIENT() as loaded from a test data spreadsheet.<p> */ public class TestQuotientFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestQuotientFunctionsFromSpreadsheet.class, "QuotientFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.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; @@ -27,7 +27,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.util.CellReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test cases for RANK() @@ -57,15 +57,15 @@ public final class TestRank { for(int rownum = 1; rownum<= 10; rownum ++){ HSSFCell cellD = example3.getRow(rownum).getCell(3); double cachedResultD = cellD.getNumericCellValue(); //cached formula result - assertEquals(new CellReference(cellD).formatAsString(), cachedResultD, fe.evaluate(cellD).getNumberValue(), 0); + assertEquals(cachedResultD, fe.evaluate(cellD).getNumberValue(), 0, new CellReference(cellD).formatAsString()); HSSFCell cellE = example3.getRow(rownum).getCell(4); double cachedResultE = cellE.getNumericCellValue(); //cached formula result - assertEquals(new CellReference(cellE).formatAsString(), cachedResultE, fe.evaluate(cellE).getNumberValue(), 0); + assertEquals(cachedResultE, fe.evaluate(cellE).getNumberValue(), 0, new CellReference(cellE).formatAsString()); HSSFCell cellF = example3.getRow(rownum).getCell(5); double cachedResultF = cellF.getNumericCellValue(); //cached formula result - assertEquals(new CellReference(cellF).formatAsString(), cachedResultF, fe.evaluate(cellF).getNumberValue(), 0); + assertEquals(cachedResultF, fe.evaluate(cellF).getNumberValue(), 0, new CellReference(cellF).formatAsString()); } } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java Thu Dec 24 18:42:29 2020 @@ -16,7 +16,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.CacheAreaEval; import org.apache.poi.ss.formula.eval.BoolEval; @@ -25,7 +25,7 @@ import org.apache.poi.ss.formula.eval.Nu import org.apache.poi.ss.formula.eval.RelationalOperationEval; 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; public class TestRelationalOperations { @@ -50,7 +50,7 @@ public class TestRelationalOperations { RelationalOperationEval eq = (RelationalOperationEval)RelationalOperationEval.EqualEval; ValueEval result = eq.evaluateArray(new ValueEval[]{ arg1, arg2}, 2, 5); - assertEquals("expected CacheAreaEval", CacheAreaEval.class, result.getClass()); + assertEquals(CacheAreaEval.class, result.getClass(), "expected CacheAreaEval"); CacheAreaEval ce = (CacheAreaEval)result; assertEquals(2, ce.getWidth()); assertEquals(2, ce.getHeight()); @@ -73,7 +73,7 @@ public class TestRelationalOperations { RelationalOperationEval eq = (RelationalOperationEval)RelationalOperationEval.EqualEval; ValueEval result = eq.evaluateArray(new ValueEval[]{ arg1, arg2}, 2, 5); - assertEquals("expected CacheAreaEval", CacheAreaEval.class, result.getClass()); + assertEquals(CacheAreaEval.class, result.getClass(), "expected CacheAreaEval"); CacheAreaEval ce = (CacheAreaEval)result; assertEquals(2, ce.getWidth()); assertEquals(2, ce.getHeight()); @@ -106,14 +106,14 @@ public class TestRelationalOperations { RelationalOperationEval eq = (RelationalOperationEval)RelationalOperationEval.EqualEval; ValueEval result = eq.evaluateArray(new ValueEval[]{ arg1, arg2}, 4, 5); - assertEquals("expected CacheAreaEval", CacheAreaEval.class, result.getClass()); + assertEquals(CacheAreaEval.class, result.getClass(), "expected CacheAreaEval"); CacheAreaEval ce = (CacheAreaEval)result; assertEquals(3, ce.getWidth()); assertEquals(2, ce.getHeight()); int idx = 0; for(int i =0; i < ce.getHeight(); i++){ for(int j = 0; j < ce.getWidth(); j++){ - assertEquals("[" + i + "," + j + "]", expected[idx++], ce.getRelativeValue(i, j)); + assertEquals(expected[idx++], ce.getRelativeValue(i, j), "[" + i + "," + j + "]"); } } } @@ -143,14 +143,14 @@ public class TestRelationalOperations { RelationalOperationEval eq = (RelationalOperationEval)RelationalOperationEval.EqualEval; ValueEval result = eq.evaluateArray(new ValueEval[]{ arg1, arg2}, 4, 6); - assertEquals("expected CacheAreaEval", CacheAreaEval.class, result.getClass()); + assertEquals(CacheAreaEval.class, result.getClass(), "expected CacheAreaEval"); CacheAreaEval ce = (CacheAreaEval)result; assertEquals(2, ce.getWidth()); assertEquals(3, ce.getHeight()); int idx = 0; for(int i =0; i < ce.getHeight(); i++){ for(int j = 0; j < ce.getWidth(); j++){ - assertEquals("[" + i + "," + j + "]", expected[idx++], ce.getRelativeValue(i, j)); + assertEquals(expected[idx++], ce.getRelativeValue(i, j), "[" + i + "," + j + "]"); } } } @@ -181,14 +181,14 @@ public class TestRelationalOperations { RelationalOperationEval eq = (RelationalOperationEval)RelationalOperationEval.EqualEval; ValueEval result = eq.evaluateArray(new ValueEval[]{ arg1, arg2}, 4, 6); - assertEquals("expected CacheAreaEval", CacheAreaEval.class, result.getClass()); + assertEquals(CacheAreaEval.class, result.getClass(), "expected CacheAreaEval"); CacheAreaEval ce = (CacheAreaEval)result; assertEquals(3, ce.getWidth()); assertEquals(3, ce.getHeight()); int idx = 0; for(int i =0; i < ce.getHeight(); i++){ for(int j = 0; j < ce.getWidth(); j++){ - assertEquals("[" + i + "," + j + "]", expected[idx++], ce.getRelativeValue(i, j)); + assertEquals(expected[idx++], ce.getRelativeValue(i, j), "[" + i + "," + j + "]"); } } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.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 REPT() as loaded from a test data spreadsheet.<p> */ public class TestReptFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestReptFunctionsFromSpreadsheet.class, "ReptFunctionTestCaseData.xls"); } } \ No newline at end of file Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.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 Roman() as loaded from a test data spreadsheet.<p> */ public class TestRomanFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestRomanFunctionsFromSpreadsheet.class, "RomanFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.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.jupiter.api.Assertions.assertEquals; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.ValueEval; @@ -35,7 +35,7 @@ import org.apache.poi.ss.formula.eval.St public final class TestRoundFuncs { // github-43 // https://github.com/apache/poi/pull/43 - @Ignore("ROUNDUP(3987*0.2, 2) currently fails by returning 797.41") + @Disabled("ROUNDUP(3987*0.2, 2) currently fails by returning 797.41") @Test public void testRoundUp() { assertRoundUpEquals(797.40, 3987*0.2, 2, 1e-10); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.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.jupiter.api.Assertions.assertEquals; import org.apache.poi.ss.formula.eval.ValueEval; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for ROW(), ROWS(), COLUMN(), COLUMNS() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,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.NumberEval; import org.apache.poi.ss.formula.eval.ValueEval; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for Excel function SLOPE() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java Thu Dec 24 18:42:29 2020 @@ -20,13 +20,14 @@ */ package org.apache.poi.ss.formula.functions; -import static org.junit.Assert.assertNotNull; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.EvaluationException; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class TestStatsLib extends BaseTestNumeric { @@ -39,32 +40,32 @@ public class TestStatsLib extends BaseTe v = new double[] {1,2,3,4,5,6,7,8,9,10}; d = StatsLib.devsq(v); x = 82.5; - assertEquals("devsq ", x, d); + assertDouble("devsq ", x, d); v = new double[] {1,1,1,1,1,1,1,1,1,1}; d = StatsLib.devsq(v); x = 0; - assertEquals("devsq ", x, d); + assertDouble("devsq ", x, d); v = new double[] {0,0,0,0,0,0,0,0,0,0}; d = StatsLib.devsq(v); x = 0; - assertEquals("devsq ", x, d); + assertDouble("devsq ", x, d); v = new double[] {1,2,1,2,1,2,1,2,1,2}; d = StatsLib.devsq(v); x = 2.5; - assertEquals("devsq ", x, d); + assertDouble("devsq ", x, d); v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999}; d = StatsLib.devsq(v); x = 10953.7416965767; - assertEquals("devsq ", x, d); + assertDouble("devsq ", x, d); v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10}; d = StatsLib.devsq(v); x = 82.5; - assertEquals("devsq ", x, d); + assertDouble("devsq ", x, d); } @Test @@ -75,36 +76,36 @@ public class TestStatsLib extends BaseTe v = new double[] {1,2,3,4,5,6,7,8,9,10}; d = StatsLib.kthLargest(v, 3); x = 8; - assertEquals("kthLargest ", x, d); + assertDouble("kthLargest ", x, d); v = new double[] {1,1,1,1,1,1,1,1,1,1}; d = StatsLib.kthLargest(v, 3); x = 1; - assertEquals("kthLargest ", x, d); + assertDouble("kthLargest ", x, d); v = new double[] {0,0,0,0,0,0,0,0,0,0}; d = StatsLib.kthLargest(v, 3); x = 0; - assertEquals("kthLargest ", x, d); + assertDouble("kthLargest ", x, d); v = new double[] {1,2,1,2,1,2,1,2,1,2}; d = StatsLib.kthLargest(v, 3); x = 2; - assertEquals("kthLargest ", x, d); + assertDouble("kthLargest ", x, d); v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999}; d = StatsLib.kthLargest(v, 3); x = 5.37828; - assertEquals("kthLargest ", x, d); + assertDouble("kthLargest ", x, d); v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10}; d = StatsLib.kthLargest(v, 3); x = -3; - assertEquals("kthLargest ", x, d); + assertDouble("kthLargest ", x, d); } @Test - @Ignore("... implement ...") + @Disabled("... implement ...") public void testKthSmallest() { } @@ -116,32 +117,32 @@ public class TestStatsLib extends BaseTe v = new double[] {1,2,3,4,5,6,7,8,9,10}; d = StatsLib.avedev(v); x = 2.5; - assertEquals("avedev ", x, d); + assertDouble("avedev ", x, d); v = new double[] {1,1,1,1,1,1,1,1,1,1}; d = StatsLib.avedev(v); x = 0; - assertEquals("avedev ", x, d); + assertDouble("avedev ", x, d); v = new double[] {0,0,0,0,0,0,0,0,0,0}; d = StatsLib.avedev(v); x = 0; - assertEquals("avedev ", x, d); + assertDouble("avedev ", x, d); v = new double[] {1,2,1,2,1,2,1,2,1,2}; d = StatsLib.avedev(v); x = 0.5; - assertEquals("avedev ", x, d); + assertDouble("avedev ", x, d); v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999}; d = StatsLib.avedev(v); x = 36.42176053333; - assertEquals("avedev ", x, d); + assertDouble("avedev ", x, d); v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10}; d = StatsLib.avedev(v); x = 2.5; - assertEquals("avedev ", x, d); + assertDouble("avedev ", x, d); } @Test @@ -152,42 +153,42 @@ public class TestStatsLib extends BaseTe v = new double[] {1,2,3,4,5,6,7,8,9,10}; d = StatsLib.median(v); x = 5.5; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {1,1,1,1,1,1,1,1,1,1}; d = StatsLib.median(v); x = 1; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {0,0,0,0,0,0,0,0,0,0}; d = StatsLib.median(v); x = 0; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {1,2,1,2,1,2,1,2,1,2}; d = StatsLib.median(v); x = 1.5; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999}; d = StatsLib.median(v); x = 5.37828; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10}; d = StatsLib.median(v); x = -5.5; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {-2,-3,-4,-5,-6,-7,-8,-9,-10}; d = StatsLib.median(v); x = -6; - assertEquals("median ", x, d); + assertDouble("median ", x, d); v = new double[] {1,2,3,4,5,6,7,8,9}; d = StatsLib.median(v); x = 5; - assertEquals("median ", x, d); + assertDouble("median ", x, d); } @Test @@ -227,15 +228,15 @@ public class TestStatsLib extends BaseTe double actual; try { actual = Mode.evaluate(v); - assertNotNull("Expected N/A exception was not thrown", expectedResult); + assertNotNull(expectedResult, "Expected N/A exception was not thrown"); } catch (EvaluationException e) { if (expectedResult == null) { - Assert.assertEquals(ErrorEval.NA, e.getErrorEval()); + assertEquals(ErrorEval.NA, e.getErrorEval()); return; } throw new RuntimeException(e); } - assertEquals("mode", expectedResult.doubleValue(), actual); + assertDouble("mode", expectedResult, actual); } @Test @@ -246,32 +247,32 @@ public class TestStatsLib extends BaseTe v = new double[] {1,2,3,4,5,6,7,8,9,10}; d = StatsLib.stdev(v); x = 3.02765035410; - assertEquals("stdev ", x, d); + assertDouble("stdev ", x, d); v = new double[] {1,1,1,1,1,1,1,1,1,1}; d = StatsLib.stdev(v); x = 0; - assertEquals("stdev ", x, d); + assertDouble("stdev ", x, d); v = new double[] {0,0,0,0,0,0,0,0,0,0}; d = StatsLib.stdev(v); x = 0; - assertEquals("stdev ", x, d); + assertDouble("stdev ", x, d); v = new double[] {1,2,1,2,1,2,1,2,1,2}; d = StatsLib.stdev(v); x = 0.52704627669; - assertEquals("stdev ", x, d); + assertDouble("stdev ", x, d); v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999}; d = StatsLib.stdev(v); x = 52.33006233652; - assertEquals("stdev ", x, d); + assertDouble("stdev ", x, d); v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10}; d = StatsLib.stdev(v); x = 3.02765035410; - assertEquals("stdev ", x, d); + assertDouble("stdev ", x, d); } @Test @@ -282,22 +283,22 @@ public class TestStatsLib extends BaseTe v = new double[] {3.50, 5.00, 7.23, 2.99}; d = StatsLib.var(v); x = 3.6178; - assertEquals("var ", x, d); + assertDouble("var ", x, d); v = new double[] {34.5, 2.0, 8.9, -4.0}; d = StatsLib.var(v); x = 286.99; - assertEquals("var ", x, d); + assertDouble("var ", x, d); v = new double[] {7.0, 25.0, 21.69}; d = StatsLib.var(v); x = 91.79203333; - assertEquals("var ", x, d); + assertDouble("var ", x, d); v = new double[] {1345,1301,1368,1322,1310,1370,1318,1350,1303,1299}; d = StatsLib.var(v); x = 754.2666667; - assertEquals("var ", x, d); + assertDouble("var ", x, d); } @Test @@ -308,21 +309,21 @@ public class TestStatsLib extends BaseTe v = new double[] {3.50, 5.00, 7.23, 2.99}; d = StatsLib.varp(v); x = 2.71335; - assertEquals("varp ", x, d); + assertDouble("varp ", x, d); v = new double[] {34.5, 2.0, 8.9, -4.0}; d = StatsLib.varp(v); x = 215.2425; - assertEquals("varp ", x, d); + assertDouble("varp ", x, d); v = new double[] {7.0, 25.0, 21.69}; d = StatsLib.varp(v); x = 61.19468889; - assertEquals("varp ", x, d); + assertDouble("varp ", x, d); v = new double[] {1345,1301,1368,1322,1310,1370,1318,1350,1303,1299}; d = StatsLib.varp(v); x = 678.84; - assertEquals("varp ", x, d); + assertDouble("varp ", x, d); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java Thu Dec 24 18:42:29 2020 @@ -22,9 +22,9 @@ import org.apache.poi.ss.formula.eval.Nu import org.apache.poi.ss.formula.eval.StringEval; import org.apache.poi.ss.formula.eval.StringValueEval; import org.apache.poi.ss.usermodel.FormulaError; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSubstitute { @Test Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; @@ -37,7 +37,7 @@ import org.apache.poi.ss.usermodel.Formu import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link Subtotal} @@ -345,7 +345,7 @@ public final class TestSubtotal { CellValue value = evaluator.evaluate(cell); if (value.getErrorValue() != 0) throw new RuntimeException(msg + ": " + value.formatAsString()); - assertEquals(msg, expected, value.getNumberValue(), 0); + assertEquals(expected, value.getNumberValue(), 0, msg); } @Test @@ -354,16 +354,16 @@ public final class TestSubtotal { HSSFSheet sheet = workbook.getSheetAt(0); FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator(); - assertEquals("B2", 10.0, sheet.getRow(1).getCell(1).getNumericCellValue(), 0); - assertEquals("B3", 20.0, sheet.getRow(2).getCell(1).getNumericCellValue(), 0); + assertEquals(10.0, sheet.getRow(1).getCell(1).getNumericCellValue(), 0, "B2"); + assertEquals(20.0, sheet.getRow(2).getCell(1).getNumericCellValue(), 0, "B3"); //Test simple subtotal over one area Cell cellA3 = sheet.getRow(3).getCell(1); confirmExpectedResult(evaluator, "B4", cellA3, 30.0); //Test existence of the second area - assertNotNull("C2 must not be null", sheet.getRow(1).getCell(2)); - assertEquals("C2", 7.0, sheet.getRow(1).getCell(2).getNumericCellValue(), 0); + assertNotNull(sheet.getRow(1).getCell(2), "C2 must not be null"); + assertEquals(7.0, sheet.getRow(1).getCell(2).getNumericCellValue(), 0, "C2"); Cell cellC1 = sheet.getRow(1).getCell(3); Cell cellC2 = sheet.getRow(2).getCell(3); @@ -375,7 +375,7 @@ public final class TestSubtotal { confirmExpectedResult(evaluator, "SUBTOTAL(SUM;B2:B8;C2:C8)", cellC1, 37.0); confirmExpectedResult(evaluator, "SUBTOTAL(COUNT;B2:B8,C2:C8)", cellC2, 3.0); confirmExpectedResult(evaluator, "SUBTOTAL(COUNTA;B2:B8,C2:C8)", cellC3, 5.0); - + // test same functions ignoring hidden rows over a copy of the same data cellC1 = sheet.getRow(11).getCell(3); cellC2 = sheet.getRow(12).getCell(3); @@ -383,8 +383,8 @@ public final class TestSubtotal { confirmExpectedResult(evaluator, "SUBTOTAL(SUM NO HIDDEN;B22:B28;C22:C28)", cellC1, 17.0); confirmExpectedResult(evaluator, "SUBTOTAL(COUNT NO HIDDEN;B22:B28,C22:C28)", cellC2, 2.0); confirmExpectedResult(evaluator, "SUBTOTAL(COUNTA NO HIDDEN;B22:B28,C22:C28)", cellC3, 4.0); - - + + workbook.close(); } @@ -396,7 +396,7 @@ public final class TestSubtotal { Sheet sh = wb.createSheet(); Cell a3 = sh.createRow(3).createCell(1); - + // formula, throws NotImplemnted? String[][] formulas = { { "SUBTOTAL(8,B2:B3)", NotImplementedException.class.getName() }, @@ -406,25 +406,25 @@ public final class TestSubtotal { { "SUBTOTAL(9)", FormulaParseException.class.getName() }, { "SUBTOTAL()", FormulaParseException.class.getName() }, }; - + for (String[] f : formulas) { Exception actualEx = null; try { a3.setCellFormula(f[0]); fe.evaluateAll(); - assertEquals(f[0], FormulaError.VALUE.getCode(), a3.getErrorCellValue()); + assertEquals(FormulaError.VALUE.getCode(), a3.getErrorCellValue(), f[0]); } catch (Exception e) { actualEx = e; } String msg = "Check "+(f[1] == null ? "unexpected exception" : f[1])+" here, "+ "adjust these tests if it was actually implemented - "+f[0]; - assertEquals(msg, f[1], (actualEx == null ? null : actualEx.getClass().getName())); + assertEquals(f[1], (actualEx == null ? null : actualEx.getClass().getName()), msg); } Subtotal subtotal = new Subtotal(); assertEquals(ErrorEval.VALUE_INVALID, subtotal.evaluate(new ValueEval[] {}, 0, 0)); - + wb.close(); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ package org.apache.poi.ss.formula.functions; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ss.formula.eval.AreaEval; import org.apache.poi.ss.formula.eval.BlankEval; @@ -28,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 SUMPRODUCT() @@ -44,7 +44,7 @@ public final class TestSumif { } private static void confirmDouble(double expected, ValueEval actualEval) { - assertTrue("Expected numeric result", actualEval instanceof NumericValueEval); + assertTrue(actualEval instanceof NumericValueEval, "Expected numeric result"); NumericValueEval nve = (NumericValueEval)actualEval; assertEquals(expected, nve.getNumberValue(), 0); } @@ -96,7 +96,7 @@ public final class TestSumif { ve = invokeSumif(0, 2, arg0, arg1); // invoking from cell C1 if (ve instanceof NumberEval) { NumberEval ne = (NumberEval) ve; - assertNotEquals("identified error in SUMIF - criteria arg not evaluated properly", 30.0, ne.getNumberValue()); + assertNotEquals(30.0, ne.getNumberValue(), "identified error in SUMIF - criteria arg not evaluated properly"); } confirmDouble(200, ve); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java Thu Dec 24 18:42:29 2020 @@ -19,8 +19,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.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -33,7 +33,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 SUMIFS() @@ -47,7 +47,7 @@ public final class TestSumifs { } private static void confirmDouble(double expected, ValueEval actualEval) { - assertTrue("Expected numeric result", actualEval instanceof NumericValueEval); + assertTrue(actualEval instanceof NumericValueEval, "Expected numeric result"); NumericValueEval nve = (NumericValueEval)actualEval; assertEquals(expected, nve.getNumberValue(), 0); } @@ -297,7 +297,7 @@ public final class TestSumifs { }; ValueEval result = invokeSumifs(args); - assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval); + assertTrue(result instanceof ErrorEval, "Expect to have an error when an input is an invalid value, but had: " + result.getClass()); args = new ValueEval[]{ EvalFactory.createAreaEval("A2:A9", a2a9), @@ -306,7 +306,7 @@ public final class TestSumifs { }; result = invokeSumifs(args); - assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval); + assertTrue(result instanceof ErrorEval, "Expect to have an error when an input is an invalid value, but had: " + result.getClass()); } @Test @@ -330,7 +330,7 @@ public final class TestSumifs { }; ValueEval result = invokeSumifs(args); - assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval); + assertTrue(result instanceof ErrorEval, "Expect to have an error when an input is an invalid value, but had: " + result.getClass()); assertEquals(ErrorEval.VALUE_INVALID, result); } @@ -355,7 +355,7 @@ public final class TestSumifs { }; ValueEval result = invokeSumifs(args); - assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval); + assertTrue(result instanceof ErrorEval, "Expect to have an error when an input is an invalid value, but had: " + result.getClass()); assertEquals(ErrorEval.NAME_INVALID, result); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.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.ErrorEval; @@ -26,7 +27,7 @@ import org.apache.poi.ss.formula.eval.Nu import org.apache.poi.ss.formula.eval.NumericValueEval; import org.apache.poi.ss.formula.eval.RefEval; import org.apache.poi.ss.formula.eval.ValueEval; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test cases for SUMPRODUCT() @@ -41,9 +42,7 @@ public final class TestSumproduct { } private static void confirmDouble(double expected, ValueEval actualEval) { - if(!(actualEval instanceof NumericValueEval)) { - fail("Expected numeric result"); - } + assertTrue(actualEval instanceof NumericValueEval, "Expected numeric result"); NumericValueEval nve = (NumericValueEval)actualEval; assertEquals(expected, nve.getNumberValue(), 0); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.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.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ss.formula.eval.AreaEval; import org.apache.poi.ss.formula.eval.BlankEval; @@ -29,7 +29,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; /** * Test cases for Excel function T() @@ -44,7 +44,7 @@ public final class TestTFunc { private static ValueEval invokeT(ValueEval arg) { ValueEval[] args = { arg, }; ValueEval result = new T().evaluate(args, -1, (short)-1); - assertNotNull("result may never be null", result); + assertNotNull(result, "result may never be null"); return result; } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.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.text.DateFormatSymbols; import java.text.DecimalFormatSymbols; @@ -29,7 +29,7 @@ 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.Test; +import org.junit.jupiter.api.Test; /** * Test case for TEXT() @@ -104,28 +104,28 @@ public final class TestText { ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1); ValueEval testResult = new StringEval("16:11:1900 07:42:14"); assertEquals(testResult.toString(), result.toString()); - + // Excel also supports "m before h is month" formatArg = new StringEval("dd:mm:yyyy hh:mm:ss"); args[1] = formatArg; result = TextFunction.TEXT.evaluate(args, -1, (short)-1); testResult = new StringEval("16:11:1900 07:42:14"); assertEquals(testResult.toString(), result.toString()); - + // this line is intended to compute how "November" would look like in the current locale // update: now the locale will be (if not set otherwise) always Locale.getDefault() (see LocaleUtil) DateFormatSymbols dfs = DateFormatSymbols.getInstance(LocaleUtil.getUserLocale()); SimpleDateFormat sdf = new SimpleDateFormat("MMMM", dfs); sdf.setTimeZone(LocaleUtil.getUserTimeZone()); String november = sdf.format(LocaleUtil.getLocaleCalendar(2015,10,1).getTime()); - + // Again with Java style formatArg = new StringEval("MMMM dd, yyyy"); args[1] = formatArg; result = TextFunction.TEXT.evaluate(args, -1, (short)-1); testResult = new StringEval(november + " 16, 1900"); assertEquals(testResult.toString(), result.toString()); - + // And Excel style formatArg = new StringEval("mmmm dd, yyyy"); args[1] = formatArg; Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.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.regex.Pattern; @@ -28,8 +28,8 @@ import org.apache.poi.hssf.usermodel.HSS import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link TimeFunc} @@ -44,8 +44,8 @@ public final class TestTime { private HSSFWorkbook wb; private HSSFDataFormatter form; private HSSFCellStyle style; - - @Before + + @BeforeEach public void setUp() { wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet("new sheet"); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.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 TREND() as loaded from a test data spreadsheet. */ public class TestTrendFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestTrendFunctionsFromSpreadsheet.class, "Trend.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.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 TRIM() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,13 @@ package org.apache.poi.ss.formula.functions; +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.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test case for TRUNC() @@ -38,7 +39,7 @@ public final class TestTrunc extends Bas ValueEval strArg = new StringEval("abc"); ValueEval[] args = { strArg, new NumberEval(2) }; ValueEval result = NumericFunction.TRUNC.evaluate(args, -1, (short)-1); - Assert.assertEquals(ErrorEval.VALUE_INVALID, result); + assertEquals(ErrorEval.VALUE_INVALID, result); } @Test @@ -46,7 +47,7 @@ public final class TestTrunc extends Bas ValueEval[] args = { new NumberEval(200), new NumberEval(2) }; @SuppressWarnings("static-access") ValueEval result = F.TRUNC.evaluate(args, -1, (short)-1); - assertEquals("TRUNC", (new NumberEval(200d)).getNumberValue(), ((NumberEval)result).getNumberValue()); + assertDouble("TRUNC", (new NumberEval(200d)).getNumberValue(), ((NumberEval)result).getNumberValue()); } @Test @@ -54,14 +55,14 @@ public final class TestTrunc extends Bas ValueEval[] args = { new NumberEval(2.612777), new NumberEval(3) }; @SuppressWarnings("static-access") ValueEval result = F.TRUNC.evaluate(args, -1, (short)-1); - assertEquals("TRUNC", (new NumberEval(2.612d)).getNumberValue(), ((NumberEval)result).getNumberValue()); + assertDouble("TRUNC", (new NumberEval(2.612d)).getNumberValue(), ((NumberEval)result).getNumberValue()); } @Test public void testTruncWithProblematicDecimalNumber() { ValueEval[] args = { new NumberEval(0.29), new NumberEval(2) }; ValueEval result = NumericFunction.TRUNC.evaluate(args, -1, (short)-1); - assertEquals("TRUNC", (new NumberEval(0.29d)).getNumberValue(), ((NumberEval)result).getNumberValue()); + assertDouble("TRUNC", (new NumberEval(0.29d)).getNumberValue(), ((NumberEval)result).getNumberValue()); } @Test @@ -69,14 +70,14 @@ public final class TestTrunc extends Bas ValueEval[] args = { new NumberEval(21.624d / 24d + .009d), new NumberEval(2) }; ValueEval result = NumericFunction.TRUNC.evaluate(args, -1, (short)-1); - assertEquals("TRUNC", (new NumberEval(0.91d)).getNumberValue(), ((NumberEval)result).getNumberValue()); + assertDouble("TRUNC", (new NumberEval(0.91d)).getNumberValue(), ((NumberEval)result).getNumberValue()); } @Test public void testTruncWithDecimalNumberOneArg() { ValueEval[] args = { new NumberEval(2.612777) }; ValueEval result = NumericFunction.TRUNC.evaluate(args, -1, (short)-1); - assertEquals("TRUNC", (new NumberEval(2d)).getNumberValue(), ((NumberEval)result).getNumberValue()); + assertDouble("TRUNC", (new NumberEval(2d)).getNumberValue(), ((NumberEval)result).getNumberValue()); } @Test @@ -84,6 +85,6 @@ public final class TestTrunc extends Bas ValueEval[] args = { new NumberEval(-8.9), new NumberEval(0) }; @SuppressWarnings("static-access") ValueEval result = F.TRUNC.evaluate(args, -1, (short)-1); - assertEquals("TRUNC", (new NumberEval(-8)).getNumberValue(), ((NumberEval)result).getNumberValue()); + assertDouble("TRUNC", (new NumberEval(-8)).getNumberValue(), ((NumberEval)result).getNumberValue()); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java Thu Dec 24 18:42:29 2020 @@ -17,17 +17,16 @@ 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 numeric functions with two arguments such aqs +, -, *, POWER * as loaded from a test data spreadsheet. */ public class TestTwoOperandNumericFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestTwoOperandNumericFunctionsFromSpreadsheet.class, "TwoOperandNumericFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.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 Value} Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.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 WeekNum() as loaded from a test data spreadsheet.<p> */ public class TestWeekNumFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { return data(TestWeekNumFunctionsFromSpreadsheet.class, "WeekNumFunctionTestCaseData.xls"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.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 WeekNum() as loaded from a test data 2013 excel spreadsheet.<p> */ public class TestWeekNumFunctionsFromSpreadsheet2013 extends BaseTestFunctionsFromSpreadsheet { - @Parameters(name="{0}") - public static Collection<Object[]> data() throws Exception { + public static Stream<Arguments> data() throws Exception { //Only open this file with Excel 2013 to keep binary specific to that version return data(TestWeekNumFunctionsFromSpreadsheet2013.class, "WeekNumFunctionTestCaseData2013.xls"); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java Thu Dec 24 18:42:29 2020 @@ -19,9 +19,9 @@ package org.apache.poi.ss.formula.functi import org.apache.poi.ss.formula.eval.*; import org.apache.poi.util.StringUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests WEEKDAY(serial_number[, return_type]) excep function @@ -29,58 +29,58 @@ import static org.junit.Assert.*; */ public class TestWeekdayFunc { private static final double TOLERANCE = 0.001; - + private void assertEvaluateEquals(double expected, double serial_number) { String formula = "WEEKDAY(" + serial_number + ")"; ValueEval[] args = new ValueEval[] { new NumberEval(serial_number) }; NumberEval result = (NumberEval) WeekdayFunc.instance.evaluate(args, 0, 0); - assertEquals(formula, expected, result.getNumberValue(), TOLERANCE); + assertEquals(expected, result.getNumberValue(), TOLERANCE, formula); } private void assertEvaluateEquals(double expected, double serial_number, double return_type) { String formula = "WEEKDAY(" + serial_number + ", " + return_type + ")"; ValueEval[] args = new ValueEval[] { new NumberEval(serial_number), new NumberEval(return_type) }; NumberEval result = (NumberEval) WeekdayFunc.instance.evaluate(args, 0, 0); - assertEquals(formula, expected, result.getNumberValue(), TOLERANCE); + assertEquals(expected, result.getNumberValue(), TOLERANCE, formula); } - + @Test - public void testEvaluate() throws Exception { + public void testEvaluate() { assertEvaluateEquals(2.0, 1.0); assertEvaluateEquals(2.0, 1.0, 1.0); assertEvaluateEquals(1.0, 1.0, 2.0); assertEvaluateEquals(0.0, 1.0, 3.0); assertEvaluateEquals(1.0, 1.0, 11.0); - assertEvaluateEquals(7.0, 1.0, 12.0); - assertEvaluateEquals(6.0, 1.0, 13.0); - assertEvaluateEquals(5.0, 1.0, 14.0); - assertEvaluateEquals(4.0, 1.0, 15.0); - assertEvaluateEquals(3.0, 1.0, 16.0); - assertEvaluateEquals(2.0, 1.0, 17.0); - - - assertEvaluateEquals(3.0, 39448.0); - assertEvaluateEquals(3.0, 39448.0, 1.0); - assertEvaluateEquals(2.0, 39448.0, 2.0); - assertEvaluateEquals(1.0, 39448.0, 3.0); - assertEvaluateEquals(2.0, 39448.0, 11.0); - assertEvaluateEquals(1.0, 39448.0, 12.0); - assertEvaluateEquals(7.0, 39448.0, 13.0); - assertEvaluateEquals(6.0, 39448.0, 14.0); - assertEvaluateEquals(5.0, 39448.0, 15.0); - assertEvaluateEquals(4.0, 39448.0, 16.0); - assertEvaluateEquals(3.0, 39448.0, 17.0); + assertEvaluateEquals(7.0, 1.0, 12.0); + assertEvaluateEquals(6.0, 1.0, 13.0); + assertEvaluateEquals(5.0, 1.0, 14.0); + assertEvaluateEquals(4.0, 1.0, 15.0); + assertEvaluateEquals(3.0, 1.0, 16.0); + assertEvaluateEquals(2.0, 1.0, 17.0); + + + assertEvaluateEquals(3.0, 39448.0); + assertEvaluateEquals(3.0, 39448.0, 1.0); + assertEvaluateEquals(2.0, 39448.0, 2.0); + assertEvaluateEquals(1.0, 39448.0, 3.0); + assertEvaluateEquals(2.0, 39448.0, 11.0); + assertEvaluateEquals(1.0, 39448.0, 12.0); + assertEvaluateEquals(7.0, 39448.0, 13.0); + assertEvaluateEquals(6.0, 39448.0, 14.0); + assertEvaluateEquals(5.0, 39448.0, 15.0); + assertEvaluateEquals(4.0, 39448.0, 16.0); + assertEvaluateEquals(3.0, 39448.0, 17.0); } // for testing invalid invocations private void assertEvaluateEquals(String message, ErrorEval expected, ValueEval... args) { String formula = "WEEKDAY(" + StringUtil.join(args, ", ") + ")"; ValueEval result = WeekdayFunc.instance.evaluate(args, 0, 0); - assertEquals(formula + ": " + message, expected, result); + assertEquals(expected, result, formula + ": " + message); } @Test - public void testEvaluateInvalid() throws Exception { + public void testEvaluateInvalid() { assertEvaluateEquals("no args", ErrorEval.VALUE_INVALID); assertEvaluateEquals("too many args", ErrorEval.VALUE_INVALID, new NumberEval(1.0), new NumberEval(1.0), new NumberEval(1.0)); assertEvaluateEquals("negative date", ErrorEval.NUM_ERROR, new NumberEval(-1.0)); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,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.NumberEval; import org.apache.poi.ss.formula.eval.ValueEval; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for Excel functions SUMX2MY2(), SUMX2PY2(), SUMXMY2() Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,11 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.poi.util.LittleEndianOutput; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestAbstractFunctionPtg { @@ -32,14 +33,14 @@ public class TestAbstractFunctionPtg { assertEquals(255, ptg.getNumberOfOperands()); } - @Test(expected=RuntimeException.class) + @Test public void testInvalidFunctionIndex() { - new FunctionPtg(40000, 2, null, 255); + assertThrows(RuntimeException.class, () -> new FunctionPtg(40000, 2, null, 255)); } - @Test(expected=RuntimeException.class) + @Test public void testInvalidRuntimeClass() { - new FunctionPtg(1, 300, null, 255); + assertThrows(RuntimeException.class, () -> new FunctionPtg(1, 300, null, 255)); } private static class FunctionPtg extends AbstractFunctionPtg { Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java Thu Dec 24 18:42:29 2020 @@ -17,13 +17,13 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for Area3DPtg Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AreaErrPtg}. @@ -34,8 +34,8 @@ public final class TestAreaErrPtg extend @Test public void testReading() throws IOException { try (HSSFWorkbook workbook = loadWorkbook("AreaErrPtg.xls")) { - assertEquals("Wrong formula string for area error", "SUM(#REF!)", - workbook.getSheetAt(0).getRow(0).getCell(2).getCellFormula()); + assertEquals("SUM(#REF!)", workbook.getSheetAt(0).getRow(0).getCell(2).getCellFormula(), + "Wrong formula string for area error"); } } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,13 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.model.HSSFFormulaParser; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.util.AreaReference; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link AreaPtg}. @@ -35,7 +34,7 @@ public final class TestAreaPtg { AreaPtg relative; AreaPtg absolute; - @Before + @BeforeEach public void setUp() { short firstRow=5; short lastRow=13; @@ -50,11 +49,11 @@ public final class TestAreaPtg { AreaPtg ptg = new AreaPtg(new AreaReference("A$1:$B5", SpreadsheetVersion.EXCEL2007)); assertEquals("A$1:$B5", ptg.toFormulaString()); ptg.setFirstColumn(3); - assertEquals("Area Ptg should not implicitly re-sort itself (except during construction)", - "D$1:$B5", ptg.toFormulaString()); + assertEquals("D$1:$B5", ptg.toFormulaString(), + "Area Ptg should not implicitly re-sort itself (except during construction)"); ptg.sortTopLeftToBottomRight(); - assertEquals("Area Ptg should restore itself to top-left to lower-right order when explicitly asked", - "$B$1:D5", ptg.toFormulaString()); + assertEquals("$B$1:D5", ptg.toFormulaString(), + "Area Ptg should restore itself to top-left to lower-right order when explicitly asked"); } @Test @@ -70,10 +69,11 @@ public final class TestAreaPtg { } private void validateReference(boolean abs, AreaPtg ref) { - assertEquals("First column reference is not "+(abs?"absolute":"relative"),abs,!ref.isFirstColRelative()); - assertEquals("Last column reference is not "+(abs?"absolute":"relative"),abs,!ref.isLastColRelative()); - assertEquals("First row reference is not "+(abs?"absolute":"relative"),abs,!ref.isFirstRowRelative()); - assertEquals("Last row reference is not "+(abs?"absolute":"relative"),abs,!ref.isLastRowRelative()); + String isWrong = " reference is not "+(abs?"absolute":"relative"); + assertEquals(abs,!ref.isFirstColRelative(),"First column" + isWrong); + assertEquals(abs,!ref.isLastColRelative(), "Last column" + isWrong); + assertEquals(abs,!ref.isFirstRowRelative(),"First row" + isWrong); + assertEquals(abs,!ref.isLastRowRelative(), "Last row" + isWrong); } @@ -93,20 +93,20 @@ public final class TestAreaPtg { AreaPtg sca3 = new AreaPtg(5, 5, 7, 7, true, false, true, false); AreaPtg sca4 = new AreaPtg(5, 5, 7, 7, false, true, false, true); - assertEquals("first rel., last abs.", "G5:$H$6", sca1.toFormulaString()); - assertEquals("first abs., last rel.", "$G$5:H6", sca2.toFormulaString()); - assertEquals("first rel., last abs.", "H6:$H$6", sca3.toFormulaString()); - assertEquals("first abs., last rel.", "$H$6:H6", sca4.toFormulaString()); + assertEquals("G5:$H$6", sca1.toFormulaString(), "first rel., last abs."); + assertEquals("$G$5:H6", sca2.toFormulaString(), "first abs., last rel."); + assertEquals("H6:$H$6", sca3.toFormulaString(), "first rel., last abs."); + assertEquals("$H$6:H6", sca4.toFormulaString(), "first abs., last rel."); AreaPtg cla1 = cloneArea(sca1); AreaPtg cla2 = cloneArea(sca2); AreaPtg cla3 = cloneArea(sca3); AreaPtg cla4 = cloneArea(sca4); - assertEquals("first rel., last abs.", "G5:$H$6", cla1.toFormulaString()); - assertEquals("first abs., last rel.", "$G$5:H6", cla2.toFormulaString()); - assertEquals("first rel., last abs.", "H6:$H$6", cla3.toFormulaString()); - assertEquals("first abs., last rel.", "$H$6:H6", cla4.toFormulaString()); + assertEquals("G5:$H$6", cla1.toFormulaString(), "first rel., last abs."); + assertEquals("$G$5:H6", cla2.toFormulaString(), "first abs., last rel."); + assertEquals("H6:$H$6", cla3.toFormulaString(), "first rel., last abs."); + assertEquals("$H$6:H6", cla4.toFormulaString(), "first abs., last rel."); } private AreaPtg cloneArea(AreaPtg a) { @@ -121,18 +121,17 @@ public final class TestAreaPtg { String formula1="SUM($E$5:$E$6)"; String expectedFormula1="SUM($F$5:$F$6)"; String newFormula1 = shiftAllColumnsBy1(formula1); - assertEquals("Absolute references changed", expectedFormula1, newFormula1); + assertEquals(expectedFormula1, newFormula1, "Absolute references changed"); String formula2="SUM(E5:E6)"; String expectedFormula2="SUM(F5:F6)"; String newFormula2 = shiftAllColumnsBy1(formula2); - assertEquals("Relative references changed", expectedFormula2, newFormula2); + assertEquals(expectedFormula2, newFormula2, "Relative references changed"); } private static String shiftAllColumnsBy1(String formula) { int letUsShiftColumn1By1Column=1; - HSSFWorkbook wb = null; - Ptg[] ptgs = HSSFFormulaParser.parse(formula, wb); + Ptg[] ptgs = HSSFFormulaParser.parse(formula, null); for (Ptg ptg : ptgs) { if (ptg instanceof AreaPtg ) { @@ -141,6 +140,6 @@ public final class TestAreaPtg { aptg.setLastColumn((short)(aptg.getLastColumn()+letUsShiftColumn1By1Column)); } } - return HSSFFormulaParser.toFormulaString(wb, ptgs); + return HSSFFormulaParser.toFormulaString(null, ptgs); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java Thu Dec 24 18:42:29 2020 @@ -17,16 +17,16 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.record.TestcaseRecordInputStream; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.util.LittleEndianByteArrayOutputStream; import org.apache.poi.util.LittleEndianInput; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for <tt>ArrayPtg</tt> @@ -74,7 +74,7 @@ public final class TestArrayPtg { byte[] outBuf = new byte[ENCODED_CONSTANT_DATA.length]; ptg.writeTokenValueBytes(new LittleEndianByteArrayOutputStream(outBuf, 0)); - assertNotEquals("Identified bug 42564b", 4, outBuf[0]); + assertNotEquals(4, outBuf[0], "Identified bug 42564b"); assertArrayEquals(ENCODED_CONSTANT_DATA, outBuf); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndianInput; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link AttrPtg}. Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java Thu Dec 24 18:42:29 2020 @@ -17,13 +17,13 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ErrPtg}. @@ -36,8 +36,8 @@ public final class TestErrPtg extends Ba public void testReading() throws IOException { try (HSSFWorkbook workbook = loadWorkbook("ErrPtg.xls")) { HSSFCell cell = workbook.getSheetAt(0).getRow(3).getCell(0); - assertEquals("Wrong cell value", 4.0, cell.getNumericCellValue(), 0.0); - assertEquals("Wrong cell formula", "ERROR.TYPE(#REF!)", cell.getCellFormula()); + assertEquals(4.0, cell.getNumericCellValue(), 0.0, "Wrong cell value"); + assertEquals("ERROR.TYPE(#REF!)", cell.getCellFormula(), "Wrong cell formula"); } } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.ss.formula.ptg; -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.model.HSSFFormulaParser; @@ -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 functions from external workbooks (e.g. YEARFRAC). @@ -34,27 +34,27 @@ import org.junit.Test; public final class TestExternalFunctionFormulas { /** - * tests <tt>NameXPtg.toFormulaString(Workbook)</tt> and logic in Workbook below that + * tests <tt>NameXPtg.toFormulaString(Workbook)</tt> and logic in Workbook below that */ @Test public void testReadFormulaContainingExternalFunction() throws Exception { HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("externalFunctionExample.xls"); - + String expectedFormula = "YEARFRAC(B1,C1)"; HSSFSheet sht = wb.getSheetAt(0); String cellFormula = sht.getRow(0).getCell(0).getCellFormula(); assertEquals(expectedFormula, cellFormula); - + wb.close(); } - + @Test public void testParse() throws Exception { HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("externalFunctionExample.xls"); Ptg[] ptgs = HSSFFormulaParser.parse("YEARFRAC(B1,C1)", wb); assertEquals(4, ptgs.length); assertEquals(NameXPtg.class, ptgs[0].getClass()); - + wb.getSheetAt(0).getRow(0).createCell(6).setCellFormula("YEARFRAC(C1,B1)"); // if (false) { // // In case you fancy checking in excel @@ -70,7 +70,7 @@ public final class TestExternalFunctionF // } wb.close(); } - + @Test public void testEvaluate() throws Exception { HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("externalFunctionExample.xls"); @@ -84,7 +84,7 @@ public final class TestExternalFunctionF wb.close(); } - private static void confirmCellEval(HSSFSheet sheet, int rowIx, int colIx, + private static void confirmCellEval(HSSFSheet sheet, int rowIx, int colIx, HSSFFormulaEvaluator fe, String expectedFormula, double expectedResult) { HSSFCell cell = sheet.getRow(rowIx).getCell(colIx); assertEquals(expectedFormula, cell.getCellFormula()); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java Thu Dec 24 18:42:29 2020 @@ -18,8 +18,8 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; 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.HSSFName; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.util.CellReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for proper calculation of named ranges from external workbooks. Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,10 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Make sure the FuncPtg performs as expected @@ -33,10 +33,10 @@ public final class TestFuncPtg { byte[] fakeData = { 0x20, 0x00,}; FuncPtg ptg = FuncPtg.create(TestcaseRecordInputStream.createLittleEndian(fakeData) ); - assertEquals( "Len formula index is not 32(20H)", 0x20, ptg.getFunctionIndex() ); - assertEquals( "Number of operands in the len formula", 1, ptg.getNumberOfOperands() ); - assertEquals( "Function Name", "LEN", ptg.getName() ); - assertEquals( "Ptg Size", 3, ptg.getSize() ); + assertEquals( 0x20, ptg.getFunctionIndex(), "Len formula index is not 32(20H)" ); + assertEquals( 1, ptg.getNumberOfOperands(), "Number of operands in the len formula" ); + assertEquals( "LEN", ptg.getName(), "Function Name" ); + assertEquals( 3, ptg.getSize(), "Ptg Size" ); } @Test Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.ss.formula.ptg; -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.fail; import org.apache.poi.hssf.model.HSSFFormulaParser; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Josh Micich Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java Thu Dec 24 18:42:29 2020 @@ -17,13 +17,13 @@ package org.apache.poi.ss.formula.ptg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link IntersectionPtg}. @@ -36,8 +36,8 @@ public final class TestIntersectionPtg e public void testReading() throws IOException { try (HSSFWorkbook workbook = loadWorkbook("IntersectionPtg.xls")) { HSSFCell cell = workbook.getSheetAt(0).getRow(4).getCell(2); - assertEquals("Wrong cell value", 5.0, cell.getNumericCellValue(), 0.0); - assertEquals("Wrong cell formula", "SUM(A1:B2 B2:C3)", cell.getCellFormula()); + assertEquals(5.0, cell.getNumericCellValue(), 0.0, "Wrong cell value"); + assertEquals("SUM(A1:B2 B2:C3)", cell.getCellFormula(), "Wrong cell formula"); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
