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.32 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.36 by jsr166, Thu Nov 4 01:04:54 2010 UTC

# Line 414 | 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 425 | 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 607 | Line 607 | public class LinkedBlockingQueueTest ext
607      }
608  
609      /**
610 <     * toArray contains all elements
610 >     * toArray contains all elements in FIFO order
611       */
612 <    public void testToArray() throws InterruptedException {
612 >    public void testToArray() {
613          LinkedBlockingQueue q = populatedQueue(SIZE);
614          Object[] o = q.toArray();
615          for (int i = 0; i < o.length; i++)
616 <            assertEquals(o[i], q.take());
616 >            assertSame(o[i], q.poll());
617      }
618  
619      /**
620 <     * toArray(a) contains all elements
620 >     * toArray(a) contains all elements in FIFO order
621       */
622      public void testToArray2() throws InterruptedException {
623          LinkedBlockingQueue q = populatedQueue(SIZE);
624          Integer[] ints = new Integer[SIZE];
625 <        ints = (Integer[])q.toArray(ints);
625 >        assertSame(ints, q.toArray(ints));
626          for (int i = 0; i < ints.length; i++)
627 <            assertEquals(ints[i], q.take());
627 >            assertSame(ints[i], q.poll());
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      }

Diff Legend

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