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 dae1b0359be291f3c3f1c16c08727ed028eb057b Author: aherbert <[email protected]> AuthorDate: Tue Jun 23 12:55:53 2020 +0100 Rename test method fixtures to prevent override of abstract test methods Renames testPreconditionN to testConstructorPreconditionN as there are precondition methods in the abstract test class. --- .../statistics/distribution/CauchyDistributionTest.java | 4 ++-- .../statistics/distribution/ExponentialDistributionTest.java | 2 +- .../commons/statistics/distribution/FDistributionTest.java | 4 ++-- .../statistics/distribution/GammaDistributionTest.java | 4 ++-- .../distribution/HypergeometricDistributionTest.java | 10 +++++----- .../statistics/distribution/LogNormalDistributionTest.java | 2 +- .../statistics/distribution/NormalDistributionTest.java | 2 +- .../statistics/distribution/ParetoDistributionTest.java | 2 +- .../commons/statistics/distribution/TDistributionTest.java | 2 +- .../statistics/distribution/TriangularDistributionTest.java | 8 ++++---- .../distribution/UniformContinuousDistributionTest.java | 4 ++-- .../statistics/distribution/WeibullDistributionTest.java | 12 +++++++----- .../statistics/distribution/ZipfDistributionTest.java | 4 ++-- 13 files changed, 31 insertions(+), 29 deletions(-) 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 5c2c73b..6dc83c6 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 @@ -89,11 +89,11 @@ public class CauchyDistributionTest extends ContinuousDistributionAbstractTest { } @Test - public void testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new CauchyDistribution(0, 0)); } @Test - public void testPrecondition2() { + public void testConstructorPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new CauchyDistribution(0, -1)); } 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 da5e271..0dbdc3e 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 testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new ExponentialDistribution(0)); } 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 d04e2a0..c71a8ab 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 testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new FDistribution(0, 1)); } @Test - public void testPrecondition2() { + public void testConstructorPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new FDistribution(1, 0)); } 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 064e727..a3c3e37 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 @@ -83,11 +83,11 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest { } @Test - public void testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new GammaDistribution(0, 1)); } @Test - public void testPrecondition2() { + public void testConstructorPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new GammaDistribution(1, 0)); } 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 d65f5da..3d5c2cd 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 @@ -159,23 +159,23 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract } @Test - public void testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(0, 3, 5)); } @Test - public void testPrecondition2() { + public void testConstructorPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, -1, 5)); } @Test - public void testPrecondition3() { + public void testConstructorPrecondition3() { Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 3, -1)); } @Test - public void testPrecondition4() { + public void testConstructorPrecondition4() { Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 6, 5)); } @Test - public void testPrecondition5() { + public void testConstructorPrecondition5() { Assertions.assertThrows(IllegalArgumentException.class, () -> new HypergeometricDistribution(5, 3, 6)); } 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 382649b..9d4c0a1 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 @@ -172,7 +172,7 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes } @Test - public void testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new LogNormalDistribution(1, 0)); } 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 ce3737a..104255f 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 @@ -135,7 +135,7 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest { } @Test - public void testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new NormalDistribution(1, 0)); } 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 b1b2700..ce89857 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 @@ -143,7 +143,7 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest { } @Test - public void testPrecondition1() { + public void testConstructorPrecondition1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new ParetoDistribution(1, 0)); } 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 33dac2c..9333699 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 @@ -120,7 +120,7 @@ public class TDistributionTest extends ContinuousDistributionAbstractTest { } @Test - public void testPreconditions() { + public void testConstructorPreconditions() { Assertions.assertThrows(IllegalArgumentException.class, () -> new TDistribution(0)); } 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 2da110b..4b8d6bc 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 @@ -148,25 +148,25 @@ public class TriangularDistributionTest extends ContinuousDistributionAbstractTe /** Test pre-condition for equal lower/upper limit. */ @Test - public void testPreconditions1() { + public void testConstructorPreconditions1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(0, 0, 0)); } /** Test pre-condition for lower limit larger than upper limit. */ @Test - public void testPreconditions2() { + public void testConstructorPreconditions2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(1, 1, 0)); } /** Test pre-condition for mode larger than upper limit. */ @Test - public void testPreconditions3() { + public void testConstructorPreconditions3() { Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(0, 2, 1)); } /** Test pre-condition for mode smaller than lower limit. */ @Test - public void testPreconditions4() { + public void testConstructorPreconditions4() { Assertions.assertThrows(IllegalArgumentException.class, () -> new TriangularDistribution(2, 1, 3)); } 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 48ff67f..7e9e94c 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 @@ -82,13 +82,13 @@ public class UniformContinuousDistributionTest extends ContinuousDistributionAbs /** Test pre-condition for equal lower/upper bound. */ @Test - public void testPreconditions1() { + public void testConstructorPreconditions1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformContinuousDistribution(0, 0)); } /** Test pre-condition for lower bound larger than upper bound. */ @Test - public void testPreconditions2() { + public void testConstructorPreconditions2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new UniformContinuousDistribution(1, 0)); } 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 b18bea0..93cd96a 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 @@ -82,18 +82,20 @@ public class WeibullDistributionTest extends ContinuousDistributionAbstractTest WeibullDistribution dist = new WeibullDistribution(1, 2); Assertions.assertEquals(1, dist.getShape(), 0); } - @Test - public void testPrecondition1() { - Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(0, 2)); - } @Test public void testBeta() { WeibullDistribution dist = new WeibullDistribution(1, 2); Assertions.assertEquals(2, dist.getScale(), 0); } + + @Test + public void testConstructorPrecondition1() { + Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(0, 2)); + } + @Test - public void testPrecondition2() { + public void testConstructorPrecondition2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new WeibullDistribution(1, 0)); } 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 e548c6e..375a900 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 @@ -37,12 +37,12 @@ public class ZipfDistributionTest extends DiscreteDistributionAbstractTest { } @Test - public void testPreconditions1() { + public void testConstructorPreconditions1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new ZipfDistribution(0, 1)); } @Test - public void testPreconditions2() { + public void testConstructorPreconditions2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new ZipfDistribution(1, 0)); }
