--- jsr166/src/test/tck/ThreadPoolExecutorTest.java	2011/05/29 07:01:17	1.45
+++ jsr166/src/test/tck/ThreadPoolExecutorTest.java	2013/05/20 16:51:56	1.48
@@ -6,10 +6,10 @@
  * Pat Fisher, Mike Judd.
  */
 
+import junit.framework.*;
 import java.util.concurrent.*;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import java.util.concurrent.atomic.*;
-import junit.framework.*;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import java.util.*;
 
 public class ThreadPoolExecutorTest extends JSR166TestCase {
@@ -402,6 +402,36 @@ public class ThreadPoolExecutorTest exte
     }
 
     /**
+     * awaitTermination on a non-shutdown pool times out
+     */
+    public void testAwaitTermination_timesOut() throws InterruptedException {
+        final ThreadPoolExecutor p =
+            new ThreadPoolExecutor(1, 1,
+                                   LONG_DELAY_MS, MILLISECONDS,
+                                   new ArrayBlockingQueue<Runnable>(10));
+        assertFalse(p.isTerminated());
+        assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
+        assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
+        assertFalse(p.awaitTermination(-1L, NANOSECONDS));
+        assertFalse(p.awaitTermination(-1L, MILLISECONDS));
+        assertFalse(p.awaitTermination(0L, NANOSECONDS));
+        assertFalse(p.awaitTermination(0L, MILLISECONDS));
+        long timeoutNanos = 999999L;
+        long startTime = System.nanoTime();
+        assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
+        assertTrue(System.nanoTime() - startTime >= timeoutNanos);
+        assertFalse(p.isTerminated());
+        startTime = System.nanoTime();
+        long timeoutMillis = timeoutMillis();
+        assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
+        assertFalse(p.isTerminated());
+        p.shutdown();
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(p.isTerminated());
+    }
+
+    /**
      * isTerminated is false before termination, true after
      */
     public void testIsTerminated() throws InterruptedException {
@@ -1977,7 +2007,7 @@ public class ThreadPoolExecutorTest exte
             // enough time to run all tasks
             assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
         } finally {
-            p.shutdown();
+            joinPool(p);
         }
     }