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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.30 by jsr166, Tue Oct 19 00:41:14 2010 UTC vs.
Revision 1.35 by jsr166, Wed Nov 3 16:46:34 2010 UTC

# Line 381 | Line 381 | public class LinkedBlockingQueueTest ext
381      }
382  
383      /**
384 –     * take blocks interruptibly when empty
385 –     */
386 –    public void testTakeFromEmpty() throws InterruptedException {
387 –        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
388 –        Thread t = new ThreadShouldThrow(InterruptedException.class) {
389 –            public void realRun() throws InterruptedException {
390 –                q.take();
391 –            }};
392 –
393 –        t.start();
394 –        Thread.sleep(SHORT_DELAY_MS);
395 –        t.interrupt();
396 –        t.join();
397 –    }
398 –
399 –    /**
384       * Take removes existing elements until empty, then blocks interruptibly
385       */
386      public void testBlockingTake() throws InterruptedException {
# Line 430 | Line 414 | public class LinkedBlockingQueueTest ext
414      }
415  
416      /**
417 <     * timed pool with zero timeout succeeds when non-empty, else times out
417 >     * timed poll with zero timeout succeeds when non-empty, else times out
418       */
419      public void testTimedPoll0() throws InterruptedException {
420          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 441 | Line 425 | public class LinkedBlockingQueueTest ext
425      }
426  
427      /**
428 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
428 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
429       */
430      public void testTimedPoll() throws InterruptedException {
431          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 644 | Line 628 | public class LinkedBlockingQueueTest ext
628      }
629  
630      /**
631 <     * toArray(null) throws NPE
631 >     * toArray(null) throws NullPointerException
632       */
633 <    public void testToArray_BadArg() {
633 >    public void testToArray_NullArg() {
634          LinkedBlockingQueue q = populatedQueue(SIZE);
635          try {
636 <            Object o[] = q.toArray(null);
636 >            q.toArray(null);
637              shouldThrow();
638          } catch (NullPointerException success) {}
639      }
640  
641      /**
642 <     * toArray with incompatible array type throws CCE
642 >     * toArray(incompatible array type) throws ArrayStoreException
643       */
644      public void testToArray1_BadArg() {
645          LinkedBlockingQueue q = populatedQueue(SIZE);
646          try {
647 <            Object o[] = q.toArray(new String[10]);
647 >            q.toArray(new String[10]);
648              shouldThrow();
649          } catch (ArrayStoreException success) {}
650      }
# Line 904 | Line 888 | public class LinkedBlockingQueueTest ext
888                  assertTrue(q.offer(new Integer(j)));
889              ArrayList l = new ArrayList();
890              q.drainTo(l, i);
891 <            int k = (i < SIZE)? i : SIZE;
891 >            int k = (i < SIZE) ? i : SIZE;
892              assertEquals(l.size(), k);
893              assertEquals(q.size(), SIZE-k);
894              for (int j = 0; j < k; ++j)

Diff Legend

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