This is an automated email from the ASF dual-hosted git repository. erans pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit 560f15cfac37a22ee5a0ed7af1bb9c48c552427b Author: Schamschi <[email protected]> AuthorDate: Fri Jun 7 10:45:44 2019 +0200 Migrate commons-numbers-gamma to JUnit 5: all remaining classes Migrate the following classes: ErfTest GammaTest InverseErfcTest InverseErfTest InvGamma1pm1Test LanczosApproximationTest LogBetaTest LogGamma1pTest LogGammaSumTest LogGammaTest RegularizedBetaTest RegularizedGammaTest TrigammaTest --- .../org/apache/commons/numbers/gamma/ErfTest.java | 64 +++++++++++----------- .../apache/commons/numbers/gamma/GammaTest.java | 8 +-- .../commons/numbers/gamma/InvGamma1pm1Test.java | 7 +-- .../commons/numbers/gamma/InverseErfTest.java | 16 +++--- .../commons/numbers/gamma/InverseErfcTest.java | 16 +++--- .../numbers/gamma/LanczosApproximationTest.java | 10 ++-- .../apache/commons/numbers/gamma/LogBetaTest.java | 30 +++++----- .../commons/numbers/gamma/LogGamma1pTest.java | 7 +-- .../commons/numbers/gamma/LogGammaSumTest.java | 11 ++-- .../apache/commons/numbers/gamma/LogGammaTest.java | 10 ++-- .../commons/numbers/gamma/RegularizedBetaTest.java | 8 +-- .../numbers/gamma/RegularizedGammaTest.java | 6 +- .../apache/commons/numbers/gamma/TrigammaTest.java | 10 ++-- 13 files changed, 100 insertions(+), 103 deletions(-) diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/ErfTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/ErfTest.java index ddddbf0..461d128 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/ErfTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/ErfTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -27,8 +27,8 @@ public class ErfTest { public void testErf0() { double actual = Erf.value(0); double expected = 0; - Assert.assertEquals(expected, actual, 1e-15); - Assert.assertEquals(1 - expected, Erfc.value(0), 1e-15); + Assertions.assertEquals(expected, actual, 1e-15); + Assertions.assertEquals(1 - expected, Erfc.value(0), 1e-15); } @Test @@ -36,13 +36,13 @@ public class ErfTest { double x = 1.960 / Math.sqrt(2); double actual = Erf.value(x); double expected = 0.95; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - actual, Erfc.value(x), 1e-15); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - actual, Erfc.value(x), 1e-15); actual = Erf.value(-x); expected = -expected; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - actual, Erfc.value(-x), 1e-15); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - actual, Erfc.value(-x), 1e-15); } @Test @@ -50,13 +50,13 @@ public class ErfTest { double x = 2.576 / Math.sqrt(2); double actual = Erf.value(x); double expected = 0.99; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - actual, Erfc.value(x), 1e-15); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - actual, Erfc.value(x), 1e-15); actual = Erf.value(-x); expected = -expected; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - actual, Erfc.value(-x), 1e-15); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - actual, Erfc.value(-x), 1e-15); } @Test @@ -64,13 +64,13 @@ public class ErfTest { double x = 2.807 / Math.sqrt(2); double actual = Erf.value(x); double expected = 0.995; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - actual, Erfc.value(x), 1e-15); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - actual, Erfc.value(x), 1e-15); actual = Erf.value(-x); expected = -expected; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - actual, Erfc.value(-x), 1e-15); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - actual, Erfc.value(-x), 1e-15); } @Test @@ -78,13 +78,13 @@ public class ErfTest { double x = 3.291 / Math.sqrt(2); double actual = Erf.value(x); double expected = 0.999; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - expected, Erfc.value(x), 1e-5); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - expected, Erfc.value(x), 1e-5); actual = Erf.value(-x); expected = -expected; - Assert.assertEquals(expected, actual, 1e-5); - Assert.assertEquals(1 - expected, Erfc.value(-x), 1e-5); + Assertions.assertEquals(expected, actual, 1e-5); + Assertions.assertEquals(1 - expected, Erfc.value(-x), 1e-5); } /** @@ -94,22 +94,22 @@ public class ErfTest { public void testLargeValues() { for (int i = 1; i < 200; i *= 10) { double result = Erf.value(i); - Assert.assertFalse(Double.isNaN(result)); - Assert.assertTrue(result > 0 && result <= 1); + Assertions.assertFalse(Double.isNaN(result)); + Assertions.assertTrue(result > 0 && result <= 1); result = Erf.value(-i); - Assert.assertFalse(Double.isNaN(result)); - Assert.assertTrue(result >= -1 && result < 0); + Assertions.assertFalse(Double.isNaN(result)); + Assertions.assertTrue(result >= -1 && result < 0); result = Erfc.value(i); - Assert.assertFalse(Double.isNaN(result)); - Assert.assertTrue(result >= 0 && result < 1); + Assertions.assertFalse(Double.isNaN(result)); + Assertions.assertTrue(result >= 0 && result < 1); result = Erfc.value(-i); - Assert.assertFalse(Double.isNaN(result)); - Assert.assertTrue(result >= 1 && result <= 2); + Assertions.assertFalse(Double.isNaN(result)); + Assertions.assertTrue(result >= 1 && result <= 2); } - Assert.assertEquals(-1, Erf.value(Double.NEGATIVE_INFINITY), 0); - Assert.assertEquals(1, Erf.value(Double.POSITIVE_INFINITY), 0); - Assert.assertEquals(2, Erfc.value(Double.NEGATIVE_INFINITY), 0); - Assert.assertEquals(0, Erfc.value(Double.POSITIVE_INFINITY), 0); + Assertions.assertEquals(-1, Erf.value(Double.NEGATIVE_INFINITY), 0); + Assertions.assertEquals(1, Erf.value(Double.POSITIVE_INFINITY), 0); + Assertions.assertEquals(2, Erfc.value(Double.NEGATIVE_INFINITY), 0); + Assertions.assertEquals(0, Erfc.value(Double.POSITIVE_INFINITY), 0); } /** @@ -133,7 +133,7 @@ public class ErfTest { double x = -10; for (int i = 0; i < 41; i++) { - Assert.assertEquals(gnuValues[i], Erf.value(x), tol); + Assertions.assertEquals(gnuValues[i], Erf.value(x), tol); x += 0.5d; } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/GammaTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/GammaTest.java index 4fe03fd..832caf9 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/GammaTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/GammaTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -527,14 +527,14 @@ public class GammaTest { ulps = 500; } final double tol = ulps * Math.ulp(expected); - Assert.assertEquals(Double.toString(x), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, Double.toString(x)); } } @Test public void testGammaNegativeInteger() { for (int i = -100; i <= 0; i++) { - Assert.assertTrue(Integer.toString(i), Double.isNaN(Gamma.value(i))); + Assertions.assertTrue(Double.isNaN(Gamma.value(i)), Integer.toString(i)); } } @@ -546,7 +546,7 @@ public class GammaTest { double previousGamma = Gamma.value(-18.5); for (double x = -19.5; x > -25; x -= 1.0) { double gamma = Gamma.value(x); - Assert.assertEquals( (int) Math.signum(previousGamma), + Assertions.assertEquals( (int) Math.signum(previousGamma), - (int) Math.signum(gamma)); previousGamma = gamma; diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InvGamma1pm1Test.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InvGamma1pm1Test.java index 99e955c..328c30b 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InvGamma1pm1Test.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InvGamma1pm1Test.java @@ -16,7 +16,6 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -74,11 +73,11 @@ public class InvGamma1pm1Test { final double expected = ref[1]; final double actual = InvGamma1pm1.value(x); final double tol = ulps * Math.ulp(expected); - Assert.assertEquals(Double.toString(x), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, Double.toString(x)); } } - @Test() + @Test public void testInvGamma1pm1Precondition1() { Assertions.assertThrows(GammaException.class, @@ -86,7 +85,7 @@ public class InvGamma1pm1Test { ); } - @Test() + @Test public void testInvGamma1pm1Precondition2() { Assertions.assertThrows(GammaException.class, diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfTest.java index 8b313ef..e988972 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -25,16 +25,16 @@ import org.junit.jupiter.api.Test; public class InverseErfTest { @Test public void testErfInvNaN() { - Assert.assertTrue(Double.isNaN(InverseErf.value(-1.001))); - Assert.assertTrue(Double.isNaN(InverseErf.value(+1.001))); + Assertions.assertTrue(Double.isNaN(InverseErf.value(-1.001))); + Assertions.assertTrue(Double.isNaN(InverseErf.value(+1.001))); } @Test public void testErfInvInfinite() { - Assert.assertTrue(Double.isInfinite(InverseErf.value(-1))); - Assert.assertTrue(InverseErf.value(-1) < 0); - Assert.assertTrue(Double.isInfinite(InverseErf.value(+1))); - Assert.assertTrue(InverseErf.value(+1) > 0); + Assertions.assertTrue(Double.isInfinite(InverseErf.value(-1))); + Assertions.assertTrue(InverseErf.value(-1) < 0); + Assertions.assertTrue(Double.isInfinite(InverseErf.value(+1))); + Assertions.assertTrue(InverseErf.value(+1) > 0); } @Test @@ -42,7 +42,7 @@ public class InverseErfTest { for (double x = -5.9; x < 5.9; x += 0.01) { final double y = Erf.value(x); final double dydx = 2 * Math.exp(-x * x) / Math.sqrt(Math.PI); - Assert.assertEquals(x, InverseErf.value(y), 1.0e-15 / dydx); + Assertions.assertEquals(x, InverseErf.value(y), 1.0e-15 / dydx); } } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfcTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfcTest.java index 6fa87b1..991869a 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfcTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/InverseErfcTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -25,16 +25,16 @@ import org.junit.jupiter.api.Test; public class InverseErfcTest { @Test public void testErfcInvNaN() { - Assert.assertTrue(Double.isNaN(InverseErfc.value(-0.001))); - Assert.assertTrue(Double.isNaN(InverseErfc.value(+2.001))); + Assertions.assertTrue(Double.isNaN(InverseErfc.value(-0.001))); + Assertions.assertTrue(Double.isNaN(InverseErfc.value(+2.001))); } @Test public void testErfcInvInfinite() { - Assert.assertTrue(Double.isInfinite(InverseErfc.value(-0))); - Assert.assertTrue(InverseErfc.value( 0) > 0); - Assert.assertTrue(Double.isInfinite(InverseErfc.value(+2))); - Assert.assertTrue(InverseErfc.value(+2) < 0); + Assertions.assertTrue(Double.isInfinite(InverseErfc.value(-0))); + Assertions.assertTrue(InverseErfc.value( 0) > 0); + Assertions.assertTrue(Double.isInfinite(InverseErfc.value(+2))); + Assertions.assertTrue(InverseErfc.value(+2) < 0); } @Test @@ -42,7 +42,7 @@ public class InverseErfcTest { for (double x = -5.85; x < 5.9; x += 0.01) { final double y = Erfc.value(x); final double dydxAbs = 2 * Math.exp(-x * x) / Math.sqrt(Math.PI); - Assert.assertEquals(x, InverseErfc.value(y), 1.0e-15 / dydxAbs); + Assertions.assertEquals(x, InverseErfc.value(y), 1.0e-15 / dydxAbs); } } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LanczosApproximationTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LanczosApproximationTest.java index ba5b22a..b9680fe 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LanczosApproximationTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LanczosApproximationTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -25,15 +25,15 @@ import org.junit.jupiter.api.Test; public class LanczosApproximationTest { @Test public void testG() { - Assert.assertEquals(607d / 128d, LanczosApproximation.g(), 0d); + Assertions.assertEquals(607d / 128d, LanczosApproximation.g(), 0d); } @Test public void testSomeValues() { // Given that few values are checked, this test would only serve // as early warning of unexpected changes to the current code. - Assert.assertEquals(29.020294557631818d, LanczosApproximation.value(0.1d), 0d); - Assert.assertEquals(13.14778027539684d, LanczosApproximation.value(1.0d), 0d); - Assert.assertEquals(7.897828855157814d, LanczosApproximation.value(2.0d), 0d); + Assertions.assertEquals(29.020294557631818d, LanczosApproximation.value(0.1d), 0d); + Assertions.assertEquals(13.14778027539684d, LanczosApproximation.value(1.0d), 0d); + Assertions.assertEquals(7.897828855157814d, LanczosApproximation.value(2.0d), 0d); } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogBetaTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogBetaTest.java index 1633529..f6cc3bc 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogBetaTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogBetaTest.java @@ -18,7 +18,7 @@ package org.apache.commons.numbers.gamma; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.junit.Assert; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -297,7 +297,7 @@ public class LogBetaTest { final double tol = ulps * Math.ulp(expected); final StringBuilder builder = new StringBuilder(); builder.append(a).append(", ").append(b); - Assert.assertEquals(builder.toString(), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, builder.toString()); } } @@ -340,7 +340,7 @@ public class LogBetaTest { double a, double b) { double actual = LogBeta.value(a, b); - Assert.assertEquals(expected, actual, 1e-15); + Assertions.assertEquals(expected, actual, 1e-15); } private static final double[][] LOG_GAMMA_MINUS_LOG_GAMMA_SUM_REF = { @@ -478,14 +478,14 @@ public class LogBetaTest { m.setAccessible(true); return ((Double) m.invoke(null, a, b)).doubleValue(); } catch (NoSuchMethodException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (IllegalAccessException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (InvocationTargetException e) { if (e.getTargetException() instanceof GammaException) { throw (GammaException) e.getTargetException(); } else { - Assert.fail(e.getTargetException().getMessage()); + Assertions.fail(e.getTargetException().getMessage()); } } return Double.NaN; @@ -503,11 +503,11 @@ public class LogBetaTest { final double tol = ulps * Math.ulp(expected); final StringBuilder builder = new StringBuilder(); builder.append(a).append(", ").append(b); - Assert.assertEquals(builder.toString(), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, builder.toString()); } } - @Test() + @Test public void testLogGammaMinusLogGammaSumPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, @@ -515,7 +515,7 @@ public class LogBetaTest { ); } - @Test() + @Test public void testLogGammaMinusLogGammaSumPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> logGammaMinusLogGammaSum(1, 7) @@ -658,14 +658,14 @@ public class LogBetaTest { m.setAccessible(true); return ((Double) m.invoke(null, a, b)).doubleValue(); } catch (NoSuchMethodException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (final IllegalAccessException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (final InvocationTargetException e) { if (e.getTargetException() instanceof GammaException) { throw (GammaException) e.getTargetException(); } else { - Assert.fail(e.getTargetException().getMessage()); + Assertions.fail(e.getTargetException().getMessage()); } } @@ -684,18 +684,18 @@ public class LogBetaTest { final double tol = ulps * Math.ulp(expected); final StringBuilder builder = new StringBuilder(); builder.append(a).append(", ").append(b); - Assert.assertEquals(builder.toString(), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, builder.toString()); } } - @Test() + @Test public void testSumDeltaMinusDeltaSumPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> sumDeltaMinusDeltaSum(9, 10) ); } - @Test() + @Test public void testSumDeltaMinusDeltaSumPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGamma1pTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGamma1pTest.java index 3b9f56b..5aead6d 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGamma1pTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGamma1pTest.java @@ -16,7 +16,6 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -53,18 +52,18 @@ public class LogGamma1pTest { final double expected = ref[1]; final double actual = LogGamma1p.value(x); final double tol = ulps * Math.ulp(expected); - Assert.assertEquals(Double.toString(x), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, Double.toString(x)); } } - @Test() + @Test public void testLogGamma1pPrecondition1() { Assertions.assertThrows(GammaException.class, () -> LogGamma1p.value(-0.51) ); } - @Test() + @Test public void testLogGamma1pPrecondition2() { Assertions.assertThrows(GammaException.class, () -> LogGamma1p.value(1.51) diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaSumTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaSumTest.java index 9eed629..0e6eb9d 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaSumTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaSumTest.java @@ -16,7 +16,6 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -141,32 +140,32 @@ public class LogGammaSumTest { final double tol = ulps * Math.ulp(expected); final StringBuilder builder = new StringBuilder(); builder.append(a).append(", ").append(b); - Assert.assertEquals(builder.toString(), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, builder.toString()); } } - @Test() + @Test public void testLogGammaSumPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> LogGammaSum.value(0, 1) ); } - @Test() + @Test public void testLogGammaSumPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> LogGammaSum.value(3, 1) ); } - @Test() + @Test public void testLogGammaSumPrecondition3() { Assertions.assertThrows(IllegalArgumentException.class, () -> LogGammaSum.value(1, 0) ); } - @Test() + @Test public void testLogGammaSumPrecondition4() { Assertions.assertThrows(IllegalArgumentException.class, () -> LogGammaSum.value(1, 3) diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaTest.java index e36741d..be6496e 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/LogGammaTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -209,22 +209,22 @@ public class LogGammaTest { } else { tol = ulps * Math.ulp(expected); } - Assert.assertEquals(Double.toString(x), expected, actual, tol); + Assertions.assertEquals(expected, actual, tol, Double.toString(x)); } } @Test public void testLogGammaPrecondition1() { - Assert.assertTrue(Double.isNaN(LogGamma.value(0.0))); + Assertions.assertTrue(Double.isNaN(LogGamma.value(0.0))); } @Test public void testLogGammaPrecondition2() { - Assert.assertTrue(Double.isNaN(LogGamma.value(-1.0))); + Assertions.assertTrue(Double.isNaN(LogGamma.value(-1.0))); } private void testLogGamma(double expected, double x) { double actual = LogGamma.value(x); - Assert.assertEquals(expected, actual, 1e-15); + Assertions.assertEquals(expected, actual, 1e-15); } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedBetaTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedBetaTest.java index 7b49d97..96c0813 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedBetaTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedBetaTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -77,7 +77,7 @@ public class RegularizedBetaTest { public void testRegularizedBetaTinyArgument() { double actual = RegularizedBeta.value(1e-17, 1.0, 1e12); // This value is from R: pbeta(1e-17,1,1e12) - Assert.assertEquals(9.999950000166648e-6, actual, 1e-16); + Assertions.assertEquals(9.999950000166648e-6, actual, 1e-16); } @Test @@ -89,7 +89,7 @@ public class RegularizedBetaTest { try { RegularizedBeta.value(x, a, b, 1e-14, 10000); } catch (StackOverflowError error) { - Assert.fail("Infinite recursion"); + Assertions.fail("Infinite recursion"); } } @@ -98,6 +98,6 @@ public class RegularizedBetaTest { double a, double b) { final double actual = RegularizedBeta.value(x, a, b); - Assert.assertEquals(expected, actual, 1e-15); + Assertions.assertEquals(expected, actual, 1e-15); } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedGammaTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedGammaTest.java index a6bf915..aef2da3 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedGammaTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/RegularizedGammaTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -61,7 +61,7 @@ public class RegularizedGammaTest { private void testRegularizedGamma(double expected, double a, double x) { double actualP = RegularizedGamma.P.value(a, x); double actualQ = RegularizedGamma.Q.value(a, x); - Assert.assertEquals(expected, actualP, 1e-15); - Assert.assertEquals(actualP, 1 - actualQ, 1e-15); + Assertions.assertEquals(expected, actualP, 1e-15); + Assertions.assertEquals(actualP, 1 - actualQ, 1e-15); } } diff --git a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/TrigammaTest.java b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/TrigammaTest.java index 6bb6b4f..bd7284f 100644 --- a/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/TrigammaTest.java +++ b/commons-numbers-gamma/src/test/java/org/apache/commons/numbers/gamma/TrigammaTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.numbers.gamma; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -45,15 +45,15 @@ public class TrigammaTest { 100, 0.010050166663333571395 }; for (int i = data.length - 2; i >= 0; i -= 2) { - Assert.assertEquals(String.format("trigamma %.0f", data[i]), data[i + 1], Trigamma.value(data[i]), eps); + Assertions.assertEquals(data[i + 1], Trigamma.value(data[i]), eps, String.format("trigamma %.0f", data[i])); } } @Test public void testTrigammaNonRealArgs() { - Assert.assertTrue(Double.isNaN(Trigamma.value(Double.NaN))); - Assert.assertTrue(Double.isInfinite(Trigamma.value(Double.POSITIVE_INFINITY))); - Assert.assertTrue(Double.isInfinite(Trigamma.value(Double.NEGATIVE_INFINITY))); + Assertions.assertTrue(Double.isNaN(Trigamma.value(Double.NaN))); + Assertions.assertTrue(Double.isInfinite(Trigamma.value(Double.POSITIVE_INFINITY))); + Assertions.assertTrue(Double.isInfinite(Trigamma.value(Double.NEGATIVE_INFINITY))); } }
