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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.35 by jsr166, Tue Oct 19 00:43:49 2010 UTC vs.
Revision 1.39 by jsr166, Wed Nov 3 16:46:34 2010 UTC

# Line 393 | Line 393 | public class ArrayBlockingQueueTest exte
393      }
394  
395      /**
396 –     * take blocks interruptibly when empty
397 –     */
398 –    public void testTakeFromEmpty() throws InterruptedException {
399 –        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
400 –        Thread t = new ThreadShouldThrow(InterruptedException.class) {
401 –            public void realRun() throws InterruptedException {
402 –                q.take();
403 –            }};
404 –
405 –        t.start();
406 –        Thread.sleep(SHORT_DELAY_MS);
407 –        t.interrupt();
408 –        t.join();
409 –    }
410 –
411 –    /**
396       * Take removes existing elements until empty, then blocks interruptibly
397       */
398      public void testBlockingTake() throws InterruptedException {
# Line 443 | Line 427 | public class ArrayBlockingQueueTest exte
427      }
428  
429      /**
430 <     * timed pool with zero timeout succeeds when non-empty, else times out
430 >     * timed poll with zero timeout succeeds when non-empty, else times out
431       */
432      public void testTimedPoll0() throws InterruptedException {
433          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 454 | Line 438 | public class ArrayBlockingQueueTest exte
438      }
439  
440      /**
441 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
441 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
442       */
443      public void testTimedPoll() throws InterruptedException {
444          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 644 | Line 628 | public class ArrayBlockingQueueTest exte
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          ArrayBlockingQueue 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          ArrayBlockingQueue 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      }

Diff Legend

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