--- jsr166/src/test/tck/JSR166TestCase.java	2011/05/30 22:53:21	1.87
+++ jsr166/src/test/tck/JSR166TestCase.java	2011/06/22 07:46:57	1.90
@@ -528,6 +528,28 @@ public class JSR166TestCase extends Test
     }
 
     /**
+     * Checks that the threads do not terminate within the default
+     * millisecond delay of {@code timeoutMillis()}.
+     */
+    void assertThreadsStayAlive(Thread... threads) {
+        assertThreadsStayAlive(timeoutMillis(), threads);
+    }
+
+    /**
+     * Checks that the threads do not terminate within the given millisecond delay.
+     */
+    void assertThreadsStayAlive(long millis, Thread... threads) {
+        try {
+            // No need to optimize the failing case via Thread.join.
+            delay(millis);
+            for (Thread thread : threads)
+                assertTrue(thread.isAlive());
+        } catch (InterruptedException ie) {
+            fail("Unexpected InterruptedException");
+        }
+    }
+
+    /**
      * Checks that future.get times out, with the default timeout of
      * {@code timeoutMillis()}.
      */
@@ -690,12 +712,11 @@ public class JSR166TestCase extends Test
     }
 
     /**
-     * Waits up to the specified number of milliseconds for the given
+     * Spin-waits up to the specified number of milliseconds for the given
      * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
      */
     void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
-        long timeoutNanos = timeoutMillis * 1000L * 1000L;
-        long t0 = System.nanoTime();
+        long startTime = System.nanoTime();
         for (;;) {
             Thread.State s = thread.getState();
             if (s == Thread.State.BLOCKED ||
@@ -704,7 +725,7 @@ public class JSR166TestCase extends Test
                 return;
             else if (s == Thread.State.TERMINATED)
                 fail("Unexpected thread termination");
-            else if (System.nanoTime() - t0 > timeoutNanos) {
+            else if (millisElapsedSince(startTime) > timeoutMillis) {
                 threadAssertTrue(thread.isAlive());
                 return;
             }
@@ -903,6 +924,14 @@ public class JSR166TestCase extends Test
         } catch (Throwable t) {
             threadUnexpectedException(t);
         }
+    }
+
+    public void await(Semaphore semaphore) {
+        try {
+            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
+        } catch (Throwable t) {
+            threadUnexpectedException(t);
+        }
     }
 
 //     /**