--- jsr166/src/test/tck/DelayQueueTest.java	2009/11/21 21:00:34	1.23
+++ jsr166/src/test/tck/DelayQueueTest.java	2009/11/22 00:17:37	1.25
@@ -375,8 +375,8 @@ public class DelayQueueTest extends JSR1
             public void realRun() throws InterruptedException {
                 q.put(new PDelay(0));
                 q.put(new PDelay(0));
-                threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
-                threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
+                assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
+                assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
             }});
 
         t.start();
@@ -415,14 +415,17 @@ public class DelayQueueTest extends JSR1
      * Take removes existing elements until empty, then blocks interruptibly
      */
     public void testBlockingTake() throws InterruptedException {
-        Thread t = new ThreadShouldThrow(InterruptedException.class) {
+        final DelayQueue q = populatedQueue(SIZE);
+        Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                DelayQueue q = populatedQueue(SIZE);
                 for (int i = 0; i < SIZE; ++i) {
-                    threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
+                    assertEquals(new PDelay(i), ((PDelay)q.take()));
                 }
-                q.take();
-            }};
+                try {
+                    q.take();
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+            }});
 
         t.start();
         Thread.sleep(SHORT_DELAY_MS);