commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r912374 - in /commons/proper/lang/branches/LANG_2_X: build.xml pom.xml src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java src/test/java/org/apache/commons/lang/math/RandomUtilsTest.java
Date Sun, 21 Feb 2010 17:20:58 GMT
Author: niallp
Date: Sun Feb 21 17:20:57 2010
New Revision: 912374

URL: http://svn.apache.org/viewvc?rev=912374&view=rev
Log:
LANG-592 RandomUtils tests are failing frequently - thanks to Phil Steitz for investigating
(separate out RandomUtils frequency tests into a new test case and only run in special Ant/Maven
target/profile)

Added:
    commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java
  (with props)
Modified:
    commons/proper/lang/branches/LANG_2_X/build.xml
    commons/proper/lang/branches/LANG_2_X/pom.xml
    commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsTest.java

Modified: commons/proper/lang/branches/LANG_2_X/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/build.xml?rev=912374&r1=912373&r2=912374&view=diff
==============================================================================
--- commons/proper/lang/branches/LANG_2_X/build.xml (original)
+++ commons/proper/lang/branches/LANG_2_X/build.xml Sun Feb 21 17:20:57 2010
@@ -103,11 +103,27 @@
                     <include name="**/*Test.java"/>
                     <exclude name="**/Abstract*Test.java"/>
                     <exclude name="**/EntitiesPerformanceTest.java"/>
+                    <exclude name="**/RandomUtilsFreqTest.java"/>
                 </fileset>
             </batchtest>
         </junit>
     </target>
 
+    <!--
+	 RandomUtils frequency tests have been put in a separate test case which
+	 is only run when using this target because it fails too frequently.
+	 See https://issues.apache.org/jira/browse/LANG-592
+	 -->
+	<target name="test-random-freq" depends="compile.tests" description="Run RandomUtilsFreqTest">
+        <echo message="Running RandomUtilsFreqTest unit test ..."/>
+        <mkdir dir="${build.home}/test-reports"/>
+        <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
+            <classpath refid="test.classpath"/>
+            <formatter type="plain" usefile="true" />
+            <test name="org.apache.commons.lang.math.RandomUtilsFreqTest" todir="${build.home}/test-reports"/>
+        </junit>
+    </target>
+
     <target name="clean" description="Clean build and distribution directories">
         <delete dir="${build.home}"/>
     </target>

Modified: commons/proper/lang/branches/LANG_2_X/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/pom.xml?rev=912374&r1=912373&r2=912374&view=diff
==============================================================================
--- commons/proper/lang/branches/LANG_2_X/pom.xml (original)
+++ commons/proper/lang/branches/LANG_2_X/pom.xml Sun Feb 21 17:20:57 2010
@@ -426,6 +426,7 @@
     <commons.release.version>2.5</commons.release.version>
     <commons.jira.id>LANG</commons.jira.id>
     <commons.jira.pid>12310481</commons.jira.pid>
+    <random.exclude.test>**/RandomUtilsFreqTest.java</random.exclude.test>
   </properties> 
 
 
@@ -440,6 +441,7 @@
           </includes>
           <excludes>
             <exclude>**/EntitiesPerformanceTest.java</exclude>
+            <exclude>${random.exclude.test}</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -456,6 +458,33 @@
     </plugins>
   </build>
 
+  <profiles>
+      <!--
+        RandomUtils frequency tests have been put in a separate test case which
+        is only run when using this profile because it fails too frequently.
+        See https://issues.apache.org/jira/browse/LANG-592
+        -->
+      <profile>
+        <id>test-random-freq</id>
+        <properties>
+          <random.exclude.test/>
+        </properties> 
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <includes>
+                  <include>**/RandomUtilsFreqTest.java</include>
+                </includes>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+  </profiles>
+
   <reporting>
     <plugins>
         <plugin>

