--- jsr166/src/test/tck/JSR166TestCase.java	2005/05/20 16:30:17	1.28
+++ jsr166/src/test/tck/JSR166TestCase.java	2009/07/31 23:53:23	1.34
@@ -108,6 +108,13 @@ public class JSR166TestCase extends Test
     public static Test suite ( ) {
         TestSuite suite = new TestSuite("JSR166 Unit Tests");
 
+        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
+        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
+        suite.addTest(new TestSuite(RecursiveActionTest.class));
+        suite.addTest(new TestSuite(RecursiveTaskTest.class));
+        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
+        suite.addTest(new TestSuite(PhaserTest.class));
+        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
         suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
         suite.addTest(new TestSuite(AbstractQueueTest.class));
         suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
@@ -137,6 +144,7 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(CountDownLatchTest.class));
         suite.addTest(new TestSuite(CyclicBarrierTest.class));
         suite.addTest(new TestSuite(DelayQueueTest.class));
+        suite.addTest(new TestSuite(EntryTest.class));
         suite.addTest(new TestSuite(ExchangerTest.class));
         suite.addTest(new TestSuite(ExecutorsTest.class));
         suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
@@ -280,8 +288,13 @@ public class JSR166TestCase extends Test
      * threadFail with message "should throw exception"
      */
     public void threadShouldThrow() {
-        threadFailed = true;
-        fail("should throw exception");
+        try {
+            threadFailed = true;
+            fail("should throw exception");
+        } catch (AssertionFailedError e) {
+            e.printStackTrace();
+            throw e;
+        }
     }
 
     /**
@@ -292,6 +305,14 @@ public class JSR166TestCase extends Test
         fail("Unexpected exception");
     }
 
+    /**
+     * threadFail with message "Unexpected exception", with argument
+     */
+    public void threadUnexpectedException(Throwable ex) {
+        threadFailed = true;
+        ex.printStackTrace();
+        fail("Unexpected exception: " + ex);
+    }
 
     /**
      * Wait out termination of a thread pool or fail doing so
@@ -300,9 +321,9 @@ public class JSR166TestCase extends Test
         try {
             exec.shutdown();
             assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
-        } catch(SecurityException ok) {
+        } catch (SecurityException ok) {
             // Allowed in case test doesn't have privs
-        } catch(InterruptedException ie) {
+        } catch (InterruptedException ie) {
             fail("Unexpected exception");
         }
     }
@@ -345,6 +366,7 @@ public class JSR166TestCase extends Test
     static final Integer m3  = new Integer(-3);
     static final Integer m4 = new Integer(-4);
     static final Integer m5 = new Integer(-5);
+    static final Integer m6 = new Integer(-6);
     static final Integer m10 = new Integer(-10);
 
 
@@ -399,8 +421,8 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(SHORT_DELAY_MS);
             }
-            catch(Exception e) {
-                threadUnexpectedException();
+            catch (Exception e) {
+                threadUnexpectedException(e);
             }
         }
     }
@@ -411,7 +433,7 @@ public class JSR166TestCase extends Test
                 Thread.sleep(SHORT_DELAY_MS);
                 threadShouldThrow();
             }
-            catch(InterruptedException success) {
+            catch (InterruptedException success) {
             }
         }
     }
@@ -421,8 +443,8 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(SMALL_DELAY_MS);
             }
-            catch(Exception e) {
-                threadUnexpectedException();
+            catch (Exception e) {
+                threadUnexpectedException(e);
             }
         }
     }
@@ -432,7 +454,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(SMALL_DELAY_MS);
             }
-            catch(Exception e) {
+            catch (Exception e) {
             }
         }
     }
@@ -442,8 +464,8 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(SMALL_DELAY_MS);
             }
-            catch(Exception e) {
-                threadUnexpectedException();
+            catch (Exception e) {
+                threadUnexpectedException(e);
             }
             return Boolean.TRUE;
         }
@@ -455,7 +477,7 @@ public class JSR166TestCase extends Test
                 Thread.sleep(SMALL_DELAY_MS);
                 threadShouldThrow();
             }
-            catch(InterruptedException success) {
+            catch (InterruptedException success) {
             }
         }
     }
@@ -466,8 +488,8 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(MEDIUM_DELAY_MS);
             }
-            catch(Exception e) {
-                threadUnexpectedException();
+            catch (Exception e) {
+                threadUnexpectedException(e);
             }
         }
     }
@@ -478,7 +500,7 @@ public class JSR166TestCase extends Test
                 Thread.sleep(MEDIUM_DELAY_MS);
                 threadShouldThrow();
             }
-            catch(InterruptedException success) {
+            catch (InterruptedException success) {
             }
         }
     }
@@ -488,7 +510,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(MEDIUM_DELAY_MS);
             }
-            catch(InterruptedException success) {
+            catch (InterruptedException success) {
             }
         }
     }
@@ -498,7 +520,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(LONG_DELAY_MS);
             }
-            catch(InterruptedException success) {
+            catch (InterruptedException success) {
             }
         }
     }
@@ -506,8 +528,8 @@ public class JSR166TestCase extends Test
     /**
      * For use as ThreadFactory in constructors
      */
-    static class SimpleThreadFactory implements ThreadFactory{
-        public Thread newThread(Runnable r){
+    static class SimpleThreadFactory implements ThreadFactory {
+        public Thread newThread(Runnable r) {
             return new Thread(r);
         }
     }
@@ -518,7 +540,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(SMALL_DELAY_MS);
                 done = true;
-            } catch(Exception e){
+            } catch (Exception e) {
             }
         }
     }
@@ -529,7 +551,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(MEDIUM_DELAY_MS);
                 done = true;
-            } catch(Exception e){
+            } catch (Exception e) {
             }
         }
     }
@@ -540,7 +562,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(LONG_DELAY_MS);
                 done = true;
-            } catch(Exception e){
+            } catch (Exception e) {
             }
         }
     }
@@ -558,7 +580,7 @@ public class JSR166TestCase extends Test
             try {
                 Thread.sleep(SMALL_DELAY_MS);
                 done = true;
-            } catch(Exception e){
+            } catch (Exception e) {
             }
             return Boolean.TRUE;
         }
@@ -568,7 +590,7 @@ public class JSR166TestCase extends Test
     /**
      * For use as RejectedExecutionHandler in constructors
      */
-    static class NoOpREHandler implements RejectedExecutionHandler{
+    static class NoOpREHandler implements RejectedExecutionHandler {
         public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
     }