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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.2 by dl, Sun Sep 7 20:39:11 2003 UTC vs.
Revision 1.87 by jsr166, Wed Jan 27 02:55:18 2021 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 < import java.io.*;
13 <
14 < public class PriorityBlockingQueueTest extends TestCase {
15 <
16 <    private static final int N = 10;
17 <    private static final long SHORT_DELAY_MS = 100;
18 <    private static final long MEDIUM_DELAY_MS = 1000;
19 <    private static final long LONG_DELAY_MS = 10000;
20 <    private static final int NOCAP = Integer.MAX_VALUE;
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.Comparator;
15 > import java.util.Iterator;
16 > import java.util.NoSuchElementException;
17 > import java.util.Queue;
18 > import java.util.concurrent.BlockingQueue;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.PriorityBlockingQueue;
23 > import java.util.concurrent.ThreadLocalRandom;
24 >
25 > import junit.framework.Test;
26 >
27 > public class PriorityBlockingQueueTest extends JSR166TestCase {
28 >
29 >    public static class Generic extends BlockingQueueTest {
30 >        protected BlockingQueue emptyCollection() {
31 >            return new PriorityBlockingQueue();
32 >        }
33 >    }
34 >
35 >    public static class InitialCapacity extends BlockingQueueTest {
36 >        protected BlockingQueue emptyCollection() {
37 >            ThreadLocalRandom rnd = ThreadLocalRandom.current();
38 >            int initialCapacity = rnd.nextInt(1, SIZE);
39 >            return new PriorityBlockingQueue(initialCapacity);
40 >        }
41 >    }
42  
43      public static void main(String[] args) {
44 <        junit.textui.TestRunner.run (suite());  
44 >        main(suite(), args);
45      }
46  
47      public static Test suite() {
48 <        return new TestSuite(PriorityBlockingQueueTest.class);
48 >        class Implementation implements CollectionImplementation {
49 >            public Class<?> klazz() { return PriorityBlockingQueue.class; }
50 >            public Collection emptyCollection() {
51 >                return new PriorityBlockingQueue();
52 >            }
53 >            public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
54 >            public boolean isConcurrent() { return true; }
55 >            public boolean permitsNulls() { return false; }
56 >        }
57 >        class ComparatorImplementation implements CollectionImplementation {
58 >            public Class<?> klazz() { return PriorityBlockingQueue.class; }
59 >            @SuppressWarnings("unchecked")
60 >            public Collection emptyCollection() {
61 >                ThreadLocalRandom rnd = ThreadLocalRandom.current();
62 >                int initialCapacity = rnd.nextInt(1, 10);
63 >                return new PriorityBlockingQueue(
64 >                    initialCapacity, new MyReverseComparator());
65 >            }
66 >            public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
67 >            public boolean isConcurrent() { return true; }
68 >            public boolean permitsNulls() { return false; }
69 >        }
70 >        return newTestSuite(
71 >            PriorityBlockingQueueTest.class,
72 >            new Generic().testSuite(),
73 >            new InitialCapacity().testSuite(),
74 >            CollectionTest.testSuite(new Implementation()),
75 >            CollectionTest.testSuite(new ComparatorImplementation()));
76      }
77  
78 <    static class MyReverseComparator implements Comparator {
78 >    /** Sample Comparator */
79 >    static class MyReverseComparator implements Comparator, java.io.Serializable {
80 >        @SuppressWarnings("unchecked")
81          public int compare(Object x, Object y) {
82 <            int i = ((Integer)x).intValue();
32 <            int j = ((Integer)y).intValue();
33 <            if (i < j) return 1;
34 <            if (i > j) return -1;
35 <            return 0;
82 >            return ((Comparable)y).compareTo(x);
83          }
84      }
85  
39
86      /**
87 <     * Create a queue of given size containing consecutive
88 <     * Integers 0 ... n.
87 >     * Returns a new queue of given size containing consecutive
88 >     * Items 0 ... n - 1.
89       */
90 <    private PriorityBlockingQueue fullQueue(int n) {
91 <        PriorityBlockingQueue q = new PriorityBlockingQueue(n);
90 >    private static PriorityBlockingQueue<Item> populatedQueue(int n) {
91 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(n);
92          assertTrue(q.isEmpty());
93 <        for(int i = n-1; i >= 0; i-=2)
94 <            assertTrue(q.offer(new Integer(i)));
95 <        for(int i = (n & 1); i < n; i+=2)
96 <            assertTrue(q.offer(new Integer(i)));
93 >        for (int i = n - 1; i >= 0; i -= 2)
94 >            mustOffer(q, i);
95 >        for (int i = (n & 1); i < n; i += 2)
96 >            mustOffer(q, i);
97          assertFalse(q.isEmpty());
98 <        assertEquals(NOCAP, q.remainingCapacity());
99 <        assertEquals(n, q.size());
98 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
99 >        mustEqual(n, q.size());
100 >        mustEqual(0, q.peek());
101          return q;
102      }
103 <
104 <    public void testConstructor1(){
105 <        assertEquals(NOCAP, new PriorityBlockingQueue(N).remainingCapacity());
103 >
104 >    /**
105 >     * A new queue has unbounded capacity
106 >     */
107 >    public void testConstructor1() {
108 >        mustEqual(Integer.MAX_VALUE,
109 >                     new PriorityBlockingQueue<Item>(SIZE).remainingCapacity());
110      }
111  
112 <    public void testConstructor2(){
112 >    /**
113 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
114 >     */
115 >    public void testConstructor2() {
116          try {
117 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
118 <            fail("Cannot make zero-sized");
119 <        }
66 <        catch (IllegalArgumentException success) {}
117 >            new PriorityBlockingQueue<Item>(0);
118 >            shouldThrow();
119 >        } catch (IllegalArgumentException success) {}
120      }
121  
122 <    public void testConstructor3(){
123 <
122 >    /**
123 >     * Initializing from null Collection throws NPE
124 >     */
125 >    public void testConstructor3() {
126          try {
127 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
128 <            fail("Cannot make from null collection");
129 <        }
75 <        catch (NullPointerException success) {}
127 >            new PriorityBlockingQueue<Item>(null);
128 >            shouldThrow();
129 >        } catch (NullPointerException success) {}
130      }
131  
132 <    public void testConstructor4(){
132 >    /**
133 >     * Initializing from Collection of null elements throws NPE
134 >     */
135 >    public void testConstructor4() {
136 >        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
137          try {
138 <            Integer[] ints = new Integer[N];
139 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
140 <            fail("Cannot make with null elements");
83 <        }
84 <        catch (NullPointerException success) {}
138 >            new PriorityBlockingQueue<Item>(elements);
139 >            shouldThrow();
140 >        } catch (NullPointerException success) {}
141      }
142  
143 <    public void testConstructor5(){
144 <        try {
145 <            Integer[] ints = new Integer[N];
146 <            for (int i = 0; i < N-1; ++i)
147 <                ints[i] = new Integer(i);
148 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
149 <            fail("Cannot make with null elements");
150 <        }
151 <        catch (NullPointerException success) {}
143 >    /**
144 >     * Initializing from Collection with some null elements throws NPE
145 >     */
146 >    public void testConstructor5() {
147 >        Item[] items = new Item[2]; items[0] = zero;
148 >        Collection<Item> elements = Arrays.asList(items);
149 >        try {
150 >            new PriorityBlockingQueue<Item>(elements);
151 >            shouldThrow();
152 >        } catch (NullPointerException success) {}
153      }
154  
155 <    public void testConstructor6(){
156 <        try {
157 <            Integer[] ints = new Integer[N];
158 <            for (int i = 0; i < N; ++i)
159 <                ints[i] = new Integer(i);
160 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
161 <            for (int i = 0; i < N; ++i)
162 <                assertEquals(ints[i], q.poll());
106 <        }
107 <        finally {}
155 >    /**
156 >     * Queue contains all elements of collection used to initialize
157 >     */
158 >    public void testConstructor6() {
159 >        Item[] items = defaultItems;
160 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(Arrays.asList(items));
161 >        for (int i = 0; i < SIZE; ++i)
162 >            mustEqual(items[i], q.poll());
163      }
164  
165 <    public void testConstructor7(){
166 <        try {
167 <            PriorityBlockingQueue q = new PriorityBlockingQueue(N, new MyReverseComparator());
168 <            Integer[] ints = new Integer[N];
169 <            for (int i = 0; i < N; ++i)
170 <                ints[i] = new Integer(i);
171 <            q.addAll(Arrays.asList(ints));
172 <            for (int i = N-1; i >= 0; --i)
173 <                assertEquals(ints[i], q.poll());
174 <        }
175 <        finally {}
165 >    /**
166 >     * The comparator used in constructor is used
167 >     */
168 >    public void testConstructor7() {
169 >        MyReverseComparator cmp = new MyReverseComparator();
170 >        @SuppressWarnings("unchecked")
171 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE, cmp);
172 >        mustEqual(cmp, q.comparator());
173 >        Item[] items = defaultItems;
174 >        q.addAll(Arrays.asList(items));
175 >        for (int i = SIZE - 1; i >= 0; --i)
176 >            mustEqual(items[i], q.poll());
177      }
178  
179 +    /**
180 +     * isEmpty is true before add, false after
181 +     */
182      public void testEmpty() {
183 <        PriorityBlockingQueue q = new PriorityBlockingQueue(2);
183 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
184          assertTrue(q.isEmpty());
185 <        assertEquals(NOCAP, q.remainingCapacity());
186 <        q.add(new Integer(1));
185 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
186 >        q.add(one);
187          assertFalse(q.isEmpty());
188 <        q.add(new Integer(2));
188 >        q.add(two);
189          q.remove();
190          q.remove();
191          assertTrue(q.isEmpty());
192      }
193  
194 <    public void testRemainingCapacity(){
195 <        PriorityBlockingQueue q = fullQueue(N);
196 <        for (int i = 0; i < N; ++i) {
197 <            assertEquals(NOCAP, q.remainingCapacity());
198 <            assertEquals(N-i, q.size());
199 <            q.remove();
200 <        }
201 <        for (int i = 0; i < N; ++i) {
202 <            assertEquals(NOCAP, q.remainingCapacity());
203 <            assertEquals(i, q.size());
204 <            q.add(new Integer(i));
194 >    /**
195 >     * remainingCapacity() always returns Integer.MAX_VALUE
196 >     */
197 >    public void testRemainingCapacity() {
198 >        BlockingQueue<Item> q = populatedQueue(SIZE);
199 >        for (int i = 0; i < SIZE; ++i) {
200 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
201 >            mustEqual(SIZE - i, q.size());
202 >            mustEqual(i, q.remove());
203 >        }
204 >        for (int i = 0; i < SIZE; ++i) {
205 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
206 >            mustEqual(i, q.size());
207 >            mustAdd(q, i);
208          }
209      }
210  
211 <    public void testOfferNull(){
212 <        try {
213 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
152 <            q.offer(null);
153 <            fail("should throw NPE");
154 <        } catch (NullPointerException success) { }  
155 <    }
156 <
211 >    /**
212 >     * Offer of comparable element succeeds
213 >     */
214      public void testOffer() {
215 <        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
216 <        assertTrue(q.offer(new Integer(0)));
217 <        assertTrue(q.offer(new Integer(1)));
215 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(1);
216 >        assertTrue(q.offer(zero));
217 >        assertTrue(q.offer(one));
218      }
219  
220 +    /**
221 +     * Offer of non-Comparable throws CCE
222 +     */
223      public void testOfferNonComparable() {
224 +        PriorityBlockingQueue<Object> q = new PriorityBlockingQueue<>(1);
225          try {
165            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
166            q.offer(new Object());
167            q.offer(new Object());
226              q.offer(new Object());
227 <            fail("should throw CCE");
227 >            shouldThrow();
228 >        } catch (ClassCastException success) {
229 >            assertTrue(q.isEmpty());
230 >            mustEqual(0, q.size());
231 >            assertNull(q.poll());
232          }
171        catch(ClassCastException success) {}
233      }
234  
235 <    public void testAdd(){
236 <        PriorityBlockingQueue q = new PriorityBlockingQueue(N);
237 <        for (int i = 0; i < N; ++i) {
238 <            assertEquals(i, q.size());
239 <            assertTrue(q.add(new Integer(i)));
235 >    /**
236 >     * add of comparable succeeds
237 >     */
238 >    public void testAdd() {
239 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE);
240 >        for (int i = 0; i < SIZE; ++i) {
241 >            mustEqual(i, q.size());
242 >            mustAdd(q, i);
243          }
244      }
245  
246 <    public void testAddAll1(){
246 >    /**
247 >     * addAll(this) throws IllegalArgumentException
248 >     */
249 >    public void testAddAllSelf() {
250 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
251          try {
252 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
253 <            q.addAll(null);
254 <            fail("Cannot add null collection");
187 <        }
188 <        catch (NullPointerException success) {}
252 >            q.addAll(q);
253 >            shouldThrow();
254 >        } catch (IllegalArgumentException success) {}
255      }
256 <    public void testAddAll2(){
257 <        try {
258 <            PriorityBlockingQueue q = new PriorityBlockingQueue(N);
259 <            Integer[] ints = new Integer[N];
260 <            q.addAll(Arrays.asList(ints));
261 <            fail("Cannot add null elements");
262 <        }
263 <        catch (NullPointerException success) {}
256 >
257 >    /**
258 >     * addAll of a collection with any null elements throws NPE after
259 >     * possibly adding some elements
260 >     */
261 >    public void testAddAll3() {
262 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE);
263 >        Item[] items = new Item[2];
264 >        items[0] = zero;
265 >        try {
266 >            q.addAll(Arrays.asList(items));
267 >            shouldThrow();
268 >        } catch (NullPointerException success) {}
269      }
270 <    public void testAddAll3(){
271 <        try {
272 <            PriorityBlockingQueue q = new PriorityBlockingQueue(N);
273 <            Integer[] ints = new Integer[N];
274 <            for (int i = 0; i < N-1; ++i)
275 <                ints[i] = new Integer(i);
276 <            q.addAll(Arrays.asList(ints));
277 <            fail("Cannot add null elements");
278 <        }
279 <        catch (NullPointerException success) {}
270 >
271 >    /**
272 >     * Queue contains all elements of successful addAll
273 >     */
274 >    public void testAddAll5() {
275 >        Item[] empty = new Item[0];
276 >        Item[] items = defaultItems;
277 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE);
278 >        assertFalse(q.addAll(Arrays.asList(empty)));
279 >        assertTrue(q.addAll(Arrays.asList(items)));
280 >        for (int i = 0; i < SIZE; ++i)
281 >            mustEqual(items[i], q.poll());
282      }
283  
284 <    public void testAddAll5(){
285 <        try {
286 <            Integer[] empty = new Integer[0];
287 <            Integer[] ints = new Integer[N];
288 <            for (int i = N-1; i >= 0; --i)
289 <                ints[i] = new Integer(i);
290 <            PriorityBlockingQueue q = new PriorityBlockingQueue(N);
291 <            assertFalse(q.addAll(Arrays.asList(empty)));
292 <            assertTrue(q.addAll(Arrays.asList(ints)));
220 <            for (int i = 0; i < N; ++i)
221 <                assertEquals(ints[i], q.poll());
222 <        }
223 <        finally {}
224 <    }
225 <
226 <     public void testPutNull() {
227 <        try {
228 <            PriorityBlockingQueue q = new PriorityBlockingQueue(N);
229 <            q.put(null);
230 <            fail("put should throw NPE");
231 <        }
232 <        catch (NullPointerException success){
233 <        }  
234 <     }
235 <
236 <     public void testPut() {
237 <         try {
238 <             PriorityBlockingQueue q = new PriorityBlockingQueue(N);
239 <             for (int i = 0; i < N; ++i) {
240 <                 Integer I = new Integer(i);
241 <                 q.put(I);
242 <                 assertTrue(q.contains(I));
243 <             }
244 <             assertEquals(N, q.size());
245 <         }
246 <         finally {
284 >    /**
285 >     * all elements successfully put are contained
286 >     */
287 >    public void testPut() {
288 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE);
289 >        for (int i = 0; i < SIZE; ++i) {
290 >            Item x = itemFor(i);
291 >            q.put(x);
292 >            mustContain(q, x);
293          }
294 +        mustEqual(SIZE, q.size());
295      }
296  
297 <    public void testPutWithTake() {
298 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
299 <        Thread t = new Thread(new Runnable() {
300 <                public void run(){
301 <                    int added = 0;
302 <                    try {
303 <                        q.put(new Integer(0));
304 <                        ++added;
305 <                        q.put(new Integer(0));
306 <                        ++added;
307 <                        q.put(new Integer(0));
308 <                        ++added;
309 <                        q.put(new Integer(0));
310 <                        ++added;
311 <                        assertTrue(added == 4);
265 <                    } finally {
266 <                    }
267 <                }
268 <            });
269 <        try {
270 <            t.start();
271 <            Thread.sleep(SHORT_DELAY_MS);
272 <            q.take();
273 <            t.interrupt();
274 <            t.join();
275 <        } catch (Exception e){
276 <            fail("Unexpected exception");
277 <        }
297 >    /**
298 >     * put doesn't block waiting for take
299 >     */
300 >    public void testPutWithTake() throws InterruptedException {
301 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
302 >        final int size = 4;
303 >        Thread t = newStartedThread(new CheckedRunnable() {
304 >            public void realRun() {
305 >                for (int i = 0; i < size; i++)
306 >                    q.put(zero);
307 >            }});
308 >
309 >        awaitTermination(t);
310 >        mustEqual(size, q.size());
311 >        q.take();
312      }
313  
314 +    /**
315 +     * Queue is unbounded, so timed offer never times out
316 +     */
317      public void testTimedOffer() {
318 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
319 <        Thread t = new Thread(new Runnable() {
320 <                public void run(){
321 <                    try {
322 <                        q.put(new Integer(0));
323 <                        q.put(new Integer(0));
324 <                        assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS/2, TimeUnit.MILLISECONDS));
325 <                        assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
289 <                    } finally { }
290 <                }
291 <            });
292 <        
293 <        try {
294 <            t.start();
295 <            Thread.sleep(SHORT_DELAY_MS);
296 <            t.interrupt();
297 <            t.join();
298 <        } catch (Exception e){
299 <            fail("Unexpected exception");
300 <        }
301 <    }
318 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
319 >        Thread t = newStartedThread(new CheckedRunnable() {
320 >            public void realRun() {
321 >                q.put(one);
322 >                q.put(two);
323 >                assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
324 >                assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
325 >            }});
326  
327 <    public void testTake(){
304 <        try {
305 <            PriorityBlockingQueue q = fullQueue(N);
306 <            for (int i = 0; i < N; ++i) {
307 <                assertEquals(i, ((Integer)q.take()).intValue());
308 <            }
309 <        } catch (InterruptedException e){
310 <            fail("Unexpected exception");
311 <        }  
327 >        awaitTermination(t);
328      }
329  
330 <    public void testTakeFromEmpty() {
331 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
332 <        Thread t = new Thread(new Runnable() {
333 <                public void run(){
334 <                    try {
335 <                        q.take();
336 <                        fail("Should block");
321 <                    } catch (InterruptedException success){ }                
322 <                }
323 <            });
324 <        try {
325 <            t.start();
326 <            Thread.sleep(SHORT_DELAY_MS);
327 <            t.interrupt();
328 <            t.join();
329 <        } catch (Exception e){
330 <            fail("Unexpected exception");
330 >    /**
331 >     * take retrieves elements in priority order
332 >     */
333 >    public void testTake() throws InterruptedException {
334 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
335 >        for (int i = 0; i < SIZE; ++i) {
336 >            mustEqual(i, q.take());
337          }
338      }
339  
340 <    public void testBlockingTake(){
341 <        Thread t = new Thread(new Runnable() {
342 <                public void run() {
343 <                    try {
344 <                        PriorityBlockingQueue q = fullQueue(N);
345 <                        for (int i = 0; i < N; ++i) {
346 <                            assertEquals(i, ((Integer)q.take()).intValue());
347 <                        }
348 <                        q.take();
343 <                        fail("take should block");
344 <                    } catch (InterruptedException success){
345 <                    }  
346 <                }});
347 <        t.start();
348 <        try {
349 <           Thread.sleep(SHORT_DELAY_MS);
350 <           t.interrupt();
351 <           t.join();
352 <        }
353 <        catch (InterruptedException ie) {
354 <            fail("Unexpected exception");
355 <        }
356 <    }
340 >    /**
341 >     * Take removes existing elements until empty, then blocks interruptibly
342 >     */
343 >    public void testBlockingTake() throws InterruptedException {
344 >        final PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
345 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
346 >        Thread t = newStartedThread(new CheckedRunnable() {
347 >            public void realRun() throws InterruptedException {
348 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
349  
350 +                Thread.currentThread().interrupt();
351 +                try {
352 +                    q.take();
353 +                    shouldThrow();
354 +                } catch (InterruptedException success) {}
355 +                assertFalse(Thread.interrupted());
356  
357 <    public void testPoll(){
358 <        PriorityBlockingQueue q = fullQueue(N);
359 <        for (int i = 0; i < N; ++i) {
360 <            assertEquals(i, ((Integer)q.poll()).intValue());
361 <        }
362 <        assertNull(q.poll());
357 >                pleaseInterrupt.countDown();
358 >                try {
359 >                    q.take();
360 >                    shouldThrow();
361 >                } catch (InterruptedException success) {}
362 >                assertFalse(Thread.interrupted());
363 >            }});
364 >
365 >        await(pleaseInterrupt);
366 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
367 >        t.interrupt();
368 >        awaitTermination(t);
369      }
370  
371 <    public void testTimedPoll0() {
372 <        try {
373 <            PriorityBlockingQueue q = fullQueue(N);
374 <            for (int i = 0; i < N; ++i) {
375 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
376 <            }
377 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
378 <        } catch (InterruptedException e){
379 <            fail("Unexpected exception");
376 <        }  
371 >    /**
372 >     * poll succeeds unless empty
373 >     */
374 >    public void testPoll() {
375 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
376 >        for (int i = 0; i < SIZE; ++i) {
377 >            mustEqual(i, q.poll());
378 >        }
379 >        assertNull(q.poll());
380      }
381  
382 <    public void testTimedPoll() {
383 <        try {
384 <            PriorityBlockingQueue q = fullQueue(N);
385 <            for (int i = 0; i < N; ++i) {
386 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
387 <            }
388 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
386 <        } catch (InterruptedException e){
387 <            fail("Unexpected exception");
388 <        }  
389 <    }
390 <
391 <    public void testInterruptedTimedPoll(){
392 <        Thread t = new Thread(new Runnable() {
393 <                public void run() {
394 <                    try {
395 <                        PriorityBlockingQueue q = fullQueue(N);
396 <                        for (int i = 0; i < N; ++i) {
397 <                            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
398 <                        }
399 <                        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
400 <                    } catch (InterruptedException success){
401 <                    }  
402 <                }});
403 <        t.start();
404 <        try {
405 <           Thread.sleep(SHORT_DELAY_MS);
406 <           t.interrupt();
407 <           t.join();
408 <        }
409 <        catch (InterruptedException ie) {
410 <            fail("Unexpected exception");
382 >    /**
383 >     * timed poll with zero timeout succeeds when non-empty, else times out
384 >     */
385 >    public void testTimedPoll0() throws InterruptedException {
386 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
387 >        for (int i = 0; i < SIZE; ++i) {
388 >            mustEqual(i, q.poll(0, MILLISECONDS));
389          }
390 +        assertNull(q.poll(0, MILLISECONDS));
391      }
392  
393 <    public void testTimedPollWithOffer(){
394 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
395 <        Thread t = new Thread(new Runnable() {
396 <                public void run(){
397 <                    try {
398 <                        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
399 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
400 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
401 <                        fail("Should block");
402 <                    } catch (InterruptedException success) { }                
403 <                }
404 <            });
405 <        try {
406 <            t.start();
407 <            Thread.sleep(SHORT_DELAY_MS * 2);
429 <            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
430 <            t.interrupt();
431 <            t.join();
432 <        } catch (Exception e){
433 <            fail("Unexpected exception");
434 <        }
435 <    }  
393 >    /**
394 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
395 >     */
396 >    public void testTimedPoll() throws InterruptedException {
397 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
398 >        for (int i = 0; i < SIZE; ++i) {
399 >            long startTime = System.nanoTime();
400 >            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
401 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
402 >        }
403 >        long startTime = System.nanoTime();
404 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
405 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
406 >        checkEmpty(q);
407 >    }
408  
409 +    /**
410 +     * Interrupted timed poll throws InterruptedException instead of
411 +     * returning timeout status
412 +     */
413 +    public void testInterruptedTimedPoll() throws InterruptedException {
414 +        final BlockingQueue<Item> q = populatedQueue(SIZE);
415 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
416 +        Thread t = newStartedThread(new CheckedRunnable() {
417 +            public void realRun() throws InterruptedException {
418 +                for (int i = 0; i < SIZE; i++)
419 +                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
420  
421 <    public void testPeek(){
422 <        PriorityBlockingQueue q = fullQueue(N);
423 <        for (int i = 0; i < N; ++i) {
424 <            assertEquals(i, ((Integer)q.peek()).intValue());
425 <            q.poll();
421 >                Thread.currentThread().interrupt();
422 >                try {
423 >                    q.poll(randomTimeout(), randomTimeUnit());
424 >                    shouldThrow();
425 >                } catch (InterruptedException success) {}
426 >                assertFalse(Thread.interrupted());
427 >
428 >                pleaseInterrupt.countDown();
429 >                try {
430 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
431 >                    shouldThrow();
432 >                } catch (InterruptedException success) {}
433 >                assertFalse(Thread.interrupted());
434 >            }});
435 >
436 >        await(pleaseInterrupt);
437 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
438 >        t.interrupt();
439 >        awaitTermination(t);
440 >    }
441 >
442 >    /**
443 >     * peek returns next element, or null if empty
444 >     */
445 >    public void testPeek() {
446 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
447 >        for (int i = 0; i < SIZE; ++i) {
448 >            mustEqual(i, q.peek());
449 >            mustEqual(i, q.poll());
450              assertTrue(q.peek() == null ||
451 <                       i != ((Integer)q.peek()).intValue());
451 >                       !q.peek().equals(i));
452          }
453 <        assertNull(q.peek());
453 >        assertNull(q.peek());
454      }
455  
456 <    public void testElement(){
457 <        PriorityBlockingQueue q = fullQueue(N);
458 <        for (int i = 0; i < N; ++i) {
459 <            assertEquals(i, ((Integer)q.element()).intValue());
460 <            q.poll();
456 >    /**
457 >     * element returns next element, or throws NSEE if empty
458 >     */
459 >    public void testElement() {
460 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
461 >        for (int i = 0; i < SIZE; ++i) {
462 >            mustEqual(i, q.element());
463 >            mustEqual(i, q.poll());
464          }
465          try {
466              q.element();
467 <            fail("no such element");
468 <        }
459 <        catch (NoSuchElementException success) {}
467 >            shouldThrow();
468 >        } catch (NoSuchElementException success) {}
469      }
470  
471 <    public void testRemove(){
472 <        PriorityBlockingQueue q = fullQueue(N);
473 <        for (int i = 0; i < N; ++i) {
474 <            assertEquals(i, ((Integer)q.remove()).intValue());
471 >    /**
472 >     * remove removes next element, or throws NSEE if empty
473 >     */
474 >    public void testRemove() {
475 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
476 >        for (int i = 0; i < SIZE; ++i) {
477 >            mustEqual(i, q.remove());
478          }
479          try {
480              q.remove();
481 <            fail("remove should throw");
482 <        } catch (NoSuchElementException success){
471 <        }  
481 >            shouldThrow();
482 >        } catch (NoSuchElementException success) {}
483      }
484  
485 <    public void testRemoveElement(){
486 <        PriorityBlockingQueue q = fullQueue(N);
487 <        for (int i = 1; i < N; i+=2) {
488 <            assertTrue(q.remove(new Integer(i)));
489 <        }
490 <        for (int i = 0; i < N; i+=2) {
491 <            assertTrue(q.remove(new Integer(i)));
481 <            assertFalse(q.remove(new Integer(i+1)));
482 <        }
483 <        assertTrue(q.isEmpty());
484 <    }
485 <        
486 <    public void testContains(){
487 <        PriorityBlockingQueue q = fullQueue(N);
488 <        for (int i = 0; i < N; ++i) {
489 <            assertTrue(q.contains(new Integer(i)));
485 >    /**
486 >     * contains(x) reports true when elements added but not yet removed
487 >     */
488 >    public void testContains() {
489 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
490 >        for (int i = 0; i < SIZE; ++i) {
491 >            mustContain(q, i);
492              q.poll();
493 <            assertFalse(q.contains(new Integer(i)));
493 >            mustNotContain(q, i);
494          }
495      }
496  
497 <    public void testClear(){
498 <        PriorityBlockingQueue q = fullQueue(N);
497 >    /**
498 >     * clear removes all elements
499 >     */
500 >    public void testClear() {
501 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
502          q.clear();
503          assertTrue(q.isEmpty());
504 <        assertEquals(0, q.size());
505 <        assertEquals(NOCAP, q.remainingCapacity());
501 <        q.add(new Integer(1));
504 >        mustEqual(0, q.size());
505 >        q.add(one);
506          assertFalse(q.isEmpty());
507 +        mustContain(q, one);
508          q.clear();
509          assertTrue(q.isEmpty());
510      }
511  
512 <    public void testContainsAll(){
513 <        PriorityBlockingQueue q = fullQueue(N);
514 <        PriorityBlockingQueue p = new PriorityBlockingQueue(N);
515 <        for (int i = 0; i < N; ++i) {
512 >    /**
513 >     * containsAll(c) is true when c contains a subset of elements
514 >     */
515 >    public void testContainsAll() {
516 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
517 >        PriorityBlockingQueue<Item> p = new PriorityBlockingQueue<>(SIZE);
518 >        for (int i = 0; i < SIZE; ++i) {
519              assertTrue(q.containsAll(p));
520              assertFalse(p.containsAll(q));
521 <            p.add(new Integer(i));
521 >            mustAdd(p, i);
522          }
523          assertTrue(p.containsAll(q));
524      }
525  
526 <    public void testRetainAll(){
527 <        PriorityBlockingQueue q = fullQueue(N);
528 <        PriorityBlockingQueue p = fullQueue(N);
529 <        for (int i = 0; i < N; ++i) {
526 >    /**
527 >     * retainAll(c) retains only those elements of c and reports true if changed
528 >     */
529 >    public void testRetainAll() {
530 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
531 >        PriorityBlockingQueue<Item> p = populatedQueue(SIZE);
532 >        for (int i = 0; i < SIZE; ++i) {
533              boolean changed = q.retainAll(p);
534              if (i == 0)
535                  assertFalse(changed);
# Line 526 | Line 537 | public class PriorityBlockingQueueTest e
537                  assertTrue(changed);
538  
539              assertTrue(q.containsAll(p));
540 <            assertEquals(N-i, q.size());
540 >            mustEqual(SIZE - i, q.size());
541              p.remove();
542          }
543      }
544  
545 <    public void testRemoveAll(){
546 <        for (int i = 1; i < N; ++i) {
547 <            PriorityBlockingQueue q = fullQueue(N);
548 <            PriorityBlockingQueue p = fullQueue(i);
545 >    /**
546 >     * removeAll(c) removes only those elements of c and reports true if changed
547 >     */
548 >    public void testRemoveAll() {
549 >        for (int i = 1; i < SIZE; ++i) {
550 >            PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
551 >            PriorityBlockingQueue<Item> p = populatedQueue(i);
552              assertTrue(q.removeAll(p));
553 <            assertEquals(N-i, q.size());
553 >            mustEqual(SIZE - i, q.size());
554              for (int j = 0; j < i; ++j) {
555 <                Integer I = (Integer)(p.remove());
556 <                assertFalse(q.contains(I));
555 >                Item x = p.remove();
556 >                mustNotContain(q, x);
557              }
558          }
559      }
560  
561 <    public void testToArray(){
562 <        PriorityBlockingQueue q = fullQueue(N);
563 <        Object[] o = q.toArray();
564 <        Arrays.sort(o);
565 <        try {
566 <        for(int i = 0; i < o.length; i++)
567 <            assertEquals(o[i], q.take());
568 <        } catch (InterruptedException e){
569 <            fail("Unexpected exception");
570 <        }    
571 <    }
572 <
573 <    public void testToArray2(){
574 <        PriorityBlockingQueue q = fullQueue(N);
575 <        Integer[] ints = new Integer[N];
576 <        ints = (Integer[])q.toArray(ints);
577 <        Arrays.sort(ints);
578 <        try {
579 <            for(int i = 0; i < ints.length; i++)
580 <                assertEquals(ints[i], q.take());
581 <        } catch (InterruptedException e){
582 <            fail("Unexpected exception");
583 <        }    
584 <    }
585 <    
586 <    public void testIterator(){
573 <        PriorityBlockingQueue q = fullQueue(N);
574 <        int i = 0;
575 <        Iterator it = q.iterator();
576 <        while(it.hasNext()) {
577 <            assertTrue(q.contains(it.next()));
578 <            ++i;
579 <        }
580 <        assertEquals(i, N);
581 <    }
582 <
583 <    public void testIteratorRemove () {
584 <
585 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
586 <
587 <        q.add(new Integer(2));
588 <        q.add(new Integer(1));
589 <        q.add(new Integer(3));
561 >    /**
562 >     * toArray contains all elements
563 >     */
564 >    public void testToArray() throws InterruptedException {
565 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
566 >        Object[] a = q.toArray();
567 >        assertSame(Object[].class, a.getClass());
568 >        Arrays.sort(a);
569 >        for (Object o : a)
570 >            assertSame(o, q.take());
571 >        assertTrue(q.isEmpty());
572 >    }
573 >
574 >    /**
575 >     * toArray(a) contains all elements
576 >     */
577 >    public void testToArray2() throws InterruptedException {
578 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
579 >        Item[] items = new Item[SIZE];
580 >        Item[] array = q.toArray(items);
581 >        assertSame(items, array);
582 >        Arrays.sort(items);
583 >        for (Item o : items)
584 >            assertSame(o, q.take());
585 >        assertTrue(q.isEmpty());
586 >    }
587  
588 <        Iterator it = q.iterator();
588 >    /**
589 >     * toArray(incompatible array type) throws ArrayStoreException
590 >     */
591 >    @SuppressWarnings("CollectionToArraySafeParameter")
592 >    public void testToArray_incompatibleArrayType() {
593 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
594 >        try {
595 >            q.toArray(new String[10]);
596 >            shouldThrow();
597 >        } catch (ArrayStoreException success) {}
598 >    }
599 >
600 >    /**
601 >     * iterator iterates through all elements
602 >     */
603 >    public void testIterator() {
604 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
605 >        Iterator<? extends Item> it = q.iterator();
606 >        int i;
607 >        for (i = 0; it.hasNext(); i++)
608 >            mustContain(q, it.next());
609 >        mustEqual(i, SIZE);
610 >        assertIteratorExhausted(it);
611 >    }
612 >
613 >    /**
614 >     * iterator of empty collection has no elements
615 >     */
616 >    public void testEmptyIterator() {
617 >        assertIteratorExhausted(new PriorityBlockingQueue<>().iterator());
618 >    }
619 >
620 >    /**
621 >     * iterator.remove removes current element
622 >     */
623 >    public void testIteratorRemove() {
624 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(3);
625 >        q.add(two);
626 >        q.add(one);
627 >        q.add(three);
628 >
629 >        Iterator<? extends Item> it = q.iterator();
630          it.next();
631          it.remove();
632  
633          it = q.iterator();
634 <        assertEquals(it.next(), new Integer(2));
635 <        assertEquals(it.next(), new Integer(3));
634 >        mustEqual(it.next(), two);
635 >        mustEqual(it.next(), three);
636          assertFalse(it.hasNext());
637      }
638  
639 <
640 <    public void testToString(){
641 <        PriorityBlockingQueue q = fullQueue(N);
639 >    /**
640 >     * toString contains toStrings of elements
641 >     */
642 >    public void testToString() {
643 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
644          String s = q.toString();
645 <        for (int i = 0; i < N; ++i) {
646 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
645 >        for (int i = 0; i < SIZE; ++i) {
646 >            assertTrue(s.contains(String.valueOf(i)));
647          }
648 <    }        
648 >    }
649  
650 +    /**
651 +     * timed poll transfers elements across Executor tasks
652 +     */
653      public void testPollInExecutor() {
654 +        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
655 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
656 +        final ExecutorService executor = Executors.newFixedThreadPool(2);
657 +        try (PoolCleaner cleaner = cleaner(executor)) {
658 +            executor.execute(new CheckedRunnable() {
659 +                public void realRun() throws InterruptedException {
660 +                    assertNull(q.poll());
661 +                    threadsStarted.await();
662 +                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
663 +                    checkEmpty(q);
664 +                }});
665  
666 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
666 >            executor.execute(new CheckedRunnable() {
667 >                public void realRun() throws InterruptedException {
668 >                    threadsStarted.await();
669 >                    q.put(one);
670 >                }});
671 >        }
672 >    }
673  
674 <        ExecutorService executor = Executors.newFixedThreadPool(2);
674 >    /**
675 >     * A deserialized/reserialized queue has same elements
676 >     */
677 >    public void testSerialization() throws Exception {
678 >        Queue<Item> x = populatedQueue(SIZE);
679 >        Queue<Item> y = serialClone(x);
680 >
681 >        assertNotSame(x, y);
682 >        mustEqual(x.size(), y.size());
683 >        while (!x.isEmpty()) {
684 >            assertFalse(y.isEmpty());
685 >            mustEqual(x.remove(), y.remove());
686 >        }
687 >        assertTrue(y.isEmpty());
688 >    }
689  
690 <        executor.execute(new Runnable() {
691 <            public void run() {
692 <                assertNull("poll should fail", q.poll());
693 <                try {
694 <                    assertTrue(null != q.poll(MEDIUM_DELAY_MS * 2, TimeUnit.MILLISECONDS));
695 <                    assertTrue(q.isEmpty());
696 <                }
697 <                catch (InterruptedException e) {
698 <                    fail("should not be interrupted");
699 <                }
700 <            }
701 <        });
690 >    /**
691 >     * drainTo(c) empties queue into another collection c
692 >     */
693 >    public void testDrainTo() {
694 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
695 >        ArrayList<Item> l = new ArrayList<>();
696 >        q.drainTo(l);
697 >        mustEqual(0, q.size());
698 >        mustEqual(SIZE, l.size());
699 >        for (int i = 0; i < SIZE; ++i)
700 >            mustEqual(l.get(i), i);
701 >        q.add(zero);
702 >        q.add(one);
703 >        assertFalse(q.isEmpty());
704 >        mustContain(q, one);
705 >        l.clear();
706 >        q.drainTo(l);
707 >        mustEqual(0, q.size());
708 >        mustEqual(2, l.size());
709 >        for (int i = 0; i < 2; ++i)
710 >            mustEqual(l.get(i), i);
711 >    }
712  
713 <        executor.execute(new Runnable() {
714 <            public void run() {
715 <                try {
716 <                    Thread.sleep(MEDIUM_DELAY_MS);
717 <                    q.put(new Integer(1));
718 <                }
719 <                catch (InterruptedException e) {
720 <                    fail("should not be interrupted");
721 <                }
638 <            }
639 <        });
640 <        
641 <        executor.shutdown();
713 >    /**
714 >     * drainTo empties queue
715 >     */
716 >    public void testDrainToWithActivePut() throws InterruptedException {
717 >        final PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
718 >        Thread t = new Thread(new CheckedRunnable() {
719 >            public void realRun() {
720 >                q.put(new Item(SIZE + 1));
721 >            }});
722  
723 +        t.start();
724 +        ArrayList<Item> l = new ArrayList<>();
725 +        q.drainTo(l);
726 +        assertTrue(l.size() >= SIZE);
727 +        for (int i = 0; i < SIZE; ++i)
728 +            mustEqual(l.get(i), i);
729 +        t.join();
730 +        assertTrue(q.size() + l.size() >= SIZE);
731      }
732  
733 <    public void testSerialization() {
734 <        PriorityBlockingQueue q = fullQueue(N);
735 <        try {
736 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
737 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
738 <            out.writeObject(q);
739 <            out.close();
740 <
741 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
742 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
743 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
744 <            assertEquals(q.size(), r.size());
745 <            while (!q.isEmpty())
746 <                assertEquals(q.remove(), r.remove());
747 <        } catch(Exception e){
748 <            fail("unexpected exception");
733 >    /**
734 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
735 >     */
736 >    public void testDrainToN() {
737 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE * 2);
738 >        for (int i = 0; i < SIZE + 2; ++i) {
739 >            for (int j = 0; j < SIZE; j++)
740 >                mustOffer(q, j);
741 >            ArrayList<Item> l = new ArrayList<>();
742 >            q.drainTo(l, i);
743 >            int k = (i < SIZE) ? i : SIZE;
744 >            mustEqual(k, l.size());
745 >            mustEqual(SIZE - k, q.size());
746 >            for (int j = 0; j < k; ++j)
747 >                mustEqual(l.get(j), j);
748 >            do {} while (q.poll() != null);
749 >        }
750 >    }
751 >
752 >    /**
753 >     * remove(null), contains(null) always return false
754 >     */
755 >    public void testNeverContainsNull() {
756 >        Collection<?>[] qs = {
757 >            new PriorityBlockingQueue<>(),
758 >            populatedQueue(2),
759 >        };
760 >
761 >        for (Collection<?> q : qs) {
762 >            assertFalse(q.contains(null));
763 >            assertFalse(q.remove(null));
764          }
765      }
766  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines