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.10 by dl, Wed Jan 7 01:13:50 2004 UTC vs.
Revision 1.85 by dl, Tue Jan 26 13:33:06 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
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
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 =
92 >            new PriorityBlockingQueue<Item>(n);
93          assertTrue(q.isEmpty());
94 <        for(int i = n-1; i >= 0; i-=2)
95 <            assertTrue(q.offer(new Integer(i)));
96 <        for(int i = (n & 1); i < n; i+=2)
97 <            assertTrue(q.offer(new Integer(i)));
94 >        for (int i = n - 1; i >= 0; i -= 2)
95 >            mustOffer(q, i);
96 >        for (int i = (n & 1); i < n; i += 2)
97 >            mustOffer(q, i);
98          assertFalse(q.isEmpty());
99 <        assertEquals(NOCAP, q.remainingCapacity());
100 <        assertEquals(n, q.size());
99 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
100 >        mustEqual(n, q.size());
101 >        mustEqual(0, q.peek());
102          return q;
103      }
104 <
104 >
105      /**
106       * A new queue has unbounded capacity
107       */
108      public void testConstructor1() {
109 <        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
109 >        mustEqual(Integer.MAX_VALUE,
110 >                     new PriorityBlockingQueue<Item>(SIZE).remainingCapacity());
111      }
112  
113      /**
114 <     * Constructor throws IAE if  capacity argument nonpositive
114 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
115       */
116      public void testConstructor2() {
117          try {
118 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
118 >            new PriorityBlockingQueue<Item>(0);
119              shouldThrow();
120 <        }
67 <        catch (IllegalArgumentException success) {}
120 >        } catch (IllegalArgumentException success) {}
121      }
122  
123      /**
# Line 72 | Line 125 | public class PriorityBlockingQueueTest e
125       */
126      public void testConstructor3() {
127          try {
128 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
128 >            new PriorityBlockingQueue<Item>(null);
129              shouldThrow();
130 <        }
78 <        catch (NullPointerException success) {}
130 >        } catch (NullPointerException success) {}
131      }
132  
133      /**
134       * Initializing from Collection of null elements throws NPE
135       */
136      public void testConstructor4() {
137 +        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
138          try {
139 <            Integer[] ints = new Integer[SIZE];
87 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
139 >            new PriorityBlockingQueue<Item>(elements);
140              shouldThrow();
141 <        }
90 <        catch (NullPointerException success) {}
141 >        } catch (NullPointerException success) {}
142      }
143  
144      /**
145       * Initializing from Collection with some null elements throws NPE
146       */
147      public void testConstructor5() {
148 +        Item[] items = new Item[2]; items[0] = zero;
149 +        Collection<Item> elements = Arrays.asList(items);
150          try {
151 <            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));
151 >            new PriorityBlockingQueue<Item>(elements);
152              shouldThrow();
153 <        }
104 <        catch (NullPointerException success) {}
153 >        } catch (NullPointerException success) {}
154      }
155  
156      /**
157       * Queue contains all elements of collection used to initialize
158       */
159      public void testConstructor6() {
160 <        try {
161 <            Integer[] ints = new Integer[SIZE];
162 <            for (int i = 0; i < SIZE; ++i)
163 <                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 {}
160 >        Item[] items = defaultItems;
161 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(Arrays.asList(items));
162 >        for (int i = 0; i < SIZE; ++i)
163 >            mustEqual(items[i], q.poll());
164      }
165  
166      /**
167       * The comparator used in constructor is used
168       */
169      public void testConstructor7() {
170 <        try {
171 <            MyReverseComparator cmp = new MyReverseComparator();
172 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
173 <            assertEquals(cmp, q.comparator());
174 <            Integer[] ints = new Integer[SIZE];
175 <            for (int i = 0; i < SIZE; ++i)
176 <                ints[i] = new Integer(i);
177 <            q.addAll(Arrays.asList(ints));
134 <            for (int i = SIZE-1; i >= 0; --i)
135 <                assertEquals(ints[i], q.poll());
136 <        }
137 <        finally {}
170 >        MyReverseComparator cmp = new MyReverseComparator();
171 >        @SuppressWarnings("unchecked")
172 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(SIZE, cmp);
173 >        mustEqual(cmp, q.comparator());
174 >        Item[] items = defaultItems;
175 >        q.addAll(Arrays.asList(items));
176 >        for (int i = SIZE - 1; i >= 0; --i)
177 >            mustEqual(items[i], q.poll());
178      }
179  
180      /**
181       * isEmpty is true before add, false after
182       */
183      public void testEmpty() {
184 <        PriorityBlockingQueue q = new PriorityBlockingQueue(2);
184 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(2);
185          assertTrue(q.isEmpty());
186 <        assertEquals(NOCAP, q.remainingCapacity());
186 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
187          q.add(one);
188          assertFalse(q.isEmpty());
189          q.add(two);
# Line 153 | Line 193 | public class PriorityBlockingQueueTest e
193      }
194  
195      /**
196 <     * remainingCapacity does not change when elements added or removed,
157 <     * but size does
196 >     * remainingCapacity() always returns Integer.MAX_VALUE
197       */
198      public void testRemainingCapacity() {
199 <        PriorityBlockingQueue q = populatedQueue(SIZE);
199 >        BlockingQueue<Item> q = populatedQueue(SIZE);
200          for (int i = 0; i < SIZE; ++i) {
201 <            assertEquals(NOCAP, q.remainingCapacity());
202 <            assertEquals(SIZE-i, q.size());
203 <            q.remove();
201 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
202 >            mustEqual(SIZE - i, q.size());
203 >            mustEqual(i, q.remove());
204          }
205          for (int i = 0; i < SIZE; ++i) {
206 <            assertEquals(NOCAP, q.remainingCapacity());
207 <            assertEquals(i, q.size());
208 <            q.add(new Integer(i));
206 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
207 >            mustEqual(i, q.size());
208 >            mustAdd(q, i);
209          }
210      }
211  
212      /**
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    /**
213       * Offer of comparable element succeeds
214       */
215      public void testOffer() {
216 <        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
216 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(1);
217          assertTrue(q.offer(zero));
218          assertTrue(q.offer(one));
219      }
# Line 205 | Line 222 | public class PriorityBlockingQueueTest e
222       * Offer of non-Comparable throws CCE
223       */
224      public void testOfferNonComparable() {
225 +        PriorityBlockingQueue<Object> q = new PriorityBlockingQueue<Object>(1);
226          try {
209            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210            q.offer(new Object());
211            q.offer(new Object());
227              q.offer(new Object());
228              shouldThrow();
229 +        } catch (ClassCastException success) {
230 +            assertTrue(q.isEmpty());
231 +            mustEqual(0, q.size());
232 +            assertNull(q.poll());
233          }
215        catch(ClassCastException success) {}
234      }
235  
236      /**
237       * add of comparable succeeds
238       */
239      public void testAdd() {
240 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
240 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(SIZE);
241          for (int i = 0; i < SIZE; ++i) {
242 <            assertEquals(i, q.size());
243 <            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();
242 >            mustEqual(i, q.size());
243 >            mustAdd(q, i);
244          }
238        catch (NullPointerException success) {}
245      }
246  
247      /**
248 <     * addAll(this) throws IAE
248 >     * addAll(this) throws IllegalArgumentException
249       */
250      public void testAddAllSelf() {
251 +        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
252          try {
246            PriorityBlockingQueue q = populatedQueue(SIZE);
253              q.addAll(q);
254              shouldThrow();
255 <        }
250 <        catch (IllegalArgumentException success) {}
255 >        } catch (IllegalArgumentException success) {}
256      }
257  
258      /**
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    /**
259       * addAll of a collection with any null elements throws NPE after
260       * possibly adding some elements
261       */
262      public void testAddAll3() {
263 +        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(SIZE);
264 +        Item[] items = new Item[2];
265 +        items[0] = zero;
266          try {
267 <            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));
267 >            q.addAll(Arrays.asList(items));
268              shouldThrow();
269 <        }
278 <        catch (NullPointerException success) {}
269 >        } catch (NullPointerException success) {}
270      }
271  
272      /**
273       * Queue contains all elements of successful addAll
274       */
275      public void testAddAll5() {
276 <        try {
277 <            Integer[] empty = new Integer[0];
278 <            Integer[] ints = new Integer[SIZE];
279 <            for (int i = SIZE-1; i >= 0; --i)
280 <                ints[i] = new Integer(i);
281 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
282 <            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 {}
276 >        Item[] empty = new Item[0];
277 >        Item[] items = defaultItems;
278 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(SIZE);
279 >        assertFalse(q.addAll(Arrays.asList(empty)));
280 >        assertTrue(q.addAll(Arrays.asList(items)));
281 >        for (int i = 0; i < SIZE; ++i)
282 >            mustEqual(items[i], q.poll());
283      }
284  
285      /**
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    /**
286       * all elements successfully put are contained
287       */
288 <     public void testPut() {
289 <         try {
290 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
291 <             for (int i = 0; i < SIZE; ++i) {
292 <                 Integer I = new Integer(i);
293 <                 q.put(I);
321 <                 assertTrue(q.contains(I));
322 <             }
323 <             assertEquals(SIZE, q.size());
324 <         }
325 <         finally {
288 >    public void testPut() {
289 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(SIZE);
290 >        for (int i = 0; i < SIZE; ++i) {
291 >            Item x = itemFor(i);
292 >            q.put(x);
293 >            mustContain(q, x);
294          }
295 +        mustEqual(SIZE, q.size());
296      }
297  
298      /**
299       * put doesn't block waiting for take
300       */
301 <    public void testPutWithTake() {
302 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
303 <        Thread t = new Thread(new Runnable() {
304 <                public void run() {
305 <                    int added = 0;
306 <                    try {
307 <                        q.put(new Integer(0));
308 <                        ++added;
309 <                        q.put(new Integer(0));
310 <                        ++added;
311 <                        q.put(new Integer(0));
312 <                        ++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 <        }
301 >    public void testPutWithTake() throws InterruptedException {
302 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(2);
303 >        final int size = 4;
304 >        Thread t = newStartedThread(new CheckedRunnable() {
305 >            public void realRun() {
306 >                for (int i = 0; i < size; i++)
307 >                    q.put(zero);
308 >            }});
309 >
310 >        awaitTermination(t);
311 >        mustEqual(size, q.size());
312 >        q.take();
313      }
314  
315      /**
316 <     * timed offer does not time out
316 >     * Queue is unbounded, so timed offer never times out
317       */
318      public void testTimedOffer() {
319 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
320 <        Thread t = new Thread(new Runnable() {
321 <                public void run() {
322 <                    try {
323 <                        q.put(new Integer(0));
324 <                        q.put(new Integer(0));
325 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
326 <                        threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
327 <                    } finally { }
328 <                }
376 <            });
377 <        
378 <        try {
379 <            t.start();
380 <            Thread.sleep(SMALL_DELAY_MS);
381 <            t.interrupt();
382 <            t.join();
383 <        } catch (Exception e){
384 <            unexpectedException();
385 <        }
319 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(2);
320 >        Thread t = newStartedThread(new CheckedRunnable() {
321 >            public void realRun() {
322 >                q.put(one);
323 >                q.put(two);
324 >                assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
325 >                assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
326 >            }});
327 >
328 >        awaitTermination(t);
329      }
330  
331      /**
332       * take retrieves elements in priority order
333       */
334 <    public void testTake() {
335 <        try {
336 <            PriorityBlockingQueue q = populatedQueue(SIZE);
337 <            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();
334 >    public void testTake() throws InterruptedException {
335 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
336 >        for (int i = 0; i < SIZE; ++i) {
337 >            mustEqual(i, q.take());
338          }
339      }
340  
341      /**
342       * Take removes existing elements until empty, then blocks interruptibly
343       */
344 <    public void testBlockingTake() {
345 <        Thread t = new Thread(new Runnable() {
346 <                public void run() {
347 <                    try {
348 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
349 <                        for (int i = 0; i < SIZE; ++i) {
350 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
351 <                        }
352 <                        q.take();
353 <                        threadShouldThrow();
354 <                    } catch (InterruptedException success){
355 <                    }  
356 <                }});
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 <    }
344 >    public void testBlockingTake() throws InterruptedException {
345 >        final PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
346 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
347 >        Thread t = newStartedThread(new CheckedRunnable() {
348 >            public void realRun() throws InterruptedException {
349 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
350 >
351 >                Thread.currentThread().interrupt();
352 >                try {
353 >                    q.take();
354 >                    shouldThrow();
355 >                } catch (InterruptedException success) {}
356 >                assertFalse(Thread.interrupted());
357  
358 +                pleaseInterrupt.countDown();
359 +                try {
360 +                    q.take();
361 +                    shouldThrow();
362 +                } catch (InterruptedException success) {}
363 +                assertFalse(Thread.interrupted());
364 +            }});
365 +
366 +        await(pleaseInterrupt);
367 +        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
368 +        t.interrupt();
369 +        awaitTermination(t);
370 +    }
371  
372      /**
373       * poll succeeds unless empty
374       */
375      public void testPoll() {
376 <        PriorityBlockingQueue q = populatedQueue(SIZE);
376 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
377          for (int i = 0; i < SIZE; ++i) {
378 <            assertEquals(i, ((Integer)q.poll()).intValue());
378 >            mustEqual(i, q.poll());
379          }
380 <        assertNull(q.poll());
380 >        assertNull(q.poll());
381      }
382  
383      /**
384 <     * timed pool with zero timeout succeeds when non-empty, else times out
384 >     * timed poll with zero timeout succeeds when non-empty, else times out
385       */
386 <    public void testTimedPoll0() {
387 <        try {
388 <            PriorityBlockingQueue q = populatedQueue(SIZE);
389 <            for (int i = 0; i < SIZE; ++i) {
390 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
391 <            }
473 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474 <        } catch (InterruptedException e){
475 <            unexpectedException();
476 <        }  
386 >    public void testTimedPoll0() throws InterruptedException {
387 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
388 >        for (int i = 0; i < SIZE; ++i) {
389 >            mustEqual(i, q.poll(0, MILLISECONDS));
390 >        }
391 >        assertNull(q.poll(0, MILLISECONDS));
392      }
393  
394      /**
395 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
395 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
396       */
397 <    public void testTimedPoll() {
398 <        try {
399 <            PriorityBlockingQueue q = populatedQueue(SIZE);
400 <            for (int i = 0; i < SIZE; ++i) {
401 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
402 <            }
403 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
404 <        } catch (InterruptedException e){
405 <            unexpectedException();
406 <        }  
397 >    public void testTimedPoll() throws InterruptedException {
398 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
399 >        for (int i = 0; i < SIZE; ++i) {
400 >            long startTime = System.nanoTime();
401 >            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
402 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
403 >        }
404 >        long startTime = System.nanoTime();
405 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
406 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
407 >        checkEmpty(q);
408      }
409  
410      /**
411       * Interrupted timed poll throws InterruptedException instead of
412       * returning timeout status
413       */
414 <    public void testInterruptedTimedPoll() {
415 <        Thread t = new Thread(new Runnable() {
416 <                public void run() {
417 <                    try {
418 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
419 <                        for (int i = 0; i < SIZE; ++i) {
420 <                            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 <    }
414 >    public void testInterruptedTimedPoll() throws InterruptedException {
415 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
416 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
417 >        Thread t = newStartedThread(new CheckedRunnable() {
418 >            public void realRun() throws InterruptedException {
419 >                for (int i = 0; i < SIZE; i++)
420 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
421  
422 <    /**
423 <     *  timed poll before a delayed offer fails; after offer succeeds;
424 <     *  on interruption throws
425 <     */
426 <    public void testTimedPollWithOffer() {
427 <        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 <    }  
422 >                Thread.currentThread().interrupt();
423 >                try {
424 >                    q.poll(randomTimeout(), randomTimeUnit());
425 >                    shouldThrow();
426 >                } catch (InterruptedException success) {}
427 >                assertFalse(Thread.interrupted());
428  
429 +                pleaseInterrupt.countDown();
430 +                try {
431 +                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
432 +                    shouldThrow();
433 +                } catch (InterruptedException success) {}
434 +                assertFalse(Thread.interrupted());
435 +            }});
436 +
437 +        await(pleaseInterrupt);
438 +        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
439 +        t.interrupt();
440 +        awaitTermination(t);
441 +    }
442  
443      /**
444       * peek returns next element, or null if empty
445       */
446      public void testPeek() {
447 <        PriorityBlockingQueue q = populatedQueue(SIZE);
447 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
448          for (int i = 0; i < SIZE; ++i) {
449 <            assertEquals(i, ((Integer)q.peek()).intValue());
450 <            q.poll();
449 >            mustEqual(i, q.peek());
450 >            mustEqual(i, q.poll());
451              assertTrue(q.peek() == null ||
452 <                       i != ((Integer)q.peek()).intValue());
452 >                       !q.peek().equals(i));
453          }
454 <        assertNull(q.peek());
454 >        assertNull(q.peek());
455      }
456  
457      /**
458       * element returns next element, or throws NSEE if empty
459       */
460      public void testElement() {
461 <        PriorityBlockingQueue q = populatedQueue(SIZE);
461 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
462          for (int i = 0; i < SIZE; ++i) {
463 <            assertEquals(i, ((Integer)q.element()).intValue());
464 <            q.poll();
463 >            mustEqual(i, q.element());
464 >            mustEqual(i, q.poll());
465          }
466          try {
467              q.element();
468              shouldThrow();
469 <        }
576 <        catch (NoSuchElementException success) {}
469 >        } catch (NoSuchElementException success) {}
470      }
471  
472      /**
473       * remove removes next element, or throws NSEE if empty
474       */
475      public void testRemove() {
476 <        PriorityBlockingQueue q = populatedQueue(SIZE);
476 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
477          for (int i = 0; i < SIZE; ++i) {
478 <            assertEquals(i, ((Integer)q.remove()).intValue());
478 >            mustEqual(i, q.remove());
479          }
480          try {
481              q.remove();
482              shouldThrow();
483 <        } catch (NoSuchElementException success){
591 <        }  
483 >        } catch (NoSuchElementException success) {}
484      }
485  
486      /**
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());
607    }
608        
609    /**
487       * contains(x) reports true when elements added but not yet removed
488       */
489      public void testContains() {
490 <        PriorityBlockingQueue q = populatedQueue(SIZE);
490 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
491          for (int i = 0; i < SIZE; ++i) {
492 <            assertTrue(q.contains(new Integer(i)));
492 >            mustContain(q, i);
493              q.poll();
494 <            assertFalse(q.contains(new Integer(i)));
494 >            mustNotContain(q, i);
495          }
496      }
497  
# Line 622 | Line 499 | public class PriorityBlockingQueueTest e
499       * clear removes all elements
500       */
501      public void testClear() {
502 <        PriorityBlockingQueue q = populatedQueue(SIZE);
502 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
503          q.clear();
504          assertTrue(q.isEmpty());
505 <        assertEquals(0, q.size());
506 <        assertEquals(NOCAP, q.remainingCapacity());
630 <        q.add(new Integer(1));
505 >        mustEqual(0, q.size());
506 >        q.add(one);
507          assertFalse(q.isEmpty());
508 +        mustContain(q, one);
509          q.clear();
510          assertTrue(q.isEmpty());
511      }
# Line 637 | Line 514 | public class PriorityBlockingQueueTest e
514       * containsAll(c) is true when c contains a subset of elements
515       */
516      public void testContainsAll() {
517 <        PriorityBlockingQueue q = populatedQueue(SIZE);
518 <        PriorityBlockingQueue p = new PriorityBlockingQueue(SIZE);
517 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
518 >        PriorityBlockingQueue<Item> p = new PriorityBlockingQueue<Item>(SIZE);
519          for (int i = 0; i < SIZE; ++i) {
520              assertTrue(q.containsAll(p));
521              assertFalse(p.containsAll(q));
522 <            p.add(new Integer(i));
522 >            mustAdd(p, i);
523          }
524          assertTrue(p.containsAll(q));
525      }
# Line 651 | Line 528 | public class PriorityBlockingQueueTest e
528       * retainAll(c) retains only those elements of c and reports true if changed
529       */
530      public void testRetainAll() {
531 <        PriorityBlockingQueue q = populatedQueue(SIZE);
532 <        PriorityBlockingQueue p = populatedQueue(SIZE);
531 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
532 >        PriorityBlockingQueue<Item> p = populatedQueue(SIZE);
533          for (int i = 0; i < SIZE; ++i) {
534              boolean changed = q.retainAll(p);
535              if (i == 0)
# Line 661 | Line 538 | public class PriorityBlockingQueueTest e
538                  assertTrue(changed);
539  
540              assertTrue(q.containsAll(p));
541 <            assertEquals(SIZE-i, q.size());
541 >            mustEqual(SIZE - i, q.size());
542              p.remove();
543          }
544      }
# Line 671 | Line 548 | public class PriorityBlockingQueueTest e
548       */
549      public void testRemoveAll() {
550          for (int i = 1; i < SIZE; ++i) {
551 <            PriorityBlockingQueue q = populatedQueue(SIZE);
552 <            PriorityBlockingQueue p = populatedQueue(i);
551 >            PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
552 >            PriorityBlockingQueue<Item> p = populatedQueue(i);
553              assertTrue(q.removeAll(p));
554 <            assertEquals(SIZE-i, q.size());
554 >            mustEqual(SIZE - i, q.size());
555              for (int j = 0; j < i; ++j) {
556 <                Integer I = (Integer)(p.remove());
557 <                assertFalse(q.contains(I));
556 >                Item x = p.remove();
557 >                mustNotContain(q, x);
558              }
559          }
560      }
561  
562      /**
563 <     *  toArray contains all elements
563 >     * toArray contains all elements
564       */
565 <    public void testToArray() {
566 <        PriorityBlockingQueue q = populatedQueue(SIZE);
567 <        Object[] o = q.toArray();
568 <        Arrays.sort(o);
569 <        try {
570 <        for(int i = 0; i < o.length; i++)
571 <            assertEquals(o[i], q.take());
572 <        } catch (InterruptedException e){
696 <            unexpectedException();
697 <        }    
565 >    public void testToArray() throws InterruptedException {
566 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
567 >        Object[] a = q.toArray();
568 >        assertSame(Object[].class, a.getClass());
569 >        Arrays.sort(a);
570 >        for (Object o : a)
571 >            assertSame(o, q.take());
572 >        assertTrue(q.isEmpty());
573      }
574  
575      /**
576       * toArray(a) contains all elements
577       */
578 <    public void testToArray2() {
579 <        PriorityBlockingQueue q = populatedQueue(SIZE);
580 <        Integer[] ints = new Integer[SIZE];
581 <        ints = (Integer[])q.toArray(ints);
582 <        Arrays.sort(ints);
583 <        try {
584 <            for(int i = 0; i < ints.length; i++)
585 <                assertEquals(ints[i], q.take());
586 <        } catch (InterruptedException e){
712 <            unexpectedException();
713 <        }    
578 >    public void testToArray2() throws InterruptedException {
579 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
580 >        Item[] items = new Item[SIZE];
581 >        Item[] array = q.toArray(items);
582 >        assertSame(items, array);
583 >        Arrays.sort(items);
584 >        for (Item o : items)
585 >            assertSame(o, q.take());
586 >        assertTrue(q.isEmpty());
587      }
588  
589      /**
590 <     * toArray(null) throws NPE
590 >     * toArray(incompatible array type) throws ArrayStoreException
591       */
592 <    public void testToArray_BadArg() {
593 <        try {
594 <            PriorityBlockingQueue q = populatedQueue(SIZE);
595 <            Object o[] = q.toArray(null);
596 <            shouldThrow();
597 <        } catch(NullPointerException success){}
592 >    public void testToArray1_BadArg() {
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
601 >     * iterator iterates through all elements
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){}
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 <    
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<Item>().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<Item>(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          }
781    }        
782
783    /**
784     * offer transfers elements across Executor tasks
785     */
786    public void testPollInExecutor() {
787        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
788        ExecutorService executor = Executors.newFixedThreadPool(2);
789        executor.execute(new Runnable() {
790            public void run() {
791                threadAssertNull(q.poll());
792                try {
793                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
794                    threadAssertTrue(q.isEmpty());
795                }
796                catch (InterruptedException e) {
797                    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);
648      }
649  
650      /**
651 <     * A deserialized serialized queue has same elements
651 >     * timed poll transfers elements across Executor tasks
652       */
653 <    public void testSerialization() {
654 <        PriorityBlockingQueue q = populatedQueue(SIZE);
655 <        try {
656 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
657 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
658 <            out.writeObject(q);
659 <            out.close();
660 <
661 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
662 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
663 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
664 <            assertEquals(q.size(), r.size());
832 <            while (!q.isEmpty())
833 <                assertEquals(q.remove(), r.remove());
834 <        } catch(Exception e){
835 <            unexpectedException();
836 <        }
837 <    }
653 >    public void testPollInExecutor() {
654 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<Item>(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
676 <     */
677 <    public void testDrainToSelf() {
678 <        PriorityBlockingQueue q = populatedQueue(SIZE);
679 <        try {
680 <            q.drainTo(q);
681 <            shouldThrow();
682 <        } catch(IllegalArgumentException success) {
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      /**
691       * drainTo(c) empties queue into another collection c
692 <     */
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<Item>();
696          q.drainTo(l);
697 <        assertEquals(q.size(), 0);
698 <        assertEquals(l.size(), SIZE);
699 <        for (int i = 0; i < SIZE; ++i)
700 <            assertEquals(l.get(i), new Integer(i));
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      /**
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 <                }
885 <            });
886 <        try {
887 <            t.start();
888 <            ArrayList l = new ArrayList();
889 <            q.drainTo(l);
890 <            assertTrue(l.size() >= SIZE);
891 <            for (int i = 0; i < SIZE; ++i)
892 <                assertEquals(l.get(i), new Integer(i));
893 <            t.join();
894 <            assertTrue(q.size() + l.size() >= SIZE);
895 <        } catch(Exception e){
896 <            unexpectedException();
897 <        }
898 <    }
899 <
900 <    /**
901 <     * drainTo(null, n) throws NPE
902 <     */
903 <    public void testDrainToNullN() {
904 <        PriorityBlockingQueue q = populatedQueue(SIZE);
905 <        try {
906 <            q.drainTo(null, 0);
907 <            shouldThrow();
908 <        } catch(NullPointerException success) {
909 <        }
910 <    }
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 <    /**
724 <     * drainTo(this, n) throws IAE
725 <     */
726 <    public void testDrainToSelfN() {
727 <        PriorityBlockingQueue q = populatedQueue(SIZE);
728 <        try {
729 <            q.drainTo(q, 0);
730 <            shouldThrow();
920 <        } catch(IllegalArgumentException success) {
921 <        }
723 >        t.start();
724 >        ArrayList<Item> l = new ArrayList<Item>();
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
735 <     */
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<Item>(SIZE * 2);
738          for (int i = 0; i < SIZE + 2; ++i) {
739 <            PriorityBlockingQueue q = populatedQueue(SIZE);
740 <            ArrayList l = new ArrayList();
739 >            for (int j = 0; j < SIZE; j++)
740 >                mustOffer(q, j);
741 >            ArrayList<Item> l = new ArrayList<Item>();
742              q.drainTo(l, i);
743 <            int k = (i < SIZE)? i : SIZE;
744 <            assertEquals(q.size(), SIZE-k);
745 <            assertEquals(l.size(), k);
746 <            for (int j = 0; j < k; ++j)
747 <                assertTrue(l.contains(new Integer(j)));
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<Object>(),
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