ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/DelayQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.23 by jsr166, Sat Nov 21 21:00:34 2009 UTC vs.
Revision 1.25 by jsr166, Sun Nov 22 00:17:37 2009 UTC

# Line 375 | Line 375 | public class DelayQueueTest extends JSR1
375              public void realRun() throws InterruptedException {
376                  q.put(new PDelay(0));
377                  q.put(new PDelay(0));
378 <                threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
379 <                threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
378 >                assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
379 >                assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
380              }});
381  
382          t.start();
# Line 415 | Line 415 | public class DelayQueueTest extends JSR1
415       * Take removes existing elements until empty, then blocks interruptibly
416       */
417      public void testBlockingTake() throws InterruptedException {
418 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
418 >        final DelayQueue q = populatedQueue(SIZE);
419 >        Thread t = new Thread(new CheckedRunnable() {
420              public void realRun() throws InterruptedException {
420                DelayQueue q = populatedQueue(SIZE);
421                  for (int i = 0; i < SIZE; ++i) {
422 <                    threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
422 >                    assertEquals(new PDelay(i), ((PDelay)q.take()));
423                  }
424 <                q.take();
425 <            }};
424 >                try {
425 >                    q.take();
426 >                    shouldThrow();
427 >                } catch (InterruptedException success) {}
428 >            }});
429  
430          t.start();
431          Thread.sleep(SHORT_DELAY_MS);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines