--- jsr166/src/test/tck/ThreadLocalRandomTest.java	2011/06/03 21:36:55	1.11
+++ jsr166/src/test/tck/ThreadLocalRandomTest.java	2013/08/16 07:07:01	1.16
@@ -7,6 +7,7 @@ import junit.framework.*;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class ThreadLocalRandomTest extends JSR166TestCase {
@@ -18,7 +19,7 @@ public class ThreadLocalRandomTest exten
         return new TestSuite(ThreadLocalRandomTest.class);
     }
 
-    /**
+    /*
      * Testing coverage notes:
      *
      * We don't test randomness properties, but only that repeated
@@ -27,15 +28,18 @@ public class ThreadLocalRandomTest exten
      * across multiples of primes.
      */
 
-    //
+    // max numbers of calls to detect getting stuck on one value
     static final int NCALLS = 10000;
 
     // max sampled int bound
     static final int MAX_INT_BOUND = (1 << 28);
 
-    // Max sampled long bound
+    // max sampled long bound
     static final long MAX_LONG_BOUND = (1L << 42);
 
+    // Number of replications for other checks
+    static final int REPS = 20;
+
     /**
      * setSeed throws UnsupportedOperationException
      */
@@ -47,7 +51,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * Repeated calls to nextInt produce at least one different result
+     * Repeated calls to nextInt produce at least two distinct results
      */
     public void testNextInt() {
         int f = ThreadLocalRandom.current().nextInt();
@@ -58,7 +62,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * Repeated calls to nextLong produce at least one different result
+     * Repeated calls to nextLong produce at least two distinct results
      */
     public void testNextLong() {
         long f = ThreadLocalRandom.current().nextLong();
@@ -69,7 +73,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * Repeated calls to nextBoolean produce at least one different result
+     * Repeated calls to nextBoolean produce at least two distinct results
      */
     public void testNextBoolean() {
         boolean f = ThreadLocalRandom.current().nextBoolean();
@@ -80,7 +84,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * Repeated calls to nextFloat produce at least one different result
+     * Repeated calls to nextFloat produce at least two distinct results
      */
     public void testNextFloat() {
         float f = ThreadLocalRandom.current().nextFloat();
@@ -91,18 +95,18 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * Repeated calls to nextDouble produce at least one different result
+     * Repeated calls to nextDouble produce at least two distinct results
      */
     public void testNextDouble() {
         double f = ThreadLocalRandom.current().nextDouble();
-        double i = 0;
+        int i = 0;
         while (i < NCALLS && ThreadLocalRandom.current().nextDouble() == f)
             ++i;
         assertTrue(i < NCALLS);
     }
 
     /**
-     * Repeated calls to nextGaussian produce at least one different result
+     * Repeated calls to nextGaussian produce at least two distinct results
      */
     public void testNextGaussian() {
         double f = ThreadLocalRandom.current().nextGaussian();
@@ -113,7 +117,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * nextInt(negative) throws IllegalArgumentException;
+     * nextInt(negative) throws IllegalArgumentException
      */
     public void testNextIntBoundedNeg() {
         try {
@@ -123,7 +127,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * nextInt(least >= bound) throws IllegalArgumentException;
+     * nextInt(least >= bound) throws IllegalArgumentException
      */
     public void testNextIntBadBounds() {
         try {
@@ -134,7 +138,7 @@ public class ThreadLocalRandomTest exten
 
     /**
      * nextInt(bound) returns 0 <= value < bound;
-     * repeated calls produce at least one different result
+     * repeated calls produce at least two distinct results
      */
     public void testNextIntBounded() {
         // sample bound space across prime number increments
@@ -154,7 +158,7 @@ public class ThreadLocalRandomTest exten
 
     /**
      * nextInt(least, bound) returns least <= value < bound;
-     * repeated calls produce at least one different result
+     * repeated calls produce at least two distinct results
      */
     public void testNextIntBounded2() {
         for (int least = -15485863; least < MAX_INT_BOUND; least += 524959) {
@@ -174,7 +178,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * nextLong(negative) throws IllegalArgumentException;
+     * nextLong(negative) throws IllegalArgumentException
      */
     public void testNextLongBoundedNeg() {
         try {
@@ -184,7 +188,7 @@ public class ThreadLocalRandomTest exten
     }
 
     /**
-     * nextLong(least >= bound) throws IllegalArgumentException;
+     * nextLong(least >= bound) throws IllegalArgumentException
      */
     public void testNextLongBadBounds() {
         try {
@@ -195,7 +199,7 @@ public class ThreadLocalRandomTest exten
 
     /**
      * nextLong(bound) returns 0 <= value < bound;
-     * repeated calls produce at least one different result
+     * repeated calls produce at least two distinct results
      */
     public void testNextLongBounded() {
         for (long bound = 2; bound < MAX_LONG_BOUND; bound += 15485863) {
@@ -214,7 +218,7 @@ public class ThreadLocalRandomTest exten
 
     /**
      * nextLong(least, bound) returns least <= value < bound;
-     * repeated calls produce at least one different result
+     * repeated calls produce at least two distinct results
      */
     public void testNextLongBounded2() {
         for (long least = -86028121; least < MAX_LONG_BOUND; least += 982451653L) {
@@ -235,7 +239,7 @@ public class ThreadLocalRandomTest exten
 
     /**
      * nextDouble(least, bound) returns least <= value < bound;
-     * repeated calls produce at least one different result
+     * repeated calls produce at least two distinct results
      */
     public void testNextDoubleBounded2() {
         for (double least = 0.0001; least < 1.0e20; least *= 8) {
@@ -271,7 +275,8 @@ public class ThreadLocalRandomTest exten
             public void realRun() {
                 ThreadLocalRandom current = ThreadLocalRandom.current();
                 assertSame(current, ThreadLocalRandom.current());
-                assertNotSame(current, threadLocalRandom.get());
+                // test bug: the following is not guaranteed and not true in JDK8
+                //                assertNotSame(current, threadLocalRandom.get());
                 rand.set(current.nextLong());
                 threadLocalRandom.set(current);
             }};