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 33af4f6e3d612c940d37790068a228d5564ab7eb
Author: aherbert <[email protected]>
AuthorDate: Mon May 20 12:47:25 2019 +0100

    Fixed checkstyle for test sources
---
 .../AbstractContinuousDistributionTest.java        |  5 ++--
 .../AbstractDiscreteDistributionTest.java          |  2 +-
 .../distribution/BetaDistributionTest.java         | 16 ++++++------
 .../distribution/BinomialDistributionTest.java     | 23 +++++++++--------
 .../ContinuousDistributionAbstractTest.java        | 30 +++++++++++-----------
 .../DiscreteDistributionAbstractTest.java          | 18 ++++++-------
 .../statistics/distribution/FDistributionTest.java |  2 +-
 .../distribution/GammaDistributionTest.java        |  9 +++----
 .../distribution/GeometricDistributionTest.java    | 23 +++++++++--------
 .../distribution/NormalDistributionTest.java       | 13 +++++-----
 .../distribution/PoissonDistributionTest.java      | 12 ++++-----
 .../commons/statistics/distribution/TestUtils.java |  2 +-
 .../distribution/ZipfDistributionTest.java         |  1 -
 13 files changed, 80 insertions(+), 76 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 b47e5ad..8fbce70 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
@@ -77,9 +77,8 @@ public class AbstractContinuousDistributionTest {
             public double getVariance() {
                 final double meanX = getMean();
                 final double meanX2;
-                meanX2 = ((x0 * x0 + x0 * x1 + x1 * x1) * p12 + (x2 * x2 + x2
-                        * x3 + x3 * x3)
-                        * (1.0 - p12)) / 3.0;
+                meanX2 = ((x0 * x0 + x0 * x1 + x1 * x1) * p12 +
+                          (x2 * x2 + x2 * x3 + x3 * x3) * (1.0 - p12)) / 3.0;
                 return meanX2 - meanX * meanX;
             }
 
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 2e8c7ae..505f768 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
@@ -43,7 +43,7 @@ public class AbstractDiscreteDistributionTest {
         Assert.assertEquals(5, 
diceDistribution.inverseCumulativeProbability((5d-precision)/6d));//Can't use 
Double.MIN
         Assert.assertEquals(6, 
diceDistribution.inverseCumulativeProbability((5d+precision)/6d));
         Assert.assertEquals(6, 
diceDistribution.inverseCumulativeProbability((6d-precision)/6d));//Can't use 
Double.MIN
-        Assert.assertEquals(6, 
diceDistribution.inverseCumulativeProbability((6d)/6d));
+        Assert.assertEquals(6, 
diceDistribution.inverseCumulativeProbability(1d));
     }
 
     @Test
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 91c23b2..c4ce76e 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
@@ -27,8 +27,8 @@ import org.junit.Test;
 
 public class BetaDistributionTest {
 
-    static final double[] alphaBetas = {0.1, 1, 10, 100, 1000};
-    static final double epsilon = StatUtils.min(alphaBetas);
+    static final double[] ALPHA_BETAS = {0.1, 1, 10, 100, 1000};
+    static final double EPSILON = StatUtils.min(ALPHA_BETAS);
 
     @Test
     public void testCumulative() {
@@ -317,8 +317,8 @@ public class BetaDistributionTest {
         final UniformRandomProvider rng = 
RandomSource.create(RandomSource.WELL_1024_A,
                                                               123456789L);
         final int numSamples = 1000;
-        for (final double alpha : alphaBetas) {
-            for (final double beta : alphaBetas) {
+        for (final double alpha : ALPHA_BETAS) {
+            for (final double beta : ALPHA_BETAS) {
                 final BetaDistribution betaDistribution = new 
BetaDistribution(alpha, beta);
                 final double[] observed = 
AbstractContinuousDistribution.sample(numSamples,
                         betaDistribution.createSampler(rng));
@@ -327,10 +327,10 @@ public class BetaDistributionTest {
                 final String distribution = String.format("Beta(%.2f, %.2f)", 
alpha, beta);
                 Assert.assertEquals(String.format("E[%s]", distribution),
                                     betaDistribution.getMean(),
-                                    StatUtils.mean(observed), epsilon);
+                                    StatUtils.mean(observed), EPSILON);
                 Assert.assertEquals(String.format("Var[%s]", distribution),
                                     betaDistribution.getVariance(),
-                                    StatUtils.variance(observed), epsilon);
+                                    StatUtils.variance(observed), EPSILON);
             }
         }
     }
@@ -342,8 +342,8 @@ public class BetaDistributionTest {
 
         final int numSamples = 1000;
         final double level = 0.01;
-        for (final double alpha : alphaBetas) {
-            for (final double beta : alphaBetas) {
+        for (final double alpha : ALPHA_BETAS) {
+            for (final double beta : ALPHA_BETAS) {
                 final BetaDistribution betaDistribution = new 
BetaDistribution(alpha, beta);
 
                 final ContinuousDistribution.Sampler sampler = 
betaDistribution.createSampler(rng);
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 ff64971..1e8c2e5 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
@@ -1,15 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
- * or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.commons.statistics.distribution;
 
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 a6176f3..92af1a4 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
@@ -107,12 +107,12 @@ public abstract class ContinuousDistributionAbstractTest {
      * The default implementation simply computes the logarithm
      * of each value returned by {@link #makeDensityTestValues()}.*/
     public double[] makeLogDensityTestValues() {
-        final double[] densityTestValues = makeDensityTestValues();
-        final double[] logDensityTestValues = new 
double[densityTestValues.length];
-        for (int i = 0; i < densityTestValues.length; i++) {
-            logDensityTestValues[i] = Math.log(densityTestValues[i]);
+        final double[] density = makeDensityTestValues();
+        final double[] logDensity = new double[density.length];
+        for (int i = 0; i < density.length; i++) {
+            logDensity[i] = Math.log(density[i]);
         }
-        return logDensityTestValues;
+        return logDensity;
     }
 
     //---- Default implementations of inverse test data generation methods ----
@@ -166,8 +166,8 @@ public abstract class ContinuousDistributionAbstractTest {
     protected void verifyCumulativeProbabilities() {
         // verify cumulativeProbability(double)
         for (int i = 0; i < cumulativeTestPoints.length; i++) {
-            TestUtils.assertEquals("Incorrect cumulative probability value 
returned for "
-                                   + cumulativeTestPoints[i], 
cumulativeTestValues[i],
+            TestUtils.assertEquals("Incorrect cumulative probability value 
returned for " +
+                                   cumulativeTestPoints[i], 
cumulativeTestValues[i],
                                    
distribution.cumulativeProbability(cumulativeTestPoints[i]),
                                    getTolerance());
         }
@@ -196,8 +196,8 @@ public abstract class ContinuousDistributionAbstractTest {
      */
     protected void verifyInverseCumulativeProbabilities() {
         for (int i = 0; i < inverseCumulativeTestPoints.length; i++) {
-            TestUtils.assertEquals("Incorrect inverse cumulative probability 
value returned for "
-                                   + inverseCumulativeTestPoints[i], 
inverseCumulativeTestValues[i],
+            TestUtils.assertEquals("Incorrect inverse cumulative probability 
value returned for " +
+                                   inverseCumulativeTestPoints[i], 
inverseCumulativeTestValues[i],
                                    
distribution.inverseCumulativeProbability(inverseCumulativeTestPoints[i]),
                                    getTolerance());
         }
@@ -208,8 +208,8 @@ public abstract class ContinuousDistributionAbstractTest {
      */
     protected void verifyDensities() {
         for (int i = 0; i < cumulativeTestPoints.length; i++) {
-            TestUtils.assertEquals("Incorrect probability density value 
returned for "
-                                   + cumulativeTestPoints[i], 
densityTestValues[i],
+            TestUtils.assertEquals("Incorrect probability density value 
returned for " +
+                                   cumulativeTestPoints[i], 
densityTestValues[i],
                                    
distribution.density(cumulativeTestPoints[i]),
                                    getTolerance());
         }
@@ -220,8 +220,8 @@ public abstract class ContinuousDistributionAbstractTest {
      */
     protected void verifyLogDensities() {
         for (int i = 0; i < cumulativeTestPoints.length; i++) {
-            TestUtils.assertEquals("Incorrect probability density value 
returned for "
-                                   + cumulativeTestPoints[i], 
logDensityTestValues[i],
+            TestUtils.assertEquals("Incorrect probability density value 
returned for " +
+                                   cumulativeTestPoints[i], 
logDensityTestValues[i],
                                    
distribution.logDensity(cumulativeTestPoints[i]),
                                    getTolerance());
         }
@@ -284,8 +284,8 @@ public abstract class ContinuousDistributionAbstractTest {
             double diff = distribution.cumulativeProbability(upper) -
                 distribution.cumulativeProbability(lower);
             double direct = distribution.probability(lower, upper);
-            TestUtils.assertEquals("Inconsistent probability for ("
-                                   + lower + "," + upper + ")", diff, direct, 
tolerance);
+            TestUtils.assertEquals("Inconsistent probability for (" +
+                                   lower + "," + upper + ")", diff, direct, 
tolerance);
         }
     }
 
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 ab0e0a1..88b49c3 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
@@ -92,12 +92,12 @@ public abstract class DiscreteDistributionAbstractTest {
      * @return double[] the default logarithmic probability density test 
expected values.
      */
     public double[] makeLogDensityTestValues() {
-        final double[] densityTestValues = makeDensityTestValues();
-        final double[] logDensityTestValues = new 
double[densityTestValues.length];
-        for (int i = 0; i < densityTestValues.length; i++) {
-            logDensityTestValues[i] = Math.log(densityTestValues[i]);
+        final double[] density = makeDensityTestValues();
+        final double[] logDensity = new double[density.length];
+        for (int i = 0; i < density.length; i++) {
+            logDensity[i] = Math.log(density[i]);
         }
-        return logDensityTestValues;
+        return logDensity;
     }
 
     /** Creates the default cumulative probability density test input values */
@@ -190,8 +190,8 @@ public abstract class DiscreteDistributionAbstractTest {
      */
     protected void verifyInverseCumulativeProbabilities() {
         for (int i = 0; i < inverseCumulativeTestPoints.length; i++) {
-            Assert.assertEquals("Incorrect inverse cumulative probability 
value returned for "
-                                + inverseCumulativeTestPoints[i], 
inverseCumulativeTestValues[i],
+            Assert.assertEquals("Incorrect inverse cumulative probability 
value returned for " +
+                                inverseCumulativeTestPoints[i], 
inverseCumulativeTestValues[i],
                                 
distribution.inverseCumulativeProbability(inverseCumulativeTestPoints[i]));
         }
     }
@@ -275,7 +275,7 @@ public abstract class DiscreteDistributionAbstractTest {
         double[] densityValues = makeDensityTestValues();
         int sampleSize = 1000;
         int length = TestUtils.eliminateZeroMassPoints(densityPoints, 
densityValues);
-        AbstractDiscreteDistribution distribution = 
(AbstractDiscreteDistribution) makeDistribution();
+        AbstractDiscreteDistribution dist = (AbstractDiscreteDistribution) 
makeDistribution();
         double[] expectedCounts = new double[length];
         long[] observedCounts = new long[length];
         for (int i = 0; i < length; i++) {
@@ -283,7 +283,7 @@ public abstract class DiscreteDistributionAbstractTest {
         }
         // Use fixed seed.
         final DiscreteDistribution.Sampler sampler =
-            
distribution.createSampler(RandomSource.create(RandomSource.WELL_512_A,
+            dist.createSampler(RandomSource.create(RandomSource.WELL_512_A,
                                                            1000));
         int[] sample = AbstractDiscreteDistribution.sample(sampleSize, 
sampler);
         for (int i = 0; i < sampleSize; i++) {
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 e286667..fd33053 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
@@ -143,7 +143,7 @@ public class FDistributionTest extends 
ContinuousDistributionAbstractTest {
             FDistribution f = new FDistribution(200000, 200000);
             double result = f.inverseCumulativeProbability(prob);
             Assert.assertTrue(result < 1.0);
-        } catch (Exception e) {
+        } catch (AssertionError ex) {
             Assert.fail("Failing to calculate inverse cumulative probability");
         }
     }
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 a281748..be2c5d2 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
@@ -35,6 +35,8 @@ import org.junit.Test;
  */
 public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
 
+    private static final double HALF_LOG_2_PI = 0.5 * Math.log(2.0 * Math.PI);
+
     //-------------- Implementations for abstract methods 
-----------------------
 
     /** Creates the default continuous distribution instance to use in tests. 
*/
@@ -166,8 +168,6 @@ public class GammaDistributionTest extends 
ContinuousDistributionAbstractTest {
         Assert.assertEquals(dist.getVariance(), 1.1d * 4.2d * 4.2d, tol);
     }
 
-    private static final double HALF_LOG_2_PI = 0.5 * Math.log(2.0 * Math.PI);
-
     public static double logGamma(double x) {
         /*
          * This is a copy of
@@ -242,9 +242,8 @@ public class GammaDistributionTest extends 
ContinuousDistributionAbstractTest {
                 final double ulp = Math.ulp(expected);
                 final double actualOld = density(x, shape, 1.0);
                 final double actualNew = distribution.density(x);
-                final double errOld, errNew;
-                errOld = Math.abs((actualOld - expected) / ulp);
-                errNew = Math.abs((actualNew - expected) / ulp);
+                final double errOld = Math.abs((actualOld - expected) / ulp);
+                final double errNew = Math.abs((actualNew - expected) / ulp);
 
                 if (Double.isNaN(actualOld) || Double.isInfinite(actualOld)) {
                     Assert.assertFalse(msg, Double.isNaN(actualNew));
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 128e372..fd7db56 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
@@ -1,15 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
- * or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.commons.statistics.distribution;
 
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 9262252..bcac87b 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
@@ -28,6 +28,8 @@ import org.junit.Test;
  */
 public class NormalDistributionTest extends ContinuousDistributionAbstractTest 
{
 
+    private static final double DEFAULT_TOLERANCE = 1e-7;
+
     //-------------- Implementations for abstract methods 
-----------------------
 
     /** Creates the default real distribution instance to use in tests. */
@@ -59,11 +61,10 @@ public class NormalDistributionTest extends 
ContinuousDistributionAbstractTest {
     }
 
     // --------------------- Override tolerance  --------------
-    private double defaultTolerance = 1e-7;
     @Override
     public void setUp() {
         super.setUp();
-        setTolerance(defaultTolerance);
+        setTolerance(DEFAULT_TOLERANCE);
     }
 
     //---------------------------- Additional test cases 
-------------------------
@@ -184,13 +185,13 @@ public class NormalDistributionTest extends 
ContinuousDistributionAbstractTest {
     public void testMath280() {
         NormalDistribution normal = new NormalDistribution(0,1);
         double result = 
normal.inverseCumulativeProbability(0.9986501019683698);
-        Assert.assertEquals(3.0, result, defaultTolerance);
+        Assert.assertEquals(3.0, result, DEFAULT_TOLERANCE);
         result = normal.inverseCumulativeProbability(0.841344746068543);
-        Assert.assertEquals(1.0, result, defaultTolerance);
+        Assert.assertEquals(1.0, result, DEFAULT_TOLERANCE);
         result = normal.inverseCumulativeProbability(0.9999683287581673);
-        Assert.assertEquals(4.0, result, defaultTolerance);
+        Assert.assertEquals(4.0, result, DEFAULT_TOLERANCE);
         result = normal.inverseCumulativeProbability(0.9772498680518209);
-        Assert.assertEquals(2.0, result, defaultTolerance);
+        Assert.assertEquals(2.0, result, DEFAULT_TOLERANCE);
     }
 
     @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 d0f59cf..87f3c96 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
@@ -123,13 +123,13 @@ public class PoissonDistributionTest extends 
DiscreteDistributionAbstractTest {
     @Test
     public void testNormalApproximateProbability() {
         PoissonDistribution dist = new PoissonDistribution(100);
-        double result = dist.normalApproximateProbability(110)
-            - dist.normalApproximateProbability(89);
+        double result = dist.normalApproximateProbability(110) -
+            dist.normalApproximateProbability(89);
         Assert.assertEquals(0.706281887248, result, 1e-10);
 
         dist = new PoissonDistribution(10000);
-        result = dist.normalApproximateProbability(10200)
-            - dist.normalApproximateProbability(9899);
+        result = dist.normalApproximateProbability(10200) -
+            dist.normalApproximateProbability(9899);
         Assert.assertEquals(0.820070051552, result, 1E-10);
     }
 
@@ -173,7 +173,7 @@ public class PoissonDistributionTest extends 
DiscreteDistributionAbstractTest {
                         Assert.assertTrue("Zero cum probaility returned for 
mean = " +
                                 mean + " x = " + x, p > 0);
                     }
-                } catch (Exception ex) {
+                } catch (AssertionError ex) {
                     Assert.fail("mean of " + mean + " and x of " + x + " 
caused " + ex.getMessage());
                 }
                 x -= dx;
@@ -219,7 +219,7 @@ public class PoissonDistributionTest extends 
DiscreteDistributionAbstractTest {
                     // Verify that returned value satisties definition
                     Assert.assertTrue(p <= dist.cumulativeProbability(ret));
                     Assert.assertTrue(p > dist.cumulativeProbability(ret - 1));
-                } catch (Exception ex) {
+                } catch (AssertionError ex) {
                     Assert.fail("mean of " + mean + " and p of " + p + " 
caused " + ex.getMessage());
                 }
                 p += dp;
diff --git 
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
 
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
index 8a074d0..c2d4eb0 100644
--- 
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
+++ 
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
@@ -141,7 +141,7 @@ public class TestUtils {
             Assert.fail(out.toString());
         }
     }
-    
+
     /**
      * Asserts the null hypothesis for a ChiSquare test.  Fails and dumps 
arguments and test
      * statistics if the null hypothesis can be rejected with confidence 100 * 
(1 - alpha)%
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 cb25c95..7d62948 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,6 @@ package org.apache.commons.statistics.distribution;
 
 import org.apache.commons.rng.simple.RandomSource;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**

Reply via email to