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.14 by jsr166, Mon Nov 16 05:30:08 2009 UTC vs.
Revision 1.87 by jsr166, Wed Jan 27 02:55:18 2021 UTC

# Line 1 | Line 1
1   /*
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/licenses/publicdomain
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.*;
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  
22    private static final int NOCAP = Integer.MAX_VALUE;
23
78      /** Sample Comparator */
79 <    static class MyReverseComparator implements 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();
28 <            int j = ((Integer)y).intValue();
29 <            if (i < j) return 1;
30 <            if (i > j) return -1;
31 <            return 0;
82 >            return ((Comparable)y).compareTo(x);
83          }
84      }
85  
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 populatedQueue(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  
# Line 53 | Line 105 | public class PriorityBlockingQueueTest e
105       * A new queue has unbounded capacity
106       */
107      public void testConstructor1() {
108 <        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
108 >        mustEqual(Integer.MAX_VALUE,
109 >                     new PriorityBlockingQueue<Item>(SIZE).remainingCapacity());
110      }
111  
112      /**
113 <     * Constructor throws IAE if  capacity argument nonpositive
113 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
114       */
115      public void testConstructor2() {
116          try {
117 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
117 >            new PriorityBlockingQueue<Item>(0);
118              shouldThrow();
119 <        }
67 <        catch (IllegalArgumentException success) {}
119 >        } catch (IllegalArgumentException success) {}
120      }
121  
122      /**
# Line 72 | Line 124 | public class PriorityBlockingQueueTest e
124       */
125      public void testConstructor3() {
126          try {
127 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
127 >            new PriorityBlockingQueue<Item>(null);
128              shouldThrow();
129 <        }
78 <        catch (NullPointerException success) {}
129 >        } catch (NullPointerException success) {}
130      }
131  
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[SIZE];
87 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
138 >            new PriorityBlockingQueue<Item>(elements);
139              shouldThrow();
140 <        }
90 <        catch (NullPointerException success) {}
140 >        } catch (NullPointerException success) {}
141      }
142  
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 <            Integer[] ints = new Integer[SIZE];
99 <            for (int i = 0; i < SIZE-1; ++i)
100 <                ints[i] = new Integer(i);
101 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
150 >            new PriorityBlockingQueue<Item>(elements);
151              shouldThrow();
152 <        }
104 <        catch (NullPointerException success) {}
152 >        } catch (NullPointerException success) {}
153      }
154  
155      /**
156       * Queue contains all elements of collection used to initialize
157       */
158      public void testConstructor6() {
159 <        try {
160 <            Integer[] ints = new Integer[SIZE];
161 <            for (int i = 0; i < SIZE; ++i)
162 <                ints[i] = new Integer(i);
115 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
116 <            for (int i = 0; i < SIZE; ++i)
117 <                assertEquals(ints[i], q.poll());
118 <        }
119 <        finally {}
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      /**
166       * The comparator used in constructor is used
167       */
168      public void testConstructor7() {
169 <        try {
170 <            MyReverseComparator cmp = new MyReverseComparator();
171 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
172 <            assertEquals(cmp, q.comparator());
173 <            Integer[] ints = new Integer[SIZE];
174 <            for (int i = 0; i < SIZE; ++i)
175 <                ints[i] = new Integer(i);
176 <            q.addAll(Arrays.asList(ints));
134 <            for (int i = SIZE-1; i >= 0; --i)
135 <                assertEquals(ints[i], q.poll());
136 <        }
137 <        finally {}
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());
185 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
186          q.add(one);
187          assertFalse(q.isEmpty());
188          q.add(two);
# Line 153 | Line 192 | public class PriorityBlockingQueueTest e
192      }
193  
194      /**
195 <     * remainingCapacity does not change when elements added or removed,
157 <     * but size does
195 >     * remainingCapacity() always returns Integer.MAX_VALUE
196       */
197      public void testRemainingCapacity() {
198 <        PriorityBlockingQueue q = populatedQueue(SIZE);
198 >        BlockingQueue<Item> q = populatedQueue(SIZE);
199          for (int i = 0; i < SIZE; ++i) {
200 <            assertEquals(NOCAP, q.remainingCapacity());
201 <            assertEquals(SIZE-i, q.size());
202 <            q.remove();
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 <            assertEquals(NOCAP, q.remainingCapacity());
206 <            assertEquals(i, q.size());
207 <            q.add(new Integer(i));
205 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
206 >            mustEqual(i, q.size());
207 >            mustAdd(q, i);
208          }
209      }
210  
211      /**
174     * offer(null) throws NPE
175     */
176    public void testOfferNull() {
177        try {
178            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
179            q.offer(null);
180            shouldThrow();
181        } catch (NullPointerException success) { }
182    }
183
184    /**
185     * add(null) throws NPE
186     */
187    public void testAddNull() {
188        try {
189            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
190            q.add(null);
191            shouldThrow();
192        } catch (NullPointerException success) { }
193    }
194
195    /**
212       * Offer of comparable element succeeds
213       */
214      public void testOffer() {
215 <        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
215 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(1);
216          assertTrue(q.offer(zero));
217          assertTrue(q.offer(one));
218      }
# Line 205 | Line 221 | public class PriorityBlockingQueueTest e
221       * Offer of non-Comparable throws CCE
222       */
223      public void testOfferNonComparable() {
224 +        PriorityBlockingQueue<Object> q = new PriorityBlockingQueue<>(1);
225          try {
209            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210            q.offer(new Object());
211            q.offer(new Object());
226              q.offer(new Object());
227              shouldThrow();
228 +        } catch (ClassCastException success) {
229 +            assertTrue(q.isEmpty());
230 +            mustEqual(0, q.size());
231 +            assertNull(q.poll());
232          }
215        catch (ClassCastException success) {}
233      }
234  
235      /**
236       * add of comparable succeeds
237       */
238      public void testAdd() {
239 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
239 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE);
240          for (int i = 0; i < SIZE; ++i) {
241 <            assertEquals(i, q.size());
242 <            assertTrue(q.add(new Integer(i)));
226 <        }
227 <    }
228 <
229 <    /**
230 <     * addAll(null) throws NPE
231 <     */
232 <    public void testAddAll1() {
233 <        try {
234 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
235 <            q.addAll(null);
236 <            shouldThrow();
241 >            mustEqual(i, q.size());
242 >            mustAdd(q, i);
243          }
238        catch (NullPointerException success) {}
244      }
245  
246      /**
247 <     * addAll(this) throws IAE
247 >     * addAll(this) throws IllegalArgumentException
248       */
249      public void testAddAllSelf() {
250 +        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
251          try {
246            PriorityBlockingQueue q = populatedQueue(SIZE);
252              q.addAll(q);
253              shouldThrow();
254 <        }
250 <        catch (IllegalArgumentException success) {}
254 >        } catch (IllegalArgumentException success) {}
255      }
256  
257      /**
254     * addAll of a collection with null elements throws NPE
255     */
256    public void testAddAll2() {
257        try {
258            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
259            Integer[] ints = new Integer[SIZE];
260            q.addAll(Arrays.asList(ints));
261            shouldThrow();
262        }
263        catch (NullPointerException success) {}
264    }
265    /**
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 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
272 <            Integer[] ints = new Integer[SIZE];
273 <            for (int i = 0; i < SIZE-1; ++i)
274 <                ints[i] = new Integer(i);
275 <            q.addAll(Arrays.asList(ints));
266 >            q.addAll(Arrays.asList(items));
267              shouldThrow();
268 <        }
278 <        catch (NullPointerException success) {}
268 >        } catch (NullPointerException success) {}
269      }
270  
271      /**
272       * Queue contains all elements of successful addAll
273       */
274      public void testAddAll5() {
275 <        try {
276 <            Integer[] empty = new Integer[0];
277 <            Integer[] ints = new Integer[SIZE];
278 <            for (int i = SIZE-1; i >= 0; --i)
279 <                ints[i] = new Integer(i);
280 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
281 <            assertFalse(q.addAll(Arrays.asList(empty)));
292 <            assertTrue(q.addAll(Arrays.asList(ints)));
293 <            for (int i = 0; i < SIZE; ++i)
294 <                assertEquals(ints[i], q.poll());
295 <        }
296 <        finally {}
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      /**
300     * put(null) throws NPE
301     */
302     public void testPutNull() {
303        try {
304            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
305            q.put(null);
306            shouldThrow();
307        }
308        catch (NullPointerException success) {
309        }
310     }
311
312    /**
285       * all elements successfully put are contained
286       */
287 <     public void testPut() {
288 <         try {
289 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
290 <             for (int i = 0; i < SIZE; ++i) {
291 <                 Integer I = new Integer(i);
292 <                 q.put(I);
321 <                 assertTrue(q.contains(I));
322 <             }
323 <             assertEquals(SIZE, q.size());
324 <         }
325 <         finally {
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      /**
298       * put doesn't block waiting for take
299       */
300 <    public void testPutWithTake() {
301 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
302 <        Thread t = new Thread(new Runnable() {
303 <                public void run() {
304 <                    int added = 0;
305 <                    try {
306 <                        q.put(new Integer(0));
307 <                        ++added;
308 <                        q.put(new Integer(0));
309 <                        ++added;
310 <                        q.put(new Integer(0));
311 <                        ++added;
344 <                        q.put(new Integer(0));
345 <                        ++added;
346 <                        threadAssertTrue(added == 4);
347 <                    } finally {
348 <                    }
349 <                }
350 <            });
351 <        try {
352 <            t.start();
353 <            Thread.sleep(SHORT_DELAY_MS);
354 <            q.take();
355 <            t.interrupt();
356 <            t.join();
357 <        } catch (Exception e) {
358 <            unexpectedException();
359 <        }
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 <     * timed offer does not time out
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 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
325 <                        threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
374 <                    } finally { }
375 <                }
376 <            });
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 <        try {
379 <            t.start();
380 <            Thread.sleep(SMALL_DELAY_MS);
381 <            t.interrupt();
382 <            t.join();
383 <        } catch (Exception e) {
384 <            unexpectedException();
385 <        }
327 >        awaitTermination(t);
328      }
329  
330      /**
331       * take retrieves elements in priority order
332       */
333 <    public void testTake() {
334 <        try {
335 <            PriorityBlockingQueue q = populatedQueue(SIZE);
336 <            for (int i = 0; i < SIZE; ++i) {
395 <                assertEquals(i, ((Integer)q.take()).intValue());
396 <            }
397 <        } catch (InterruptedException e) {
398 <            unexpectedException();
399 <        }
400 <    }
401 <
402 <    /**
403 <     * take blocks interruptibly when empty
404 <     */
405 <    public void testTakeFromEmpty() {
406 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
407 <        Thread t = new Thread(new Runnable() {
408 <                public void run() {
409 <                    try {
410 <                        q.take();
411 <                        threadShouldThrow();
412 <                    } catch (InterruptedException success) { }
413 <                }
414 <            });
415 <        try {
416 <            t.start();
417 <            Thread.sleep(SHORT_DELAY_MS);
418 <            t.interrupt();
419 <            t.join();
420 <        } catch (Exception e) {
421 <            unexpectedException();
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      /**
341       * Take removes existing elements until empty, then blocks interruptibly
342       */
343 <    public void testBlockingTake() {
344 <        Thread t = new Thread(new Runnable() {
345 <                public void run() {
346 <                    try {
347 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
348 <                        for (int i = 0; i < SIZE; ++i) {
434 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
435 <                        }
436 <                        q.take();
437 <                        threadShouldThrow();
438 <                    } catch (InterruptedException success) {
439 <                    }
440 <                }});
441 <        t.start();
442 <        try {
443 <           Thread.sleep(SHORT_DELAY_MS);
444 <           t.interrupt();
445 <           t.join();
446 <        }
447 <        catch (InterruptedException ie) {
448 <            unexpectedException();
449 <        }
450 <    }
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 +                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      /**
372       * poll succeeds unless empty
373       */
374      public void testPoll() {
375 <        PriorityBlockingQueue q = populatedQueue(SIZE);
375 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
376          for (int i = 0; i < SIZE; ++i) {
377 <            assertEquals(i, ((Integer)q.poll()).intValue());
377 >            mustEqual(i, q.poll());
378          }
379 <        assertNull(q.poll());
379 >        assertNull(q.poll());
380      }
381  
382      /**
383 <     * timed pool with zero timeout succeeds when non-empty, else times out
383 >     * timed poll with zero timeout succeeds when non-empty, else times out
384       */
385 <    public void testTimedPoll0() {
386 <        try {
387 <            PriorityBlockingQueue q = populatedQueue(SIZE);
388 <            for (int i = 0; i < SIZE; ++i) {
389 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
390 <            }
473 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474 <        } catch (InterruptedException e) {
475 <            unexpectedException();
476 <        }
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      /**
394 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
394 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
395       */
396 <    public void testTimedPoll() {
397 <        try {
398 <            PriorityBlockingQueue q = populatedQueue(SIZE);
399 <            for (int i = 0; i < SIZE; ++i) {
400 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
401 <            }
402 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
403 <        } catch (InterruptedException e) {
404 <            unexpectedException();
405 <        }
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() {
414 <        Thread t = new Thread(new Runnable() {
415 <                public void run() {
416 <                    try {
417 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
418 <                        for (int i = 0; i < SIZE; ++i) {
419 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
505 <                        }
506 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
507 <                    } catch (InterruptedException success) {
508 <                    }
509 <                }});
510 <        t.start();
511 <        try {
512 <           Thread.sleep(SHORT_DELAY_MS);
513 <           t.interrupt();
514 <           t.join();
515 <        }
516 <        catch (InterruptedException ie) {
517 <            unexpectedException();
518 <        }
519 <    }
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 <    /**
422 <     *  timed poll before a delayed offer fails; after offer succeeds;
423 <     *  on interruption throws
424 <     */
425 <    public void testTimedPollWithOffer() {
426 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
527 <        Thread t = new Thread(new Runnable() {
528 <                public void run() {
529 <                    try {
530 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
531 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
532 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
533 <                        threadShouldThrow();
534 <                    } catch (InterruptedException success) { }
535 <                }
536 <            });
537 <        try {
538 <            t.start();
539 <            Thread.sleep(SMALL_DELAY_MS);
540 <            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
541 <            t.interrupt();
542 <            t.join();
543 <        } catch (Exception e) {
544 <            unexpectedException();
545 <        }
546 <    }
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 q = populatedQueue(SIZE);
446 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
447          for (int i = 0; i < SIZE; ++i) {
448 <            assertEquals(i, ((Integer)q.peek()).intValue());
449 <            q.poll();
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      /**
457       * element returns next element, or throws NSEE if empty
458       */
459      public void testElement() {
460 <        PriorityBlockingQueue q = populatedQueue(SIZE);
460 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
461          for (int i = 0; i < SIZE; ++i) {
462 <            assertEquals(i, ((Integer)q.element()).intValue());
463 <            q.poll();
462 >            mustEqual(i, q.element());
463 >            mustEqual(i, q.poll());
464          }
465          try {
466              q.element();
467              shouldThrow();
468 <        }
576 <        catch (NoSuchElementException success) {}
468 >        } catch (NoSuchElementException success) {}
469      }
470  
471      /**
472       * remove removes next element, or throws NSEE if empty
473       */
474      public void testRemove() {
475 <        PriorityBlockingQueue q = populatedQueue(SIZE);
475 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
476          for (int i = 0; i < SIZE; ++i) {
477 <            assertEquals(i, ((Integer)q.remove()).intValue());
477 >            mustEqual(i, q.remove());
478          }
479          try {
480              q.remove();
481              shouldThrow();
482 <        } catch (NoSuchElementException success) {
591 <        }
592 <    }
593 <
594 <    /**
595 <     * remove(x) removes x and returns true if present
596 <     */
597 <    public void testRemoveElement() {
598 <        PriorityBlockingQueue q = populatedQueue(SIZE);
599 <        for (int i = 1; i < SIZE; i+=2) {
600 <            assertTrue(q.remove(new Integer(i)));
601 <        }
602 <        for (int i = 0; i < SIZE; i+=2) {
603 <            assertTrue(q.remove(new Integer(i)));
604 <            assertFalse(q.remove(new Integer(i+1)));
605 <        }
606 <        assertTrue(q.isEmpty());
482 >        } catch (NoSuchElementException success) {}
483      }
484  
485      /**
486       * contains(x) reports true when elements added but not yet removed
487       */
488      public void testContains() {
489 <        PriorityBlockingQueue q = populatedQueue(SIZE);
489 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
490          for (int i = 0; i < SIZE; ++i) {
491 <            assertTrue(q.contains(new Integer(i)));
491 >            mustContain(q, i);
492              q.poll();
493 <            assertFalse(q.contains(new Integer(i)));
493 >            mustNotContain(q, i);
494          }
495      }
496  
# Line 622 | Line 498 | public class PriorityBlockingQueueTest e
498       * clear removes all elements
499       */
500      public void testClear() {
501 <        PriorityBlockingQueue q = populatedQueue(SIZE);
501 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
502          q.clear();
503          assertTrue(q.isEmpty());
504 <        assertEquals(0, q.size());
504 >        mustEqual(0, q.size());
505          q.add(one);
506          assertFalse(q.isEmpty());
507 <        assertTrue(q.contains(one));
507 >        mustContain(q, one);
508          q.clear();
509          assertTrue(q.isEmpty());
510      }
# Line 637 | Line 513 | public class PriorityBlockingQueueTest e
513       * containsAll(c) is true when c contains a subset of elements
514       */
515      public void testContainsAll() {
516 <        PriorityBlockingQueue q = populatedQueue(SIZE);
517 <        PriorityBlockingQueue p = new PriorityBlockingQueue(SIZE);
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      }
# Line 651 | Line 527 | public class PriorityBlockingQueueTest e
527       * retainAll(c) retains only those elements of c and reports true if changed
528       */
529      public void testRetainAll() {
530 <        PriorityBlockingQueue q = populatedQueue(SIZE);
531 <        PriorityBlockingQueue p = populatedQueue(SIZE);
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)
# Line 661 | Line 537 | public class PriorityBlockingQueueTest e
537                  assertTrue(changed);
538  
539              assertTrue(q.containsAll(p));
540 <            assertEquals(SIZE-i, q.size());
540 >            mustEqual(SIZE - i, q.size());
541              p.remove();
542          }
543      }
# Line 671 | Line 547 | public class PriorityBlockingQueueTest e
547       */
548      public void testRemoveAll() {
549          for (int i = 1; i < SIZE; ++i) {
550 <            PriorityBlockingQueue q = populatedQueue(SIZE);
551 <            PriorityBlockingQueue p = populatedQueue(i);
550 >            PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
551 >            PriorityBlockingQueue<Item> p = populatedQueue(i);
552              assertTrue(q.removeAll(p));
553 <            assertEquals(SIZE-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      /**
562 <     *  toArray contains all elements
562 >     * toArray contains all elements
563       */
564 <    public void testToArray() {
565 <        PriorityBlockingQueue q = populatedQueue(SIZE);
566 <        Object[] o = q.toArray();
567 <        Arrays.sort(o);
568 <        try {
569 <        for (int i = 0; i < o.length; i++)
570 <            assertEquals(o[i], q.take());
571 <        } catch (InterruptedException e) {
696 <            unexpectedException();
697 <        }
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() {
578 <        PriorityBlockingQueue q = populatedQueue(SIZE);
579 <        Integer[] ints = new Integer[SIZE];
580 <        ints = (Integer[])q.toArray(ints);
581 <        Arrays.sort(ints);
582 <        try {
583 <            for (int i = 0; i < ints.length; i++)
584 <                assertEquals(ints[i], q.take());
585 <        } catch (InterruptedException e) {
712 <            unexpectedException();
713 <        }
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      /**
589 <     * toArray(null) throws NPE
590 <     */
591 <    public void testToArray_BadArg() {
592 <        try {
593 <            PriorityBlockingQueue q = populatedQueue(SIZE);
594 <            Object o[] = q.toArray(null);
595 <            shouldThrow();
596 <        } catch (NullPointerException success) {}
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 <     * toArray with incompatible array type throws CCE
602 <     */
603 <    public void testToArray1_BadArg() {
604 <        try {
605 <            PriorityBlockingQueue q = populatedQueue(SIZE);
606 <            Object o[] = q.toArray(new String[10] );
607 <            shouldThrow();
608 <        } catch (ArrayStoreException  success) {}
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 iterates through all elements
614 >     * iterator of empty collection has no elements
615       */
616 <    public void testIterator() {
617 <        PriorityBlockingQueue q = populatedQueue(SIZE);
743 <        int i = 0;
744 <        Iterator it = q.iterator();
745 <        while (it.hasNext()) {
746 <            assertTrue(q.contains(it.next()));
747 <            ++i;
748 <        }
749 <        assertEquals(i, SIZE);
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 q = new PriorityBlockingQueue(3);
625 <        q.add(new Integer(2));
626 <        q.add(new Integer(1));
627 <        q.add(new Integer(3));
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 it = q.iterator();
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  
771
639      /**
640       * toString contains toStrings of elements
641       */
642      public void testToString() {
643 <        PriorityBlockingQueue q = populatedQueue(SIZE);
643 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
644          String s = q.toString();
645          for (int i = 0; i < SIZE; ++i) {
646 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
646 >            assertTrue(s.contains(String.valueOf(i)));
647          }
648      }
649  
650      /**
651 <     * offer transfers elements across Executor tasks
651 >     * timed poll transfers elements across Executor tasks
652       */
653      public void testPollInExecutor() {
654 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
655 <        ExecutorService executor = Executors.newFixedThreadPool(2);
656 <        executor.execute(new Runnable() {
657 <            public void run() {
658 <                threadAssertNull(q.poll());
659 <                try {
660 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
661 <                    threadAssertTrue(q.isEmpty());
662 <                }
663 <                catch (InterruptedException e) {
664 <                    threadUnexpectedException();
798 <                }
799 <            }
800 <        });
801 <
802 <        executor.execute(new Runnable() {
803 <            public void run() {
804 <                try {
805 <                    Thread.sleep(SMALL_DELAY_MS);
806 <                    q.put(new Integer(1));
807 <                }
808 <                catch (InterruptedException e) {
809 <                    threadUnexpectedException();
810 <                }
811 <            }
812 <        });
813 <
814 <        joinPool(executor);
815 <    }
816 <
817 <    /**
818 <     * A deserialized serialized queue has same elements
819 <     */
820 <    public void testSerialization() {
821 <        PriorityBlockingQueue q = populatedQueue(SIZE);
822 <        try {
823 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
824 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
825 <            out.writeObject(q);
826 <            out.close();
827 <
828 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
829 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
830 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
831 <            assertEquals(q.size(), r.size());
832 <            while (!q.isEmpty())
833 <                assertEquals(q.remove(), r.remove());
834 <        } catch (Exception e) {
835 <            unexpectedException();
836 <        }
837 <    }
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 <    /**
667 <     * drainTo(null) throws NPE
668 <     */
669 <    public void testDrainToNull() {
670 <        PriorityBlockingQueue q = populatedQueue(SIZE);
844 <        try {
845 <            q.drainTo(null);
846 <            shouldThrow();
847 <        } catch (NullPointerException success) {
666 >            executor.execute(new CheckedRunnable() {
667 >                public void realRun() throws InterruptedException {
668 >                    threadsStarted.await();
669 >                    q.put(one);
670 >                }});
671          }
672      }
673  
674      /**
675 <     * drainTo(this) throws IAE
675 >     * A deserialized/reserialized queue has same elements
676       */
677 <    public void testDrainToSelf() {
678 <        PriorityBlockingQueue q = populatedQueue(SIZE);
679 <        try {
680 <            q.drainTo(q);
681 <            shouldThrow();
682 <        } catch (IllegalArgumentException success) {
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      /**
691       * drainTo(c) empties queue into another collection c
692       */
693      public void testDrainTo() {
694 <        PriorityBlockingQueue q = populatedQueue(SIZE);
695 <        ArrayList l = new ArrayList();
694 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
695 >        ArrayList<Item> l = new ArrayList<>();
696          q.drainTo(l);
697 <        assertEquals(q.size(), 0);
698 <        assertEquals(l.size(), SIZE);
697 >        mustEqual(0, q.size());
698 >        mustEqual(SIZE, l.size());
699          for (int i = 0; i < SIZE; ++i)
700 <            assertEquals(l.get(i), new Integer(i));
700 >            mustEqual(l.get(i), i);
701          q.add(zero);
702          q.add(one);
703          assertFalse(q.isEmpty());
704 <        assertTrue(q.contains(zero));
878 <        assertTrue(q.contains(one));
704 >        mustContain(q, one);
705          l.clear();
706          q.drainTo(l);
707 <        assertEquals(q.size(), 0);
708 <        assertEquals(l.size(), 2);
707 >        mustEqual(0, q.size());
708 >        mustEqual(2, l.size());
709          for (int i = 0; i < 2; ++i)
710 <            assertEquals(l.get(i), new Integer(i));
710 >            mustEqual(l.get(i), i);
711      }
712  
713      /**
714       * drainTo empties queue
715       */
716 <    public void testDrainToWithActivePut() {
717 <        final PriorityBlockingQueue q = populatedQueue(SIZE);
718 <        Thread t = new Thread(new Runnable() {
719 <                public void run() {
720 <                    q.put(new Integer(SIZE+1));
721 <                }
896 <            });
897 <        try {
898 <            t.start();
899 <            ArrayList l = new ArrayList();
900 <            q.drainTo(l);
901 <            assertTrue(l.size() >= SIZE);
902 <            for (int i = 0; i < SIZE; ++i)
903 <                assertEquals(l.get(i), new Integer(i));
904 <            t.join();
905 <            assertTrue(q.size() + l.size() >= SIZE);
906 <        } catch (Exception e) {
907 <            unexpectedException();
908 <        }
909 <    }
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 <    /**
724 <     * drainTo(null, n) throws NPE
725 <     */
726 <    public void testDrainToNullN() {
727 <        PriorityBlockingQueue q = populatedQueue(SIZE);
728 <        try {
729 <            q.drainTo(null, 0);
730 <            shouldThrow();
919 <        } catch (NullPointerException success) {
920 <        }
921 <    }
922 <
923 <    /**
924 <     * drainTo(this, n) throws IAE
925 <     */
926 <    public void testDrainToSelfN() {
927 <        PriorityBlockingQueue q = populatedQueue(SIZE);
928 <        try {
929 <            q.drainTo(q, 0);
930 <            shouldThrow();
931 <        } catch (IllegalArgumentException success) {
932 <        }
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      /**
734 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
734 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
735       */
736      public void testDrainToN() {
737 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
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 <                assertTrue(q.offer(new Integer(j)));
741 <            ArrayList l = new ArrayList();
740 >                mustOffer(q, j);
741 >            ArrayList<Item> l = new ArrayList<>();
742              q.drainTo(l, i);
743 <            int k = (i < SIZE)? i : SIZE;
744 <            assertEquals(l.size(), k);
745 <            assertEquals(q.size(), SIZE-k);
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 <                assertEquals(l.get(j), new Integer(j));
748 <            while (q.poll() != null) ;
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  
767   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines