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.55 by jsr166, Wed Dec 31 19:05:43 2014 UTC vs.
Revision 1.58 by jsr166, Sat Feb 28 19:59:23 2015 UTC

# Line 115 | Line 115 | public class LinkedTransferQueueTest ext
115       * remainingCapacity() always returns Integer.MAX_VALUE
116       */
117      public void testRemainingCapacity() {
118 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
118 >        BlockingQueue q = populatedQueue(SIZE);
119          for (int i = 0; i < SIZE; ++i) {
120              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
121              assertEquals(SIZE - i, q.size());
122 <            q.remove();
122 >            assertEquals(i, q.remove());
123          }
124          for (int i = 0; i < SIZE; ++i) {
125              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
126              assertEquals(i, q.size());
127 <            q.add(i);
127 >            assertTrue(q.add(i));
128          }
129      }
130  
# Line 500 | Line 500 | public class LinkedTransferQueueTest ext
500      public void testIterator() throws InterruptedException {
501          LinkedTransferQueue q = populatedQueue(SIZE);
502          Iterator it = q.iterator();
503 <        int i = 0;
504 <        while (it.hasNext()) {
505 <            assertEquals(it.next(), i++);
506 <        }
503 >        int i;
504 >        for (i = 0; it.hasNext(); i++)
505 >            assertTrue(q.contains(it.next()));
506 >        assertEquals(i, SIZE);
507 >        assertIteratorExhausted(it);
508 >
509 >        it = q.iterator();
510 >        for (i = 0; it.hasNext(); i++)
511 >            assertEquals(it.next(), q.take());
512          assertEquals(i, SIZE);
513 +        assertIteratorExhausted(it);
514 +    }
515 +
516 +    /**
517 +     * iterator of empty collection has no elements
518 +     */
519 +    public void testEmptyIterator() {
520 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
521      }
522  
523      /**
# Line 697 | Line 710 | public class LinkedTransferQueueTest ext
710              assertEquals(SIZE - k, q.size());
711              for (int j = 0; j < k; ++j)
712                  assertEquals(j, l.get(j));
713 <            while (q.poll() != null)
701 <                ;
713 >            do {} while (q.poll() != null);
714          }
715      }
716  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines