--- jsr166/src/test/tck/RecursiveActionTest.java	2011/06/27 02:47:32	1.37
+++ jsr166/src/test/tck/RecursiveActionTest.java	2014/12/31 19:05:43	1.40
@@ -4,20 +4,23 @@
  * 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 java.util.concurrent.TimeUnit;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class RecursiveActionTest extends JSR166TestCase {
 
@@ -173,7 +176,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 +214,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 +230,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 +244,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 +259,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 +339,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 +439,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 +454,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 +469,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 +485,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,7 +501,7 @@ 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();
@@ -514,7 +517,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 +534,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 +548,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 +566,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,7 +586,7 @@ 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 {
@@ -603,7 +606,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 +621,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 +639,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 +658,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 +677,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 +696,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 +712,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 +723,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 +734,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 +745,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 +757,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 +771,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 +786,7 @@ public class RecursiveActionTest extends
      */
     public void testSetRawResult() {
         RecursiveAction a = new CheckedRecursiveAction() {
-            public void realCompute() {
+            protected void realCompute() {
                 setRawResult(null);
                 assertNull(getRawResult());
             }};
@@ -795,7 +798,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 +818,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 +841,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 +859,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 +874,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 +891,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 +905,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 +928,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 +955,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 +972,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 +990,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 +1007,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 +1026,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 +1050,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 +1069,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 +1091,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 +1112,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 +1130,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 +1148,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 +1168,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 +1187,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);
@@ -1215,7 +1218,7 @@ public class RecursiveActionTest extends
             }
         }
         // implementation details follow:
-        final static int THRESHOLD = 100;
+        static final int THRESHOLD = 100;
         void sortSequentially(int lo, int hi) {
             Arrays.sort(array, lo, hi);
         }