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
The following commit(s) were added to refs/heads/master by this push: new 6e22abb Assert that DistributionException is thrown. 6e22abb is described below commit 6e22abb07de6e3728d4181555270277c041de2b0 Author: aherbert <aherb...@apache.org> AuthorDate: Wed Jun 24 14:04:20 2020 +0100 Assert that DistributionException is thrown. Asserting for IllegalArgumentException fails to detect if the formatting done by DistributionException in the constructor is valid. If String.format errors due to bad parameters it will throw an IllegalArgumentException. This is an error but will not be detected in the test suite (unless the returned exception is further asserted). --- .../statistics/distribution/BinomialDistributionTest.java | 6 +++--- .../statistics/distribution/CauchyDistributionTest.java | 4 ++-- .../statistics/distribution/ChiSquaredDistributionTest.java | 4 ++-- .../distribution/ContinuousDistributionAbstractTest.java | 6 +++--- .../distribution/DiscreteDistributionAbstractTest.java | 6 +++--- .../statistics/distribution/ExponentialDistributionTest.java | 2 +- .../commons/statistics/distribution/FDistributionTest.java | 4 ++-- .../commons/statistics/distribution/GammaDistributionTest.java | 4 ++-- .../statistics/distribution/GeometricDistributionTest.java | 4 ++-- .../statistics/distribution/GumbelDistributionTest.java | 2 +- .../distribution/HypergeometricDistributionTest.java | 10 +++++----- .../statistics/distribution/LaplaceDistributionTest.java | 2 +- .../statistics/distribution/LogNormalDistributionTest.java | 2 +- .../statistics/distribution/LogisticsDistributionTest.java | 2 +- .../statistics/distribution/NakagamiDistributionTest.java | 4 ++-- .../statistics/distribution/NormalDistributionTest.java | 2 +- .../statistics/distribution/ParetoDistributionTest.java | 4 ++-- .../statistics/distribution/PascalDistributionTest.java | 6 +++--- .../statistics/distribution/PoissonDistributionTest.java | 2 +- .../commons/statistics/distribution/TDistributionTest.java | 2 +- .../statistics/distribution/TriangularDistributionTest.java | 8 ++++---- .../distribution/UniformContinuousDistributionTest.java | 4 ++-- .../distribution/UniformDiscreteDistributionTest.java | 2 +- .../statistics/distribution/WeibullDistributionTest.java | 4 ++-- .../commons/statistics/distribution/ZipfDistributionTest.java | 4 ++-- 25 files changed, 50 insertions(+), 50 deletions(-) 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 d66d799..f927559 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 @@ -159,17 +159,17 @@ public class BinomialDistributionTest extends DiscreteDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new BinomialDistribution(-1, 0.1)); + Assertions.assertThrows(DistributionException.class, () -> new BinomialDistribution(-1, 0.1)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new BinomialDistribution(10, -0.1)); + Assertions.assertThrows(DistributionException.class, () -> new BinomialDistribution(10, -0.1)); } @Test public void testConstructorPrecondition3() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new BinomialDistribution(10, 1.1)); + Assertions.assertThrows(DistributionException.class, () -> new BinomialDistribution(10, 1.1)); } @Test 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 5276680..795de4c 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 @@ -85,12 +85,12 @@ public class CauchyDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new CauchyDistribution(0, 0)); + Assertions.assertThrows(DistributionException.class, () -> new CauchyDistribution(0, 0)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new CauchyDistribution(0, -1)); + Assertions.assertThrows(DistributionException.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 c792f73..f6090c0 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 @@ -103,12 +103,12 @@ public class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTe @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ChiSquaredDistribution(0)); + Assertions.assertThrows(DistributionException.class, () -> new ChiSquaredDistribution(0)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ChiSquaredDistribution(-1)); + Assertions.assertThrows(DistributionException.class, () -> new ChiSquaredDistribution(-1)); } @Test 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 6e517ee..300f2e7 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 @@ -294,15 +294,15 @@ public abstract class ContinuousDistributionAbstractTest { */ @Test public void testPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.probability(1, 0)); + Assertions.assertThrows(DistributionException.class, () -> distribution.probability(1, 0)); } @Test public void testPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(-1)); + Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(-1)); } @Test public void testPrecondition3() { - Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(2)); + Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(2)); } @Test 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 b60ff9f..08abf16 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 @@ -257,15 +257,15 @@ public abstract class DiscreteDistributionAbstractTest { @Test public void testPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.probability(1, 0)); + Assertions.assertThrows(DistributionException.class, () -> distribution.probability(1, 0)); } @Test public void testPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(-1)); + Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(-1)); } @Test public void testPrecondition3() { - Assertions.assertThrows(IllegalArgumentException.class, () -> distribution.inverseCumulativeProbability(2)); + Assertions.assertThrows(DistributionException.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 4c90920..0a1b6c6 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 @@ -113,7 +113,7 @@ public class ExponentialDistributionTest extends ContinuousDistributionAbstractT @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ExponentialDistribution(0)); + Assertions.assertThrows(DistributionException.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 42bd9f9..0c9921d 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 @@ -88,11 +88,11 @@ public class FDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new FDistribution(0, 1)); + Assertions.assertThrows(DistributionException.class, () -> new FDistribution(0, 1)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new FDistribution(1, 0)); + Assertions.assertThrows(DistributionException.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 5a67eaa..7f32c4c 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 @@ -84,11 +84,11 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new GammaDistribution(0, 1)); + Assertions.assertThrows(DistributionException.class, () -> new GammaDistribution(0, 1)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new GammaDistribution(1, 0)); + Assertions.assertThrows(DistributionException.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 02cfd59..c098857 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 @@ -165,12 +165,12 @@ public class GeometricDistributionTest extends DiscreteDistributionAbstractTest @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new GeometricDistribution(-0.1)); + Assertions.assertThrows(DistributionException.class, () -> new GeometricDistribution(-0.1)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new GeometricDistribution(1.1)); + Assertions.assertThrows(DistributionException.class, () -> new GeometricDistribution(1.1)); } @Test 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 df094dc..cceff20 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 @@ -72,7 +72,7 @@ public class GumbelDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new GumbelDistribution(10, -0.1)); + Assertions.assertThrows(DistributionException.class, () -> new GumbelDistribution(10, -0.1)); } @Test 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 835aa67..c3f3271 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 @@ -167,23 +167,23 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(0, 3, 5)); + Assertions.assertThrows(DistributionException.class, () -> new HypergeometricDistribution(0, 3, 5)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, -1, 5)); + Assertions.assertThrows(DistributionException.class, () -> new HypergeometricDistribution(5, -1, 5)); } @Test public void testConstructorPrecondition3() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 3, -1)); + Assertions.assertThrows(DistributionException.class, () -> new HypergeometricDistribution(5, 3, -1)); } @Test public void testConstructorPrecondition4() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 6, 5)); + Assertions.assertThrows(DistributionException.class, () -> new HypergeometricDistribution(5, 6, 5)); } @Test public void testConstructorPrecondition5() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 3, 6)); + Assertions.assertThrows(DistributionException.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 ec6d8ef..1b9ee31 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 @@ -72,7 +72,7 @@ public class LaplaceDistributionTest extends ContinuousDistributionAbstractTest @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new LaplaceDistribution(0, -0.1)); + Assertions.assertThrows(DistributionException.class, () -> new LaplaceDistribution(0, -0.1)); } @Test 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 28d32a9..768ef24 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 @@ -177,7 +177,7 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new LogNormalDistribution(1, 0)); + Assertions.assertThrows(DistributionException.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 3c7ad77..1cafb5d 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 @@ -72,7 +72,7 @@ public class LogisticsDistributionTest extends ContinuousDistributionAbstractTes @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new LogisticDistribution(1, 0)); + Assertions.assertThrows(DistributionException.class, () -> new LogisticDistribution(1, 0)); } @Test 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 9c450e2..a8f1793 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 @@ -65,12 +65,12 @@ public class NakagamiDistributionTest extends ContinuousDistributionAbstractTest @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new NakagamiDistribution(0.4999, 1.0)); + Assertions.assertThrows(DistributionException.class, () -> new NakagamiDistribution(0.4999, 1.0)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new NakagamiDistribution(0.5, 0.0)); + Assertions.assertThrows(DistributionException.class, () -> new NakagamiDistribution(0.5, 0.0)); } @Test 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 649b2ae..603e41d 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 @@ -131,7 +131,7 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new NormalDistribution(1, 0)); + Assertions.assertThrows(DistributionException.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 f70b442..1954986 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 @@ -139,12 +139,12 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ParetoDistribution(1, 0)); + Assertions.assertThrows(DistributionException.class, () -> new ParetoDistribution(1, 0)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ParetoDistribution(0, 1)); + Assertions.assertThrows(DistributionException.class, () -> new ParetoDistribution(0, 1)); } @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 2fab384..d9cd08b 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 @@ -126,17 +126,17 @@ public class PascalDistributionTest extends DiscreteDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new PascalDistribution(0, 0.5)); + Assertions.assertThrows(DistributionException.class, () -> new PascalDistribution(0, 0.5)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new PascalDistribution(3, -0.1)); + Assertions.assertThrows(DistributionException.class, () -> new PascalDistribution(3, -0.1)); } @Test public void testConstructorPrecondition3() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new PascalDistribution(3, 1.1)); + Assertions.assertThrows(DistributionException.class, () -> new PascalDistribution(3, 1.1)); } @Test 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 29fd379..008d938 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 @@ -157,7 +157,7 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new PoissonDistribution(-1)); + Assertions.assertThrows(DistributionException.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 d6398a9..5000450 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 @@ -121,7 +121,7 @@ public class TDistributionTest extends ContinuousDistributionAbstractTest { @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new TDistribution(0)); + Assertions.assertThrows(DistributionException.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 d5fffd3..aef0d60 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 @@ -157,25 +157,25 @@ public class TriangularDistributionTest extends ContinuousDistributionAbstractTe /** Test pre-condition for equal lower/upper limit. */ @Test public void testConstructorPreconditions1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(0, 0, 0)); + Assertions.assertThrows(DistributionException.class, () -> new TriangularDistribution(0, 0, 0)); } /** Test pre-condition for lower limit larger than upper limit. */ @Test public void testConstructorPreconditions2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(1, 1, 0)); + Assertions.assertThrows(DistributionException.class, () -> new TriangularDistribution(1, 1, 0)); } /** Test pre-condition for mode larger than upper limit. */ @Test public void testConstructorPreconditions3() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(0, 2, 1)); + Assertions.assertThrows(DistributionException.class, () -> new TriangularDistribution(0, 2, 1)); } /** Test pre-condition for mode smaller than lower limit. */ @Test public void testConstructorPreconditions4() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(2, 1, 3)); + Assertions.assertThrows(DistributionException.class, () -> new TriangularDistribution(2, 1, 3)); } @Test 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 ec0d57a..7f9dd39 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 @@ -83,13 +83,13 @@ public class UniformContinuousDistributionTest extends ContinuousDistributionAbs /** Test pre-condition for equal lower/upper bound. */ @Test public void testConstructorPreconditions1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformContinuousDistribution(0, 0)); + Assertions.assertThrows(DistributionException.class, () -> new UniformContinuousDistribution(0, 0)); } /** Test pre-condition for lower bound larger than upper bound. */ @Test public void testConstructorPreconditions2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformContinuousDistribution(1, 0)); + Assertions.assertThrows(DistributionException.class, () -> new UniformContinuousDistribution(1, 0)); } @Test 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 502af05..7a23480 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 @@ -101,7 +101,7 @@ public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstrac // MATH-1141 @Test public void testPreconditionUpperBoundInclusive1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformDiscreteDistribution(1, 0)); + Assertions.assertThrows(DistributionException.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 7438ffd..b31eabf 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 @@ -85,12 +85,12 @@ public class WeibullDistributionTest extends ContinuousDistributionAbstractTest @Test public void testConstructorPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(0, 2)); + Assertions.assertThrows(DistributionException.class, () -> new WeibullDistribution(0, 2)); } @Test public void testConstructorPrecondition2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(1, 0)); + Assertions.assertThrows(DistributionException.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 345b969..8715f37 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 @@ -109,12 +109,12 @@ public class ZipfDistributionTest extends DiscreteDistributionAbstractTest { @Test public void testConstructorPreconditions1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ZipfDistribution(0, 1)); + Assertions.assertThrows(DistributionException.class, () -> new ZipfDistribution(0, 1)); } @Test public void testConstructorPreconditions2() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new ZipfDistribution(1, 0)); + Assertions.assertThrows(DistributionException.class, () -> new ZipfDistribution(1, 0)); } @Test