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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.35 by jsr166, Fri Oct 29 07:27:26 2010 UTC vs.
Revision 1.38 by jsr166, Thu Nov 4 01:04:54 2010 UTC

# Line 550 | Line 550 | public class LinkedTransferQueueTest ext
550      }
551  
552      /**
553 <     * toArray() contains all elements
553 >     * toArray() contains all elements in FIFO order
554       */
555 <    public void testToArray() throws InterruptedException {
555 >    public void testToArray() {
556          LinkedTransferQueue q = populatedQueue(SIZE);
557          Object[] o = q.toArray();
558          for (int i = 0; i < o.length; i++) {
559 <            assertEquals(o[i], q.take());
559 >            assertSame(o[i], q.poll());
560          }
561      }
562  
563      /**
564 <     * toArray(a) contains all elements
564 >     * toArray(a) contains all elements in FIFO order
565       */
566 <    public void testToArray2() throws InterruptedException {
566 >    public void testToArray2() {
567          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
568          Integer[] ints = new Integer[SIZE];
569 <        ints = q.toArray(ints);
569 >        assertSame(ints, q.toArray(ints));
570          for (int i = 0; i < ints.length; i++) {
571 <            assertEquals(ints[i], q.take());
571 >            assertSame(ints[i], q.poll());
572          }
573      }
574  
575      /**
576       * toArray(null) throws NullPointerException
577       */
578 <    public void testToArray_BadArg() {
578 >    public void testToArray_NullArg() {
579          LinkedTransferQueue q = populatedQueue(SIZE);
580          try {
581 <            Object o[] = q.toArray(null);
581 >            q.toArray(null);
582              shouldThrow();
583          } catch (NullPointerException success) {}
584      }
585  
586      /**
587 <     * toArray(incompatible array type) throws CCE
587 >     * toArray(incompatible array type) throws ArrayStoreException
588       */
589      public void testToArray1_BadArg() {
590          LinkedTransferQueue q = populatedQueue(SIZE);
591          try {
592 <            Object o[] = q.toArray(new String[10]);
592 >            q.toArray(new String[10]);
593              shouldThrow();
594          } catch (ArrayStoreException success) {}
595      }

Diff Legend

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