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.24 by jsr166, Sat Nov 21 22:00:46 2009 UTC vs.
Revision 1.27 by jsr166, Tue Dec 1 06:03:49 2009 UTC

# 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);
# Line 519 | Line 522 | public class DelayQueueTest extends JSR1
522          DelayQueue q = populatedQueue(SIZE);
523          for (int i = 0; i < SIZE; ++i) {
524              assertEquals(new PDelay(i), ((PDelay)q.peek()));
525 <            q.poll();
525 >            assertEquals(new PDelay(i), ((PDelay)q.poll()));
526              if (q.isEmpty())
527                  assertNull(q.peek());
528              else
529 <                assertTrue(i != ((PDelay)q.peek()).intValue());
529 >                assertFalse(new PDelay(i).equals(q.peek()));
530          }
531          assertNull(q.peek());
532      }
# Line 678 | Line 681 | public class DelayQueueTest extends JSR1
681       * toArray(null) throws NPE
682       */
683      public void testToArray_BadArg() {
684 +        DelayQueue q = populatedQueue(SIZE);
685          try {
682 –            DelayQueue q = populatedQueue(SIZE);
686              Object o[] = q.toArray(null);
687              shouldThrow();
688          } catch (NullPointerException success) {}
# Line 689 | Line 692 | public class DelayQueueTest extends JSR1
692       * toArray with incompatible array type throws CCE
693       */
694      public void testToArray1_BadArg() {
695 +        DelayQueue q = populatedQueue(SIZE);
696          try {
697 <            DelayQueue q = populatedQueue(SIZE);
694 <            Object o[] = q.toArray(new String[10] );
697 >            Object o[] = q.toArray(new String[10]);
698              shouldThrow();
699          } catch (ArrayStoreException success) {}
700      }
# Line 747 | Line 750 | public class DelayQueueTest extends JSR1
750          ExecutorService executor = Executors.newFixedThreadPool(2);
751          executor.execute(new CheckedRunnable() {
752              public void realRun() throws InterruptedException {
753 <                threadAssertNull(q.poll());
754 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
755 <                threadAssertTrue(q.isEmpty());
753 >                assertNull(q.poll());
754 >                assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
755 >                assertTrue(q.isEmpty());
756              }});
757  
758          executor.execute(new CheckedRunnable() {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines