You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2019/06/18 21:42:00 UTC
[commons-statistics] 02/04: STATISTICS-19: Update annotations to
JUnit 5.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-statistics.git
commit 9835abf09e8ccd61d40c130ced9c1b19bcacf68b
Author: Alex Herbert <ah...@apache.org>
AuthorDate: Fri Jun 14 20:56:19 2019 +0100
STATISTICS-19: Update annotations to JUnit 5.
Child test classes cannot override @BeforeEach methods in the parent
class and must have their own to set the tolerance.
---
.../AbstractContinuousDistributionTest.java | 2 +-
.../AbstractDiscreteDistributionTest.java | 2 +-
.../distribution/BetaDistributionTest.java | 2 +-
.../distribution/BinomialDistributionTest.java | 11 ++++----
.../distribution/CauchyDistributionTest.java | 18 ++++++------
.../distribution/ChiSquaredDistributionTest.java | 9 +++---
.../ConstantContinuousDistributionTest.java | 10 +++----
.../ContinuousDistributionAbstractTest.java | 28 +++++++++++--------
.../DiscreteDistributionAbstractTest.java | 23 ++++++++--------
.../distribution/ExponentialDistributionTest.java | 14 ++++++----
.../statistics/distribution/FDistributionTest.java | 18 ++++++------
.../distribution/GammaDistributionTest.java | 18 ++++++------
.../distribution/GeometricDistributionTest.java | 11 ++++----
.../distribution/GumbelDistributionTest.java | 2 +-
.../HypergeometricDistributionTest.java | 32 ++++++++++++----------
.../distribution/LaplaceDistributionTest.java | 2 +-
.../distribution/LevyDistributionTest.java | 2 +-
.../distribution/LogNormalDistributionTest.java | 14 ++++++----
.../distribution/LogisticsDistributionTest.java | 2 +-
.../distribution/NakagamiDistributionTest.java | 2 +-
.../distribution/NormalDistributionTest.java | 14 ++++++----
.../distribution/ParetoDistributionTest.java | 14 ++++++----
.../distribution/PascalDistributionTest.java | 8 +++---
.../distribution/PoissonDistributionTest.java | 16 ++++++-----
.../statistics/distribution/TDistributionTest.java | 14 ++++++----
.../distribution/TriangularDistributionTest.java | 27 +++++++++---------
.../UniformContinuousDistributionTest.java | 19 +++++++------
.../UniformDiscreteDistributionTest.java | 15 +++++-----
.../distribution/WeibullDistributionTest.java | 11 ++++----
.../distribution/ZipfDistributionTest.java | 20 ++++++++------
30 files changed, 207 insertions(+), 173 deletions(-)
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
index 8fbce70..f28051d 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
@@ -20,7 +20,7 @@ import org.apache.commons.math3.analysis.UnivariateFunction;
import org.apache.commons.math3.analysis.integration.RombergIntegrator;
import org.apache.commons.math3.analysis.integration.UnivariateIntegrator;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/** Various tests related to MATH-699. */
public class AbstractContinuousDistributionTest {
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
index 3bc5bb7..9c59afe 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
@@ -17,7 +17,7 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for AbstractDiscreteDistribution default implementations.
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
index 7edd163..8bb4c91 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
@@ -23,7 +23,7 @@ import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.math3.stat.StatUtils;
import org.apache.commons.math3.stat.inference.GTest;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class BetaDistributionTest {
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
index 460bb3c..f24a803 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
@@ -17,7 +17,8 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for BinomialDistribution. Extends DiscreteDistributionAbstractTest.
@@ -26,10 +27,10 @@ import org.junit.Test;
*/
public class BinomialDistributionTest extends DiscreteDistributionAbstractTest {
- /**
- * Constructor to override default tolerance.
- */
- public BinomialDistributionTest() {
+ // --------------------- Override tolerance --------------
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-12);
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
index c10ee6a..35b482e 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for CauchyDistribution.
@@ -30,9 +32,9 @@ public class CauchyDistributionTest extends ContinuousDistributionAbstractTest {
// --------------------- Override tolerance --------------
protected double defaultTolerance = 1e-7;
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(defaultTolerance);
}
@@ -87,13 +89,13 @@ public class CauchyDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(2.1, distribution.getScale(), 0.0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new CauchyDistribution(0, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new CauchyDistribution(0, 0));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- new CauchyDistribution(0, -1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new CauchyDistribution(0, -1));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
index 17b35dc..4ad008b 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
@@ -18,7 +18,8 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link ChiSquaredDistribution}.
@@ -72,9 +73,9 @@ public class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTe
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-9);
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
index a7020b1..4305cf3 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
@@ -18,18 +18,18 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for ConstantContinuousDistribution.
*/
public class ConstantContinuousDistributionTest extends ContinuousDistributionAbstractTest {
- // --- Override tolerance -------------------------------------------------
+ // --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+ @BeforeEach
+ public void customSetUp() {
setTolerance(0);
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
index 2c53f5c..a534962 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
@@ -24,10 +24,11 @@ import org.apache.commons.math3.analysis.UnivariateFunction;
import org.apache.commons.math3.analysis.integration.BaseAbstractUnivariateIntegrator;
import org.apache.commons.math3.analysis.integration.IterativeLegendreGaussIntegrator;
import org.apache.commons.rng.simple.RandomSource;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
/**
* Abstract base class for {@link ContinuousDistribution} tests.
@@ -130,9 +131,12 @@ public abstract class ContinuousDistributionAbstractTest {
//-------------------- Setup / tear down ----------------------------------
/**
- * Setup sets all test instance data to default values
+ * Setup sets all test instance data to default values.
+ * <p>
+ * This method is @BeforeEach (created for each test) as certain test methods may wish
+ * to alter the defaults.
*/
- @Before
+ @BeforeEach
public void setUp() {
distribution = makeDistribution();
cumulativeTestPoints = makeCumulativeTestPoints();
@@ -146,7 +150,7 @@ public abstract class ContinuousDistributionAbstractTest {
/**
* Cleans up test instance data
*/
- @After
+ @AfterEach
public void tearDown() {
distribution = null;
cumulativeTestPoints = null;
@@ -291,17 +295,17 @@ public abstract class ContinuousDistributionAbstractTest {
/**
* Verifies that illegal arguments are correctly handled
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- distribution.probability(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.probability(1, 0));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- distribution.inverseCumulativeProbability(-1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(-1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition3() {
- distribution.inverseCumulativeProbability(2);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(2));
}
/**
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java
index 0cc63cf..8450bdd 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java
@@ -17,10 +17,11 @@
package org.apache.commons.statistics.distribution;
import org.apache.commons.rng.simple.RandomSource;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Abstract base class for {@link DiscreteDistribution} tests.
@@ -117,7 +118,7 @@ public abstract class DiscreteDistributionAbstractTest {
/**
* Setup sets all test instance data to default values
*/
- @Before
+ @BeforeEach
public void setUp() {
distribution = makeDistribution();
densityTestPoints = makeDensityTestPoints();
@@ -132,7 +133,7 @@ public abstract class DiscreteDistributionAbstractTest {
/**
* Cleans up test instance data
*/
- @After
+ @AfterEach
public void tearDown() {
distribution = null;
densityTestPoints = null;
@@ -253,17 +254,17 @@ public abstract class DiscreteDistributionAbstractTest {
upper, distribution.inverseCumulativeProbability(1.0));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- distribution.probability(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.probability(1, 0));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- distribution.inverseCumulativeProbability(-1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(-1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition3() {
- distribution.inverseCumulativeProbability(2);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(2));
}
/**
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
index 74c2820..e9e0e44 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
@@ -18,7 +18,9 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for ExponentialDistribution.
@@ -29,9 +31,9 @@ import org.junit.Test;
public class ExponentialDistributionTest extends ContinuousDistributionAbstractTest {
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-9);
}
@@ -111,9 +113,9 @@ public class ExponentialDistributionTest extends ContinuousDistributionAbstractT
Assert.assertEquals(5d, distribution.getMean(), Double.MIN_VALUE);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new ExponentialDistribution(0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new ExponentialDistribution(0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
index 09427e8..c3045dc 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
@@ -17,7 +17,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for FDistribution.
@@ -57,9 +59,9 @@ public class FDistributionTest extends ContinuousDistributionAbstractTest {
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-9);
}
@@ -86,13 +88,13 @@ public class FDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(6d, dist.getDenominatorDegreesOfFreedom(), Double.MIN_VALUE);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new FDistribution(0, 1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new FDistribution(0, 1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- new FDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new FDistribution(1, 0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
index 852ac4c..1597a3e 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
@@ -25,7 +25,9 @@ import java.io.InputStreamReader;
import org.apache.commons.numbers.gamma.LanczosApproximation;
import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for GammaDistribution.
@@ -67,9 +69,9 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-9);
}
@@ -81,13 +83,13 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(2d, distribution.getScale(), 0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new GammaDistribution(0, 1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new GammaDistribution(0, 1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- new GammaDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new GammaDistribution(1, 0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
index 907f4bb..0eb5512 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
@@ -17,7 +17,8 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for GeometricDistribution.
@@ -25,10 +26,10 @@ import org.junit.Test;
*/
public class GeometricDistributionTest extends DiscreteDistributionAbstractTest {
- /**
- * Constructor to override default tolerance.
- */
- public GeometricDistributionTest() {
+ // --------------------- Override tolerance --------------
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-12);
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java
index 7722942..613d5aa 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for GumbelDistribution.
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
index 5ae8d9b..14e15fe 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
@@ -20,7 +20,9 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.apache.commons.rng.simple.RandomSource;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for HyperGeometriclDistribution.
@@ -30,10 +32,10 @@ import org.junit.Test;
*/
public class HypergeometricDistributionTest extends DiscreteDistributionAbstractTest {
- /**
- * Constructor to override default tolerance.
- */
- public HypergeometricDistributionTest() {
+ // --------------------- Override tolerance --------------
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-12);
}
@@ -157,25 +159,25 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract
Assert.assertEquals(3, dist.getSupportUpperBound());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new HypergeometricDistribution(0, 3, 5);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(0, 3, 5));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- new HypergeometricDistribution(5, -1, 5);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, -1, 5));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition3() {
- new HypergeometricDistribution(5, 3, -1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 3, -1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition4() {
- new HypergeometricDistribution(5, 6, 5);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 6, 5));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition5() {
- new HypergeometricDistribution(5, 3, 6);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 3, 6));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java
index d935aca..8b21beb 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for LaplaceDistribution.
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java
index 78b210c..d86971e 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class LevyDistributionTest extends ContinuousDistributionAbstractTest {
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
index 36cae39..b73b6c8 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link LogNormalDistribution}. Extends
@@ -95,9 +97,9 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-7);
}
@@ -170,9 +172,9 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes
Assert.assertEquals(1.4, distribution.getShape(), 0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new LogNormalDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new LogNormalDistribution(1, 0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticsDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticsDistributionTest.java
index cfdf6d8..a42b804 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticsDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticsDistributionTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for LogisticsDistribution.
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
index 6aab2dd..fb74471 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for NakagamiDistribution.
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
index 8c568d8..50f3fbc 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link NormalDistribution}. Extends
@@ -61,9 +63,9 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(DEFAULT_TOLERANCE);
}
@@ -133,9 +135,9 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(1.4, distribution.getStandardDeviation(), 0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new NormalDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new NormalDistribution(1, 0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
index f2263ca..3b1bcdd 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link ParetoDistribution}.
@@ -83,9 +85,9 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-7);
}
@@ -141,9 +143,9 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(1.4, distribution.getShape(), 0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new ParetoDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new ParetoDistribution(1, 0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
index cbbc895..1ed7511 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
@@ -17,7 +17,8 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for PascalDistribution.
@@ -30,9 +31,8 @@ public class PascalDistributionTest extends DiscreteDistributionAbstractTest {
// --------------------- Override tolerance --------------
protected double defaultTolerance = 1e-7;
- @Override
- public void setUp() {
- super.setUp();
+ @BeforeEach
+ public void customSetUp() {
setTolerance(defaultTolerance);
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
index e34435b..0e2f693 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
@@ -17,7 +17,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* <code>PoissonDistributionTest</code>
@@ -30,10 +32,10 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
*/
private static final double DEFAULT_TEST_POISSON_PARAMETER = 4.0;
- /**
- * Constructor.
- */
- public PoissonDistributionTest() {
+ // --------------------- Override tolerance --------------
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-12);
}
@@ -143,9 +145,9 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
Assert.assertEquals(0, dist.inverseCumulativeProbability(0d));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testNegativeMean() {
- new PoissonDistribution(-1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new PoissonDistribution(-1));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
index e2fc246..26089e9 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
@@ -17,7 +17,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for TDistribution.
* Extends ContinuousDistributionAbstractTest. See class javadoc for
@@ -57,9 +59,9 @@ public class TDistributionTest extends ContinuousDistributionAbstractTest {
}
// --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-9);
}
@@ -118,9 +120,9 @@ public class TDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(5d, dist.getDegreesOfFreedom(), Double.MIN_VALUE);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions() {
- new TDistribution(0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new TDistribution(0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
index d4ac77b..f52b2a3 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link TriangularDistribution}. See class javadoc for
@@ -26,11 +28,10 @@ import org.junit.Test;
*/
public class TriangularDistributionTest extends ContinuousDistributionAbstractTest {
- // --- Override tolerance -------------------------------------------------
+ // --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-4);
}
@@ -147,27 +148,27 @@ public class TriangularDistributionTest extends ContinuousDistributionAbstractTe
}
/** Test pre-condition for equal lower/upper limit. */
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions1() {
- new TriangularDistribution(0, 0, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(0, 0, 0));
}
/** Test pre-condition for lower limit larger than upper limit. */
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions2() {
- new TriangularDistribution(1, 1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(1, 1, 0));
}
/** Test pre-condition for mode larger than upper limit. */
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions3() {
- new TriangularDistribution(0, 2, 1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(0, 2, 1));
}
/** Test pre-condition for mode smaller than lower limit. */
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions4() {
- new TriangularDistribution(2, 1, 3);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(2, 1, 3));
}
/** Test mean/variance. */
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
index 8256af8..68d347b 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for UniformContinuousDistribution. See class javadoc for
@@ -26,11 +28,10 @@ import org.junit.Test;
*/
public class UniformContinuousDistributionTest extends ContinuousDistributionAbstractTest {
- // --- Override tolerance -------------------------------------------------
+ // --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-4);
}
@@ -81,15 +82,15 @@ public class UniformContinuousDistributionTest extends ContinuousDistributionAbs
}
/** Test pre-condition for equal lower/upper bound. */
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions1() {
- new UniformContinuousDistribution(0, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformContinuousDistribution(0, 0));
}
/** Test pre-condition for lower bound larger than upper bound. */
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions2() {
- new UniformContinuousDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformContinuousDistribution(1, 0));
}
/** Test mean/variance. */
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
index 419aa99..393e964 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
@@ -18,7 +18,9 @@
package org.apache.commons.statistics.distribution;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.commons.numbers.core.Precision;
/**
@@ -27,11 +29,10 @@ import org.apache.commons.numbers.core.Precision;
*/
public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstractTest {
- // --- Override tolerance -------------------------------------------------
+ // --------------------- Override tolerance --------------
- @Override
- public void setUp() {
- super.setUp();
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-9);
}
@@ -99,9 +100,9 @@ public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstrac
}
// MATH-1141
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditionUpperBoundInclusive1() {
- new UniformDiscreteDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformDiscreteDistribution(1, 0));
}
// MATH-1141
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
index ee80123..2d70983 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
@@ -19,7 +19,8 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.numbers.gamma.LogGamma;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
/**
* Test cases for WeibullDistribution.
@@ -82,9 +83,9 @@ public class WeibullDistributionTest extends ContinuousDistributionAbstractTest
WeibullDistribution dist = new WeibullDistribution(1, 2);
Assert.assertEquals(1, dist.getShape(), 0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition1() {
- new WeibullDistribution(0, 2);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(0, 2));
}
@Test
@@ -92,9 +93,9 @@ public class WeibullDistributionTest extends ContinuousDistributionAbstractTest
WeibullDistribution dist = new WeibullDistribution(1, 2);
Assert.assertEquals(2, dist.getScale(), 0);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPrecondition2() {
- new WeibullDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(1, 0));
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
index b542893..a20160b 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
@@ -19,7 +19,9 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.rng.simple.RandomSource;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link ZipfDistribution}.
@@ -28,21 +30,21 @@ import org.junit.Test;
*/
public class ZipfDistributionTest extends DiscreteDistributionAbstractTest {
- /**
- * Constructor to override default tolerance.
- */
- public ZipfDistributionTest() {
+ // --------------------- Override tolerance --------------
+
+ @BeforeEach
+ public void customSetUp() {
setTolerance(1e-12);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions1() {
- new ZipfDistribution(0, 1);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new ZipfDistribution(0, 1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPreconditions2() {
- new ZipfDistribution(1, 0);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new ZipfDistribution(1, 0));
}
//-------------- Implementations for abstract methods -----------------------