Added: commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java?rev=912374&view=auto
==============================================================================
--- commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java
(added)
+++ commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java
Sun Feb 21 17:20:57 2010
@@ -0,0 +1,168 @@
+/*
+ * 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.
+ */
+package org.apache.commons.lang.math;
+
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+/**
+ * Test cases for the {@link RandomUtils} class.
+ *
+ * @author <a href="mailto:phil@steitz.com">Phil Steitz</a>
+ * @version $Revision$ $Date$
+ */
+
+public final class RandomUtilsFreqTest extends TestCase {
+
+    public RandomUtilsFreqTest(String name) {
+        super(name);
+    }
+
+    public void testNextIntBound(){
+        tstNextInt(10);
+        tstNextInt(1<<8);
+        tstNextInt((1<<8)+1);
+        tstNextInt((1<<8)-1);
+        tstNextInt(1<<30);
+        tstNextInt((1<<30)-1);
+        tstNextInt((1<<30)+1);
+        Random rnd = new Random();
+        for(int i=0;i<10;i++){
+            tstNextInt(rnd.nextInt(Integer.MAX_VALUE));
+        }
+    }
+
+    public void testNextLongBound(){
+        tstNextLong(Integer.MAX_VALUE-1);
+        tstNextLong(Integer.MAX_VALUE);
+        tstNextLong((long)Integer.MAX_VALUE+1);
+        tstNextLong(Long.MAX_VALUE/1024);
+        tstNextLong(Long.MAX_VALUE/920);
+        tstNextLong(Long.MAX_VALUE/1000);
+        tstNextLong(Long.MAX_VALUE/512);
+        tstNextLong(Long.MAX_VALUE/64);
+        tstNextLong(Long.MAX_VALUE-1);
+        tstNextLong(Long.MAX_VALUE);
+        Random rnd = new Random();
+        for(int i=0;i<10;i++){
+            tstNextLong(rnd.nextInt(Integer.MAX_VALUE));
+        }
+        for(int i=0;i<10;i++){
+            tstNextLong(rnd.nextLong() & 0x7fffffffffffffffL);
+        }
+    }
+    
+    /** 
+     * Generate 1000 values for nextInt(bound) and compare
+     * the observed frequency counts to expected counts using
+     * a chi-square test.
+     * @param bound upper bound to use
+     */
+    private void tstNextInt(int bound) {
+        assertTrue(bound+" Must be non-negative",bound>=0);
+        int result = 0;
+        Random rnd = new Random();
+        // test uniformity -- use Chi-Square test at .01 level
+        int[] expected = new int[] {500,500};
+        int[] observed = new int[] {0,0};
+        int[] observed2 = new int[] {0,0};
+        for (int i = 0; i < 1000; i ++) {
+            result = rnd.nextInt(bound);
+            assertTrue(result+" Must be non-negative",result>=0);
+            assertTrue(result+" Must be less than bound: "+bound,result<bound);
+            if (result < bound/2) {
+                observed[0]++;
+            } else {
+                observed[1]++;
+            }
+            observed2[result%2]++;
+        } 
+        /* Use ChiSquare dist with df = 2-1 = 1, alpha = .001
+         * Change to 6.64 for alpha = .01  
+         */ 
+        double chiSquare = chiSquare(expected,observed);
+        assertTrue(
+            "mid point chi-square test -- will fail about 1 in 1000 times: "+chiSquare,
+                chiSquare < 10.83);
+        chiSquare = chiSquare(expected,observed2);
+        assertTrue(
+                "odd/even chi-square test -- will fail about 1 in 1000 times: "+chiSquare,
+                chiSquare < 10.83);
+    }  
+
+    /** 
+     * Generate 1000 values for nextInt(bound) and compare
+     * the observed frequency counts to expected counts using
+     * a chi-square test.
+     * @param bound upper bound to use
+     */
+    private void tstNextLong(long bound) {
+        // Distribution
+        int[] expected = new int[] {500,500};
+        int[] observed = new int[] {0,0};
+        // Even/Odd
+        int[] expected2 = new int[] {500,500};
+        int[] observed2 = new int[] {0,0};
+        long result = 0;
+        long midPoint = bound/2;
+        for (int i = 0; i < 1000; i ++) {
+            result = JVMRandom.nextLong(bound);
+            assertTrue(result+" Must be non-negative",result>=0);
+            assertTrue(result+" Must be less than bound: "+bound,result<bound);
+            if (result < midPoint) {
+                observed[0]++;
+            } else {
+                observed[1]++;
+            }
+            if (result % 2 == 0) {
+               observed2[0]++;
+            } else {
+               observed2[1]++;
+            }
+        }
+        /* Use ChiSquare dist with df = 2-1 = 1, alpha = .001
+         * Change to 6.64 for alpha = .01  
+         */ 
+        final double chiSquare = chiSquare(expected,observed);
+        assertTrue(
+            "mid point chi-square test -- will fail about 1 in 1000 times: "
+                +chiSquare+":"+observed[0]+","+observed[1],
+            chiSquare < 10.83); 
+        final double oddEven = chiSquare(expected2,observed2);
+        assertTrue(
+                "odd/even chi-square test -- will fail about 1 in 1000 times: "
+                +oddEven+":"+observed2[0]+","+observed2[1],
+                oddEven < 10.83); 
+    }
+
+    /**
+     * Computes Chi-Square statistic given observed and expected counts
+     * @param observed array of observed frequency counts
+     * @param expected array of expected frequency counts
+     */
+    private double chiSquare(int[] expected, int[] observed) {
+        double sumSq = 0.0d;
+        double dev = 0.0d;
+        for (int i = 0; i< observed.length; i++) {
+            dev = (double)(observed[i] - expected[i]);
+            sumSq += dev*dev/(double)expected[i];
+        }
+        return sumSq;
+    }
+
+}

Propchange: commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsFreqTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsTest.java?rev=912374&r1=912373&r2=912374&view=diff
==============================================================================
--- commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsTest.java
(original)
+++ commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/math/RandomUtilsTest.java
Sun Feb 21 17:20:57 2010
@@ -94,44 +94,6 @@
             chiSquare(expected,observed) < 16.27);                                   
                        
     }  
     
