--- jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/06 05:22:25	1.107
+++ jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/06 05:30:44	1.108
@@ -115,7 +115,7 @@ public class ThreadPoolExecutorTest exte
                     assertEquals(1, p.getActiveCount());
                     await(done);
                 }});
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertEquals(1, p.getActiveCount());
             done.countDown();
         }
@@ -387,7 +387,7 @@ public class ThreadPoolExecutorTest exte
                     assertEquals(1, p.getPoolSize());
                     await(done);
                 }});
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertEquals(1, p.getPoolSize());
         }
     }
@@ -411,7 +411,7 @@ public class ThreadPoolExecutorTest exte
                     threadStarted.countDown();
                     await(done);
                 }});
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertEquals(1, p.getTaskCount());
             assertEquals(0, p.getCompletedTaskCount());
             for (int i = 0; i < TASKS; i++) {
@@ -495,7 +495,7 @@ public class ThreadPoolExecutorTest exte
                     threadStarted.countDown();
                     await(done);
                 }});
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertFalse(p.isTerminating());
             done.countDown();
             try { p.shutdown(); } catch (SecurityException ok) { return; }
@@ -523,7 +523,7 @@ public class ThreadPoolExecutorTest exte
                     threadStarted.countDown();
                     await(done);
                 }});
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertFalse(p.isTerminating());
             done.countDown();
             try { p.shutdown(); } catch (SecurityException ok) { return; }
@@ -557,7 +557,7 @@ public class ThreadPoolExecutorTest exte
                 tasks[i] = new FutureTask(task);
                 p.execute(tasks[i]);
             }
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertSame(q, p.getQueue());
             assertFalse(q.contains(tasks[0]));
             assertTrue(q.contains(tasks[tasks.length - 1]));
@@ -587,7 +587,7 @@ public class ThreadPoolExecutorTest exte
                     }};
                 p.execute(tasks[i]);
             }
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertFalse(p.remove(tasks[0]));
             assertTrue(q.contains(tasks[4]));
             assertTrue(q.contains(tasks[3]));
@@ -624,7 +624,7 @@ public class ThreadPoolExecutorTest exte
                 tasks[i] = new FutureTask(task);
                 p.execute(tasks[i]);
             }
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertEquals(tasks.length, p.getTaskCount());
             assertEquals(tasks.length - 1, q.size());
             assertEquals(1L, p.getActiveCount());
@@ -2044,7 +2044,7 @@ public class ThreadPoolExecutorTest exte
                 }};
                 futures.add(e.submit(r));
             }
-            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(blockerStarted);
             for (Future<?> future : futures) future.cancel(false);
             for (Future<?> future : futures) {
                 try {