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.52 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.57 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.Arrays;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 >
11   import java.util.ArrayList;
12 + import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.Iterator;
15   import java.util.NoSuchElementException;
16   import java.util.Queue;
17   import java.util.concurrent.BlockingQueue;
18   import java.util.concurrent.CountDownLatch;
18 – import java.util.concurrent.LinkedBlockingQueue;
19   import java.util.concurrent.Executors;
20   import java.util.concurrent.ExecutorService;
21 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 > import java.util.concurrent.LinkedBlockingQueue;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingQueueTest extends JSR166TestCase {
26  
# Line 245 | Line 247 | public class LinkedBlockingQueueTest ext
247      public void testPut() throws InterruptedException {
248          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
249          for (int i = 0; i < SIZE; ++i) {
250 <            Integer I = new Integer(i);
251 <            q.put(I);
252 <            assertTrue(q.contains(I));
250 >            Integer x = new Integer(i);
251 >            q.put(x);
252 >            assertTrue(q.contains(x));
253          }
254          assertEquals(0, q.remainingCapacity());
255      }
# Line 587 | Line 589 | public class LinkedBlockingQueueTest ext
589              assertTrue(q.removeAll(p));
590              assertEquals(SIZE-i, q.size());
591              for (int j = 0; j < i; ++j) {
592 <                Integer I = (Integer)(p.remove());
593 <                assertFalse(q.contains(I));
592 >                Integer x = (Integer)(p.remove());
593 >                assertFalse(q.contains(x));
594              }
595          }
596      }
# Line 632 | Line 634 | public class LinkedBlockingQueueTest ext
634      public void testIterator() throws InterruptedException {
635          LinkedBlockingQueue q = populatedQueue(SIZE);
636          Iterator it = q.iterator();
637 <        while (it.hasNext()) {
637 >        int i;
638 >        for (i = 0; it.hasNext(); i++)
639 >            assertTrue(q.contains(it.next()));
640 >        assertEquals(i, SIZE);
641 >        assertIteratorExhausted(it);
642 >
643 >        it = q.iterator();
644 >        for (i = 0; it.hasNext(); i++)
645              assertEquals(it.next(), q.take());
646 <        }
646 >        assertEquals(i, SIZE);
647 >        assertIteratorExhausted(it);
648 >    }
649 >
650 >    /**
651 >     * iterator of empty collection has no elements
652 >     */
653 >    public void testEmptyIterator() {
654 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
655      }
656  
657      /**
# Line 825 | Line 842 | public class LinkedBlockingQueueTest ext
842              assertEquals(SIZE-k, q.size());
843              for (int j = 0; j < k; ++j)
844                  assertEquals(l.get(j), new Integer(j));
845 <            while (q.poll() != null) ;
845 >            do {} while (q.poll() != null);
846 >        }
847 >    }
848 >
849 >    /**
850 >     * remove(null), contains(null) always return false
851 >     */
852 >    public void testNeverContainsNull() {
853 >        Collection<?>[] qs = {
854 >            new LinkedBlockingQueue<Object>(),
855 >            populatedQueue(2),
856 >        };
857 >
858 >        for (Collection<?> q : qs) {
859 >            assertFalse(q.contains(null));
860 >            assertFalse(q.remove(null));
861          }
862      }
863  

Diff Legend

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