-    /** 
-     * Generate 1000 values for nextInt(bound) and compare
-     * the observed frequency counts to expected counts using
-     * a chi-square test.
-     * @param bound upper bound to use
-     */
-    private void tstNextInt(int bound) {
-        assertTrue(bound+" Must be non-negative",bound>=0);
-        int result = 0;
-        Random rnd = new Random();
-        // test uniformity -- use Chi-Square test at .01 level
-        int[] expected = new int[] {500,500};
-        int[] observed = new int[] {0,0};
-        int[] observed2 = new int[] {0,0};
-        for (int i = 0; i < 1000; i ++) {
-            result = rnd.nextInt(bound);
-            assertTrue(result+" Must be non-negative",result>=0);
-            assertTrue(result+" Must be less than bound: "+bound,result<bound);
-            if (result < bound/2) {
-                observed[0]++;
-            } else {
-                observed[1]++;
-            }
-            observed2[result%2]++;
-        } 
-        /* Use ChiSquare dist with df = 2-1 = 1, alpha = .001
-         * Change to 6.64 for alpha = .01  
-         */ 
-        double chiSquare = chiSquare(expected,observed);
-        assertTrue(
-            "mid point chi-square test -- will fail about 1 in 1000 times: "+chiSquare,
-                chiSquare < 10.83);                                                  
         
-        chiSquare = chiSquare(expected,observed2);
-        assertTrue(
-                "odd/even chi-square test -- will fail about 1 in 1000 times: "+chiSquare,
-                chiSquare < 10.83);                                                  
         
-    }  
-
     /** test distribution of nextLong() */
     public void testNextLong() {
         tstNextLong(null);
@@ -188,51 +150,6 @@
                 "odd/even chi-square test -- will fail about 1 in 1000 times",
                 chiSquare(expected2,observed2) < 10.83); 
     }
-
-    /** 
-     * Generate 1000 values for nextInt(bound) and compare
-     * the observed frequency counts to expected counts using
-     * a chi-square test.
-     * @param bound upper bound to use
-     */
-    private void tstNextLong(long bound) {
-        // Distribution
-        int[] expected = new int[] {500,500};
-        int[] observed = new int[] {0,0};
-        // Even/Odd
-        int[] expected2 = new int[] {500,500};
-        int[] observed2 = new int[] {0,0};
-        long result = 0;
-        long midPoint = bound/2;
-        for (int i = 0; i < 1000; i ++) {
-            result = JVMRandom.nextLong(bound);
-            assertTrue(result+" Must be non-negative",result>=0);
-            assertTrue(result+" Must be less than bound: "+bound,result<bound);
-            if (result < midPoint) {
-                observed[0]++;
-            } else {
-                observed[1]++;
-            }
-            if (result % 2 == 0) {
-               observed2[0]++;
-            } else {
-               observed2[1]++;
-            }
-        }
-        /* Use ChiSquare dist with df = 2-1 = 1, alpha = .001
-         * Change to 6.64 for alpha = .01  
-         */ 
-        final double chiSquare = chiSquare(expected,observed);
-        assertTrue(
-            "mid point chi-square test -- will fail about 1 in 1000 times: "
-                +chiSquare+":"+observed[0]+","+observed[1],
-            chiSquare < 10.83); 
-        final double oddEven = chiSquare(expected2,observed2);
-        assertTrue(
-                "odd/even chi-square test -- will fail about 1 in 1000 times: "
-                +oddEven+":"+observed2[0]+","+observed2[1],
-                oddEven < 10.83); 
-    }
         
     
     /** test distribution of nextBoolean() */
@@ -406,40 +323,6 @@
 
     }
     
-    public void testNextIntBound(){
-        tstNextInt(10);
-        tstNextInt(1<<8);
-        tstNextInt((1<<8)+1);
-        tstNextInt((1<<8)-1);
-        tstNextInt(1<<30);
-        tstNextInt((1<<30)-1);
-        tstNextInt((1<<30)+1);
-        Random rnd = new Random();
-        for(int i=0;i<10;i++){
-            tstNextInt(rnd.nextInt(Integer.MAX_VALUE));
-        }
-    }
-
-    public void testNextLongBound(){
-        tstNextLong(Integer.MAX_VALUE-1);
-        tstNextLong(Integer.MAX_VALUE);
-        tstNextLong((long)Integer.MAX_VALUE+1);
-        tstNextLong(Long.MAX_VALUE/1024);
-        tstNextLong(Long.MAX_VALUE/920);
-        tstNextLong(Long.MAX_VALUE/1000);
-        tstNextLong(Long.MAX_VALUE/512);
-        tstNextLong(Long.MAX_VALUE/64);
-        tstNextLong(Long.MAX_VALUE-1);
-        tstNextLong(Long.MAX_VALUE);
-        Random rnd = new Random();
-        for(int i=0;i<10;i++){
-            tstNextLong(rnd.nextInt(Integer.MAX_VALUE));
-        }
-        for(int i=0;i<10;i++){
-            tstNextLong(rnd.nextLong() & 0x7fffffffffffffffL);
-        }
-    }
-
     /**
      * Computes Chi-Square statistic given observed and expected counts
      * @param observed array of observed frequency counts
@@ -456,3 +339,4 @@
     }           
 
 }
+



Mime
View raw message