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.38 by jsr166, Tue Oct 19 00:41:14 2010 UTC vs.
Revision 1.44 by jsr166, Thu Nov 4 01:04:54 2010 UTC

# Line 391 | Line 391 | public class DelayQueueTest extends JSR1
391      /**
392       * take blocks interruptibly when empty
393       */
394 <    public void testTakeFromEmpty() throws InterruptedException {
395 <        final DelayQueue q = new DelayQueue();
396 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
397 <            public void realRun() throws InterruptedException {
398 <                q.take();
399 <            }};
400 <
401 <        t.start();
394 >    public void testTakeFromEmptyBlocksInterruptibly()
395 >            throws InterruptedException {
396 >        final BlockingQueue q = new DelayQueue();
397 >        final CountDownLatch threadStarted = new CountDownLatch(1);
398 >        Thread t = newStartedThread(new CheckedRunnable() {
399 >            public void realRun() {
400 >                long t0 = System.nanoTime();
401 >                threadStarted.countDown();
402 >                try {
403 >                    q.take();
404 >                    shouldThrow();
405 >                } catch (InterruptedException expected) {}
406 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
407 >            }});
408 >        threadStarted.await();
409          Thread.sleep(SHORT_DELAY_MS);
410 +        assertTrue(t.isAlive());
411          t.interrupt();
412 <        t.join();
412 >        awaitTermination(t, MEDIUM_DELAY_MS);
413 >        assertFalse(t.isAlive());
414      }
415  
416      /**
# Line 439 | Line 448 | public class DelayQueueTest extends JSR1
448      }
449  
450      /**
451 <     * timed pool with zero timeout succeeds when non-empty, else times out
451 >     * timed poll with zero timeout succeeds when non-empty, else times out
452       */
453      public void testTimedPoll0() throws InterruptedException {
454          DelayQueue q = populatedQueue(SIZE);
# Line 450 | Line 459 | public class DelayQueueTest extends JSR1
459      }
460  
461      /**
462 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
462 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
463       */
464      public void testTimedPoll() throws InterruptedException {
465          DelayQueue q = populatedQueue(SIZE);
# Line 667 | Line 676 | public class DelayQueueTest extends JSR1
676          Object[] o = q.toArray();
677          Arrays.sort(o);
678          for (int i = 0; i < o.length; i++)
679 <            assertEquals(o[i], q.take());
679 >            assertSame(o[i], q.take());
680      }
681  
682      /**
683       * toArray(a) contains all elements
684       */
685 <    public void testToArray2() throws InterruptedException {
685 >    public void testToArray2() {
686          DelayQueue q = populatedQueue(SIZE);
687          PDelay[] ints = new PDelay[SIZE];
688 <        ints = (PDelay[])q.toArray(ints);
688 >        assertSame(ints, q.toArray(ints));
689          Arrays.sort(ints);
690          for (int i = 0; i < ints.length; i++)
691 <            assertEquals(ints[i], q.take());
691 >            assertSame(ints[i], q.remove());
692      }
693  
694  
695      /**
696 <     * toArray(null) throws NPE
696 >     * toArray(null) throws NullPointerException
697       */
698 <    public void testToArray_BadArg() {
698 >    public void testToArray_NullArg() {
699          DelayQueue q = populatedQueue(SIZE);
700          try {
701 <            Object o[] = q.toArray(null);
701 >            q.toArray(null);
702              shouldThrow();
703          } catch (NullPointerException success) {}
704      }
705  
706      /**
707 <     * toArray with incompatible array type throws CCE
707 >     * toArray(incompatible array type) throws ArrayStoreException
708       */
709      public void testToArray1_BadArg() {
710          DelayQueue q = populatedQueue(SIZE);
711          try {
712 <            Object o[] = q.toArray(new String[10]);
712 >            q.toArray(new String[10]);
713              shouldThrow();
714          } catch (ArrayStoreException success) {}
715      }
# Line 917 | Line 926 | public class DelayQueueTest extends JSR1
926              DelayQueue q = populatedQueue(SIZE);
927              ArrayList l = new ArrayList();
928              q.drainTo(l, i);
929 <            int k = (i < SIZE)? i : SIZE;
929 >            int k = (i < SIZE) ? i : SIZE;
930              assertEquals(q.size(), SIZE-k);
931              assertEquals(l.size(), k);
932          }

Diff Legend

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