--- jsr166/src/test/tck/RecursiveActionTest.java	2011/06/25 06:54:53	1.35
+++ jsr166/src/test/tck/RecursiveActionTest.java	2015/02/22 19:16:38	1.43
@@ -4,20 +4,22 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.RecursiveAction;
+import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import java.util.Arrays;
-import java.util.HashSet;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class RecursiveActionTest extends JSR166TestCase {
 
@@ -173,7 +175,7 @@ public class RecursiveActionTest extends
         final int number;
         int result;
         FibAction(int n) { number = n; }
-        public void realCompute() {
+        protected void realCompute() {
             int n = number;
             if (n <= 1)
                 result = n;
@@ -211,7 +213,7 @@ public class RecursiveActionTest extends
      */
     public void testInvoke() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertNull(f.invoke());
                 assertEquals(21, f.result);
@@ -227,7 +229,7 @@ public class RecursiveActionTest extends
      */
     public void testQuietlyInvoke() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 f.quietlyInvoke();
                 assertEquals(21, f.result);
@@ -241,7 +243,7 @@ public class RecursiveActionTest extends
      */
     public void testForkJoin() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 assertNull(f.join());
@@ -256,7 +258,7 @@ public class RecursiveActionTest extends
      */
     public void testJoinIgnoresInterrupts() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 final Thread myself = Thread.currentThread();
 
@@ -336,7 +338,7 @@ public class RecursiveActionTest extends
         final SynchronousQueue<FibAction[]> sq =
             new SynchronousQueue<FibAction[]>();
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws InterruptedException {
+            protected void realCompute() throws InterruptedException {
                 FibAction[] fibActions = new FibAction[6];
                 for (int i = 0; i < fibActions.length; i++)
                     fibActions[i] = new FibAction(8);
@@ -436,7 +438,7 @@ public class RecursiveActionTest extends
      */
     public void testForkGet() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 assertNull(f.get());
@@ -451,7 +453,7 @@ public class RecursiveActionTest extends
      */
     public void testForkTimedGet() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 assertNull(f.get(5L, SECONDS));
@@ -466,7 +468,7 @@ public class RecursiveActionTest extends
      */
     public void testForkTimedGetNPE() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 try {
@@ -482,7 +484,7 @@ public class RecursiveActionTest extends
      */
     public void testForkQuietlyJoin() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 f.quietlyJoin();
@@ -498,10 +500,12 @@ public class RecursiveActionTest extends
      */
     public void testForkHelpQuiesce() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 helpQuiesce();
+                while (!f.isDone()) // wait out race
+                    ;
                 assertEquals(21, f.result);
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f);
@@ -514,7 +518,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalInvoke() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction f = new FailingFibAction(8);
                 try {
                     f.invoke();
@@ -531,7 +535,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalQuietlyInvoke() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction f = new FailingFibAction(8);
                 f.quietlyInvoke();
                 assertTrue(f.getException() instanceof FJException);
@@ -545,7 +549,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalForkJoin() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction f = new FailingFibAction(8);
                 assertSame(f, f.fork());
                 try {
@@ -563,7 +567,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalForkGet() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FailingFibAction f = new FailingFibAction(8);
                 assertSame(f, f.fork());
                 try {
@@ -583,11 +587,11 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalForkTimedGet() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FailingFibAction f = new FailingFibAction(8);
                 assertSame(f, f.fork());
                 try {
-                    f.get(5L, TimeUnit.SECONDS);
+                    f.get(5L, SECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();
@@ -603,7 +607,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalForkQuietlyJoin() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction f = new FailingFibAction(8);
                 assertSame(f, f.fork());
                 f.quietlyJoin();
@@ -618,7 +622,7 @@ public class RecursiveActionTest extends
      */
     public void testCancelledInvoke() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertTrue(f.cancel(true));
                 try {
@@ -636,7 +640,7 @@ public class RecursiveActionTest extends
      */
     public void testCancelledForkJoin() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
@@ -655,7 +659,7 @@ public class RecursiveActionTest extends
      */
     public void testCancelledForkGet() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FibAction f = new FibAction(8);
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
@@ -674,7 +678,7 @@ public class RecursiveActionTest extends
      */
     public void testCancelledForkTimedGet() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() throws Exception {
+            protected void realCompute() throws Exception {
                 FibAction f = new FibAction(8);
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
@@ -693,7 +697,7 @@ public class RecursiveActionTest extends
      */
     public void testCancelledForkQuietlyJoin() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
@@ -709,7 +713,7 @@ public class RecursiveActionTest extends
     public void testGetPool() {
         final ForkJoinPool mainPool = mainPool();
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 assertSame(mainPool, getPool());
             }};
         testInvokeOnPool(mainPool, a);
@@ -720,7 +724,7 @@ public class RecursiveActionTest extends
      */
     public void testGetPool2() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 assertNull(getPool());
             }};
         assertNull(a.invoke());
@@ -731,7 +735,7 @@ public class RecursiveActionTest extends
      */
     public void testInForkJoinPool() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 assertTrue(inForkJoinPool());
             }};
         testInvokeOnPool(mainPool(), a);
@@ -742,7 +746,7 @@ public class RecursiveActionTest extends
      */
     public void testInForkJoinPool2() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 assertFalse(inForkJoinPool());
             }};
         assertNull(a.invoke());
@@ -754,7 +758,7 @@ public class RecursiveActionTest extends
     public void testWorkerGetPool() {
         final ForkJoinPool mainPool = mainPool();
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 ForkJoinWorkerThread w =
                     (ForkJoinWorkerThread) Thread.currentThread();
                 assertSame(mainPool, w.getPool());
@@ -768,7 +772,7 @@ public class RecursiveActionTest extends
     public void testWorkerGetPoolIndex() {
         final ForkJoinPool mainPool = mainPool();
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 ForkJoinWorkerThread w =
                     (ForkJoinWorkerThread) Thread.currentThread();
                 assertTrue(w.getPoolIndex() >= 0);
@@ -783,7 +787,7 @@ public class RecursiveActionTest extends
      */
     public void testSetRawResult() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 setRawResult(null);
                 assertNull(getRawResult());
             }};
@@ -795,7 +799,7 @@ public class RecursiveActionTest extends
      */
     public void testReinitialize() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 checkNotDone(f);
 
@@ -815,7 +819,7 @@ public class RecursiveActionTest extends
      */
     public void testReinitializeAbnormal() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction f = new FailingFibAction(8);
                 checkNotDone(f);
 
@@ -838,7 +842,7 @@ public class RecursiveActionTest extends
      */
     public void testCompleteExceptionally() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 f.completeExceptionally(new FJException());
                 try {
@@ -856,7 +860,7 @@ public class RecursiveActionTest extends
      */
     public void testComplete() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 f.complete(null);
                 assertNull(f.invoke());
@@ -871,7 +875,7 @@ public class RecursiveActionTest extends
      */
     public void testInvokeAll2() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 FibAction g = new FibAction(9);
                 invokeAll(f, g);
@@ -888,7 +892,7 @@ public class RecursiveActionTest extends
      */
     public void testInvokeAll1() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 invokeAll(f);
                 checkCompletedNormally(f);
@@ -902,7 +906,7 @@ public class RecursiveActionTest extends
      */
     public void testInvokeAll3() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 FibAction g = new FibAction(9);
                 FibAction h = new FibAction(7);
@@ -925,7 +929,7 @@ public class RecursiveActionTest extends
      */
     public void testInvokeAllCollection() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 FibAction g = new FibAction(9);
                 FibAction h = new FibAction(7);
@@ -952,7 +956,7 @@ public class RecursiveActionTest extends
      */
     public void testInvokeAllNPE() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 FibAction g = new FibAction(9);
                 FibAction h = null;
@@ -969,7 +973,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalInvokeAll2() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 FailingFibAction g = new FailingFibAction(9);
                 try {
@@ -987,7 +991,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalInvokeAll1() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction g = new FailingFibAction(9);
                 try {
                     invokeAll(g);
@@ -1004,7 +1008,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalInvokeAll3() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction f = new FibAction(8);
                 FailingFibAction g = new FailingFibAction(9);
                 FibAction h = new FibAction(7);
@@ -1023,7 +1027,7 @@ public class RecursiveActionTest extends
      */
     public void testAbnormalInvokeAllCollection() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FailingFibAction f = new FailingFibAction(8);
                 FibAction g = new FibAction(9);
                 FibAction h = new FibAction(7);
@@ -1047,7 +1051,7 @@ public class RecursiveActionTest extends
      */
     public void testTryUnfork() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1066,7 +1070,7 @@ public class RecursiveActionTest extends
      */
     public void testGetSurplusQueuedTaskCount() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction h = new FibAction(7);
                 assertSame(h, h.fork());
                 FibAction g = new FibAction(9);
@@ -1088,7 +1092,7 @@ public class RecursiveActionTest extends
      */
     public void testPeekNextLocalTask() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1109,7 +1113,7 @@ public class RecursiveActionTest extends
      */
     public void testPollNextLocalTask() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1127,7 +1131,7 @@ public class RecursiveActionTest extends
      */
     public void testPollTask() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1145,7 +1149,7 @@ public class RecursiveActionTest extends
      */
     public void testPeekNextLocalTaskAsync() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1165,7 +1169,7 @@ public class RecursiveActionTest extends
      */
     public void testPollNextLocalTaskAsync() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1184,7 +1188,7 @@ public class RecursiveActionTest extends
      */
     public void testPollTaskAsync() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 FibAction g = new FibAction(9);
                 assertSame(g, g.fork());
                 FibAction f = new FibAction(8);
@@ -1197,33 +1201,33 @@ public class RecursiveActionTest extends
         testInvokeOnPool(asyncSingletonPool(), a);
     }
 
+    /** Demo from RecursiveAction javadoc */
     static class SortTask extends RecursiveAction {
         final long[] array; final int lo, hi;
         SortTask(long[] array, int lo, int hi) {
             this.array = array; this.lo = lo; this.hi = hi;
         }
-        final static int THRESHOLD = 100;
+        SortTask(long[] array) { this(array, 0, array.length); }
         protected void compute() {
             if (hi - lo < THRESHOLD)
-                sequentiallySort(array, lo, hi);
+                sortSequentially(lo, hi);
             else {
                 int mid = (lo + hi) >>> 1;
                 invokeAll(new SortTask(array, lo, mid),
                           new SortTask(array, mid, hi));
-                merge(array, lo, mid, hi);
+                merge(lo, mid, hi);
             }
         }
-        static void sequentiallySort(long[] array, int lo, int hi) {
+        // implementation details follow:
+        static final int THRESHOLD = 100;
+        void sortSequentially(int lo, int hi) {
             Arrays.sort(array, lo, hi);
         }
-        static void merge(long[] array, int lo, int mid, int hi) {
-            int n = hi - lo;
-            long[] buf = new long[n];
-            int a = lo, b = mid;
-            for (int i = 0; i < n; i++)
-                buf[i] = (b == hi || (a < mid && array[a] < array[b])) ?
-                    array[a++] : array[b++];
-            System.arraycopy(buf, 0, array, lo, n);
+        void merge(int lo, int mid, int hi) {
+            long[] buf = Arrays.copyOfRange(array, lo, mid);
+            for (int i = 0, j = lo, k = mid; i < buf.length; j++)
+                array[j] = (k == hi || buf[i] < array[k]) ?
+                    buf[i++] : array[k++];
         }
     }
 
@@ -1236,8 +1240,7 @@ public class RecursiveActionTest extends
         for (int i = 0; i < array.length; i++)
             array[i] = rnd.nextLong();
         long[] arrayClone = array.clone();
-        testInvokeOnPool(mainPool(),
-                         new SortTask(array, 0, array.length));
+        testInvokeOnPool(mainPool(), new SortTask(array));
         Arrays.sort(arrayClone);
         assertTrue(Arrays.equals(array, arrayClone));
     }