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.28 by dl, Wed Sep 29 12:33:48 2010 UTC vs.
Revision 1.86 by jsr166, Wed Jan 27 01:57:24 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.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
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  
23    private static final int NOCAP = Integer.MAX_VALUE;
24
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              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 50 | 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          } catch (IllegalArgumentException success) {}
120      }
# Line 68 | 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          } catch (NullPointerException success) {}
130      }
# Line 77 | Line 133 | public class PriorityBlockingQueueTest e
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];
82 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
138 >            new PriorityBlockingQueue<Item>(elements);
139              shouldThrow();
140          } catch (NullPointerException success) {}
141      }
# Line 88 | Line 144 | public class PriorityBlockingQueueTest e
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];
93 <            for (int i = 0; i < SIZE-1; ++i)
94 <                ints[i] = new Integer(i);
95 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
150 >            new PriorityBlockingQueue<Item>(elements);
151              shouldThrow();
152          } catch (NullPointerException success) {}
153      }
# Line 101 | Line 156 | public class PriorityBlockingQueueTest e
156       * Queue contains all elements of collection used to initialize
157       */
158      public void testConstructor6() {
159 <        Integer[] ints = new Integer[SIZE];
160 <        for (int i = 0; i < SIZE; ++i)
106 <            ints[i] = new Integer(i);
107 <        PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
159 >        Item[] items = defaultItems;
160 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(Arrays.asList(items));
161          for (int i = 0; i < SIZE; ++i)
162 <            assertEquals(ints[i], q.poll());
162 >            mustEqual(items[i], q.poll());
163      }
164  
165      /**
# Line 114 | Line 167 | public class PriorityBlockingQueueTest e
167       */
168      public void testConstructor7() {
169          MyReverseComparator cmp = new MyReverseComparator();
170 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
171 <        assertEquals(cmp, q.comparator());
172 <        Integer[] ints = new Integer[SIZE];
173 <        for (int i = 0; i < SIZE; ++i)
174 <            ints[i] = new Integer(i);
175 <        q.addAll(Arrays.asList(ints));
176 <        for (int i = SIZE-1; i >= 0; --i)
124 <            assertEquals(ints[i], q.poll());
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 140 | Line 192 | public class PriorityBlockingQueueTest e
192      }
193  
194      /**
195 <     * remainingCapacity does not change when elements added or removed,
144 <     * 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      /**
161     * offer(null) throws NPE
162     */
163    public void testOfferNull() {
164        try {
165            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
166            q.offer(null);
167            shouldThrow();
168        } catch (NullPointerException success) {}
169    }
170
171    /**
172     * add(null) throws NPE
173     */
174    public void testAddNull() {
175        try {
176            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
177            q.add(null);
178            shouldThrow();
179        } catch (NullPointerException success) {}
180    }
181
182    /**
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 192 | 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 {
196            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
197            q.offer(new Object());
198            q.offer(new Object());
226              q.offer(new Object());
227              shouldThrow();
228 <        } catch (ClassCastException success) {}
228 >        } catch (ClassCastException success) {
229 >            assertTrue(q.isEmpty());
230 >            mustEqual(0, q.size());
231 >            assertNull(q.poll());
232 >        }
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)));
241 >            mustEqual(i, q.size());
242 >            mustAdd(q, i);
243          }
244      }
245  
246      /**
247 <     * addAll(null) throws NPE
217 <     */
218 <    public void testAddAll1() {
219 <        try {
220 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
221 <            q.addAll(null);
222 <            shouldThrow();
223 <        } catch (NullPointerException success) {}
224 <    }
225 <
226 <    /**
227 <     * addAll(this) throws IAE
247 >     * addAll(this) throws IllegalArgumentException
248       */
249      public void testAddAllSelf() {
250 +        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
251          try {
231            PriorityBlockingQueue q = populatedQueue(SIZE);
252              q.addAll(q);
253              shouldThrow();
254          } catch (IllegalArgumentException success) {}
255      }
256  
257      /**
238     * addAll of a collection with null elements throws NPE
239     */
240    public void testAddAll2() {
241        try {
242            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
243            Integer[] ints = new Integer[SIZE];
244            q.addAll(Arrays.asList(ints));
245            shouldThrow();
246        } catch (NullPointerException success) {}
247    }
248
249    /**
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);
256 <            Integer[] ints = new Integer[SIZE];
257 <            for (int i = 0; i < SIZE-1; ++i)
258 <                ints[i] = new Integer(i);
259 <            q.addAll(Arrays.asList(ints));
266 >            q.addAll(Arrays.asList(items));
267              shouldThrow();
268          } catch (NullPointerException success) {}
269      }
# Line 265 | Line 272 | public class PriorityBlockingQueueTest e
272       * Queue contains all elements of successful addAll
273       */
274      public void testAddAll5() {
275 <        Integer[] empty = new Integer[0];
276 <        Integer[] ints = new Integer[SIZE];
277 <        for (int i = SIZE-1; i >= 0; --i)
271 <            ints[i] = new Integer(i);
272 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
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(ints)));
279 >        assertTrue(q.addAll(Arrays.asList(items)));
280          for (int i = 0; i < SIZE; ++i)
281 <            assertEquals(ints[i], q.poll());
281 >            mustEqual(items[i], q.poll());
282      }
283  
284      /**
280     * put(null) throws NPE
281     */
282     public void testPutNull() {
283        try {
284            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
285            q.put(null);
286            shouldThrow();
287        } catch (NullPointerException success) {}
288     }
289
290    /**
285       * all elements successfully put are contained
286       */
287 <     public void testPut() {
288 <         PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
289 <         for (int i = 0; i < SIZE; ++i) {
290 <             Integer I = new Integer(i);
291 <             q.put(I);
292 <             assertTrue(q.contains(I));
293 <         }
294 <         assertEquals(SIZE, q.size());
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() throws InterruptedException {
301 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
301 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
302          final int size = 4;
303 <        Thread t = new Thread(new CheckedRunnable() {
303 >        Thread t = newStartedThread(new CheckedRunnable() {
304              public void realRun() {
305                  for (int i = 0; i < size; i++)
306 <                    q.put(new Integer(0));
306 >                    q.put(zero);
307              }});
308  
309 <        t.start();
310 <        Thread.sleep(SHORT_DELAY_MS);
317 <        assertEquals(q.size(), size);
309 >        awaitTermination(t);
310 >        mustEqual(size, q.size());
311          q.take();
319        t.interrupt();
320        t.join();
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() throws InterruptedException {
318 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
319 <        Thread t = new Thread(new CheckedRunnable() {
317 >    public void testTimedOffer() {
318 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
319 >        Thread t = newStartedThread(new CheckedRunnable() {
320              public void realRun() {
321 <                q.put(new Integer(0));
322 <                q.put(new Integer(0));
323 <                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
324 <                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
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 <        t.start();
337 <        Thread.sleep(SMALL_DELAY_MS);
338 <        t.interrupt();
339 <        t.join();
327 >        awaitTermination(t);
328      }
329  
330      /**
331       * take retrieves elements in priority order
332       */
333      public void testTake() throws InterruptedException {
334 <        PriorityBlockingQueue q = populatedQueue(SIZE);
334 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
335          for (int i = 0; i < SIZE; ++i) {
336 <            assertEquals(i, q.take());
336 >            mustEqual(i, q.take());
337          }
338      }
339  
340      /**
353     * take blocks interruptibly when empty
354     */
355    public void testTakeFromEmpty() throws InterruptedException {
356        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
357        Thread t = new Thread(new CheckedInterruptedRunnable() {
358            public void realRun() throws InterruptedException {
359                q.take();
360            }});
361
362        t.start();
363        Thread.sleep(SHORT_DELAY_MS);
364        t.interrupt();
365        t.join();
366    }
367
368    /**
341       * Take removes existing elements until empty, then blocks interruptibly
342       */
343      public void testBlockingTake() throws InterruptedException {
344 <        final PriorityBlockingQueue q = populatedQueue(SIZE);
345 <        Thread t = new Thread(new CheckedRunnable() {
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) {
349 <                    assertEquals(i, q.take());
350 <                }
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 <        t.start();
366 <        Thread.sleep(SHORT_DELAY_MS);
365 >        await(pleaseInterrupt);
366 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
367          t.interrupt();
368 <        t.join();
368 >        awaitTermination(t);
369      }
370  
390
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, q.poll());
377 >            mustEqual(i, q.poll());
378          }
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() throws InterruptedException {
386 <        PriorityBlockingQueue q = populatedQueue(SIZE);
386 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
387          for (int i = 0; i < SIZE; ++i) {
388 <            assertEquals(i, q.poll(0, MILLISECONDS));
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() throws InterruptedException {
397 <        PriorityBlockingQueue q = populatedQueue(SIZE);
397 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
398          for (int i = 0; i < SIZE; ++i) {
399 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
400 <        }
401 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
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      /**
# Line 426 | Line 411 | public class PriorityBlockingQueueTest e
411       * returning timeout status
412       */
413      public void testInterruptedTimedPoll() throws InterruptedException {
414 <        Thread t = new Thread(new CheckedRunnable() {
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 <                PriorityBlockingQueue q = populatedQueue(SIZE);
419 <                for (int i = 0; i < SIZE; ++i) {
420 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
421 <                }
418 >                for (int i = 0; i < SIZE; i++)
419 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
420 >
421 >                Thread.currentThread().interrupt();
422                  try {
423 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
423 >                    q.poll(randomTimeout(), randomTimeUnit());
424                      shouldThrow();
425                  } catch (InterruptedException success) {}
426 <            }});
426 >                assertFalse(Thread.interrupted());
427  
428 <        t.start();
442 <        Thread.sleep(SHORT_DELAY_MS);
443 <        t.interrupt();
444 <        t.join();
445 <    }
446 <
447 <    /**
448 <     *  timed poll before a delayed offer fails; after offer succeeds;
449 <     *  on interruption throws
450 <     */
451 <    public void testTimedPollWithOffer() throws InterruptedException {
452 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
453 <        Thread t = new Thread(new CheckedRunnable() {
454 <            public void realRun() throws InterruptedException {
428 >                pleaseInterrupt.countDown();
429                  try {
430 <                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
457 <                    assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
458 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
430 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
431                      shouldThrow();
432                  } catch (InterruptedException success) {}
433 +                assertFalse(Thread.interrupted());
434              }});
435  
436 <        t.start();
437 <        Thread.sleep(SMALL_DELAY_MS);
465 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
436 >        await(pleaseInterrupt);
437 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
438          t.interrupt();
439 <        t.join();
439 >        awaitTermination(t);
440      }
441  
470
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, q.peek());
449 <            assertEquals(i, q.poll());
448 >            mustEqual(i, q.peek());
449 >            mustEqual(i, q.poll());
450              assertTrue(q.peek() == null ||
451                         !q.peek().equals(i));
452          }
# Line 486 | Line 457 | public class PriorityBlockingQueueTest e
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, q.element());
463 <            assertEquals(i, q.poll());
462 >            mustEqual(i, q.element());
463 >            mustEqual(i, q.poll());
464          }
465          try {
466              q.element();
# Line 501 | Line 472 | public class PriorityBlockingQueueTest e
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, q.remove());
477 >            mustEqual(i, q.remove());
478          }
479          try {
480              q.remove();
# Line 512 | Line 483 | public class PriorityBlockingQueueTest e
483      }
484  
485      /**
515     * remove(x) removes x and returns true if present
516     */
517    public void testRemoveElement() {
518        PriorityBlockingQueue q = populatedQueue(SIZE);
519        for (int i = 1; i < SIZE; i+=2) {
520            assertTrue(q.remove(new Integer(i)));
521        }
522        for (int i = 0; i < SIZE; i+=2) {
523            assertTrue(q.remove(new Integer(i)));
524            assertFalse(q.remove(new Integer(i+1)));
525        }
526        assertTrue(q.isEmpty());
527    }
528
529    /**
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 542 | 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 557 | 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 571 | 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 581 | 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 591 | 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() throws InterruptedException {
565 <        PriorityBlockingQueue q = populatedQueue(SIZE);
566 <        Object[] o = q.toArray();
567 <        Arrays.sort(o);
568 <        for (int i = 0; i < o.length; i++)
569 <            assertEquals(o[i], q.take());
565 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
566 >        Object[] a = q.toArray();
567 >        assertSame(Object[].class, a.getClass());
568 >        Arrays.sort(a);
569 >        for (Object o : a)
570 >            assertSame(o, q.take());
571 >        assertTrue(q.isEmpty());
572      }
573  
574      /**
575       * toArray(a) contains all elements
576       */
577      public void testToArray2() throws InterruptedException {
578 <        PriorityBlockingQueue q = populatedQueue(SIZE);
579 <        Integer[] ints = new Integer[SIZE];
580 <        ints = (Integer[])q.toArray(ints);
581 <        Arrays.sort(ints);
582 <        for (int i = 0; i < ints.length; i++)
583 <            assertEquals(ints[i], q.take());
584 <    }
585 <
628 <    /**
629 <     * toArray(null) throws NPE
630 <     */
631 <    public void testToArray_BadArg() {
632 <        PriorityBlockingQueue q = populatedQueue(SIZE);
633 <        try {
634 <            Object o[] = q.toArray(null);
635 <            shouldThrow();
636 <        } catch (NullPointerException success) {}
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 with incompatible array type throws CCE
589 >     * toArray(incompatible array type) throws ArrayStoreException
590       */
591      public void testToArray1_BadArg() {
592 <        PriorityBlockingQueue q = populatedQueue(SIZE);
592 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
593          try {
594 <            Object o[] = q.toArray(new String[10]);
594 >            q.toArray(new String[10]);
595              shouldThrow();
596          } catch (ArrayStoreException success) {}
597      }
# Line 651 | Line 600 | public class PriorityBlockingQueueTest e
600       * iterator iterates through all elements
601       */
602      public void testIterator() {
603 <        PriorityBlockingQueue q = populatedQueue(SIZE);
604 <        int i = 0;
605 <        Iterator it = q.iterator();
606 <        while (it.hasNext()) {
607 <            assertTrue(q.contains(it.next()));
608 <            ++i;
609 <        }
610 <        assertEquals(i, SIZE);
603 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
604 >        Iterator<? extends Item> it = q.iterator();
605 >        int i;
606 >        for (i = 0; it.hasNext(); i++)
607 >            mustContain(q, it.next());
608 >        mustEqual(i, SIZE);
609 >        assertIteratorExhausted(it);
610 >    }
611 >
612 >    /**
613 >     * iterator of empty collection has no elements
614 >     */
615 >    public void testEmptyIterator() {
616 >        assertIteratorExhausted(new PriorityBlockingQueue<>().iterator());
617      }
618  
619      /**
620       * iterator.remove removes current element
621       */
622      public void testIteratorRemove() {
623 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
624 <        q.add(new Integer(2));
625 <        q.add(new Integer(1));
626 <        q.add(new Integer(3));
623 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(3);
624 >        q.add(two);
625 >        q.add(one);
626 >        q.add(three);
627  
628 <        Iterator it = q.iterator();
628 >        Iterator<? extends Item> it = q.iterator();
629          it.next();
630          it.remove();
631  
632          it = q.iterator();
633 <        assertEquals(it.next(), new Integer(2));
634 <        assertEquals(it.next(), new Integer(3));
633 >        mustEqual(it.next(), two);
634 >        mustEqual(it.next(), three);
635          assertFalse(it.hasNext());
636      }
637  
683
638      /**
639       * toString contains toStrings of elements
640       */
641      public void testToString() {
642 <        PriorityBlockingQueue q = populatedQueue(SIZE);
642 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
643          String s = q.toString();
644          for (int i = 0; i < SIZE; ++i) {
645 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
645 >            assertTrue(s.contains(String.valueOf(i)));
646          }
647      }
648  
649      /**
650 <     * offer transfers elements across Executor tasks
650 >     * timed poll transfers elements across Executor tasks
651       */
652      public void testPollInExecutor() {
653 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
654 <        ExecutorService executor = Executors.newFixedThreadPool(2);
655 <        executor.execute(new CheckedRunnable() {
656 <            public void realRun() throws InterruptedException {
657 <                assertNull(q.poll());
658 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
659 <                assertTrue(q.isEmpty());
660 <            }});
661 <
662 <        executor.execute(new CheckedRunnable() {
663 <            public void realRun() throws InterruptedException {
664 <                Thread.sleep(SMALL_DELAY_MS);
665 <                q.put(one);
666 <            }});
667 <
668 <        joinPool(executor);
653 >        final PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(2);
654 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
655 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
656 >        try (PoolCleaner cleaner = cleaner(executor)) {
657 >            executor.execute(new CheckedRunnable() {
658 >                public void realRun() throws InterruptedException {
659 >                    assertNull(q.poll());
660 >                    threadsStarted.await();
661 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
662 >                    checkEmpty(q);
663 >                }});
664 >
665 >            executor.execute(new CheckedRunnable() {
666 >                public void realRun() throws InterruptedException {
667 >                    threadsStarted.await();
668 >                    q.put(one);
669 >                }});
670 >        }
671      }
672  
673      /**
674 <     * A deserialized serialized queue has same elements
674 >     * A deserialized/reserialized queue has same elements
675       */
676      public void testSerialization() throws Exception {
677 <        PriorityBlockingQueue q = populatedQueue(SIZE);
678 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
723 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
724 <        out.writeObject(q);
725 <        out.close();
677 >        Queue<Item> x = populatedQueue(SIZE);
678 >        Queue<Item> y = serialClone(x);
679  
680 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
681 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
682 <        PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
683 <        assertEquals(q.size(), r.size());
684 <        while (!q.isEmpty())
685 <            assertEquals(q.remove(), r.remove());
686 <    }
734 <
735 <    /**
736 <     * drainTo(null) throws NPE
737 <     */
738 <    public void testDrainToNull() {
739 <        PriorityBlockingQueue q = populatedQueue(SIZE);
740 <        try {
741 <            q.drainTo(null);
742 <            shouldThrow();
743 <        } catch (NullPointerException success) {}
744 <    }
745 <
746 <    /**
747 <     * drainTo(this) throws IAE
748 <     */
749 <    public void testDrainToSelf() {
750 <        PriorityBlockingQueue q = populatedQueue(SIZE);
751 <        try {
752 <            q.drainTo(q);
753 <            shouldThrow();
754 <        } catch (IllegalArgumentException success) {}
680 >        assertNotSame(x, y);
681 >        mustEqual(x.size(), y.size());
682 >        while (!x.isEmpty()) {
683 >            assertFalse(y.isEmpty());
684 >            mustEqual(x.remove(), y.remove());
685 >        }
686 >        assertTrue(y.isEmpty());
687      }
688  
689      /**
690       * drainTo(c) empties queue into another collection c
691       */
692      public void testDrainTo() {
693 <        PriorityBlockingQueue q = populatedQueue(SIZE);
694 <        ArrayList l = new ArrayList();
693 >        PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
694 >        ArrayList<Item> l = new ArrayList<>();
695          q.drainTo(l);
696 <        assertEquals(q.size(), 0);
697 <        assertEquals(l.size(), SIZE);
696 >        mustEqual(0, q.size());
697 >        mustEqual(SIZE, l.size());
698          for (int i = 0; i < SIZE; ++i)
699 <            assertEquals(l.get(i), new Integer(i));
699 >            mustEqual(l.get(i), i);
700          q.add(zero);
701          q.add(one);
702          assertFalse(q.isEmpty());
703 <        assertTrue(q.contains(zero));
772 <        assertTrue(q.contains(one));
703 >        mustContain(q, one);
704          l.clear();
705          q.drainTo(l);
706 <        assertEquals(q.size(), 0);
707 <        assertEquals(l.size(), 2);
706 >        mustEqual(0, q.size());
707 >        mustEqual(2, l.size());
708          for (int i = 0; i < 2; ++i)
709 <            assertEquals(l.get(i), new Integer(i));
709 >            mustEqual(l.get(i), i);
710      }
711  
712      /**
713       * drainTo empties queue
714       */
715      public void testDrainToWithActivePut() throws InterruptedException {
716 <        final PriorityBlockingQueue q = populatedQueue(SIZE);
716 >        final PriorityBlockingQueue<Item> q = populatedQueue(SIZE);
717          Thread t = new Thread(new CheckedRunnable() {
718              public void realRun() {
719 <                q.put(new Integer(SIZE+1));
719 >                q.put(new Item(SIZE + 1));
720              }});
721  
722          t.start();
723 <        ArrayList l = new ArrayList();
723 >        ArrayList<Item> l = new ArrayList<>();
724          q.drainTo(l);
725          assertTrue(l.size() >= SIZE);
726          for (int i = 0; i < SIZE; ++i)
727 <            assertEquals(l.get(i), new Integer(i));
727 >            mustEqual(l.get(i), i);
728          t.join();
729          assertTrue(q.size() + l.size() >= SIZE);
730      }
731  
732      /**
733 <     * drainTo(null, n) throws NPE
803 <     */
804 <    public void testDrainToNullN() {
805 <        PriorityBlockingQueue q = populatedQueue(SIZE);
806 <        try {
807 <            q.drainTo(null, 0);
808 <            shouldThrow();
809 <        } catch (NullPointerException success) {}
810 <    }
811 <
812 <    /**
813 <     * drainTo(this, n) throws IAE
814 <     */
815 <    public void testDrainToSelfN() {
816 <        PriorityBlockingQueue q = populatedQueue(SIZE);
817 <        try {
818 <            q.drainTo(q, 0);
819 <            shouldThrow();
820 <        } catch (IllegalArgumentException success) {}
821 <    }
822 <
823 <    /**
824 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
733 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
734       */
735      public void testDrainToN() {
736 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
736 >        PriorityBlockingQueue<Item> q = new PriorityBlockingQueue<>(SIZE * 2);
737          for (int i = 0; i < SIZE + 2; ++i) {
738              for (int j = 0; j < SIZE; j++)
739 <                assertTrue(q.offer(new Integer(j)));
740 <            ArrayList l = new ArrayList();
739 >                mustOffer(q, j);
740 >            ArrayList<Item> l = new ArrayList<>();
741              q.drainTo(l, i);
742 <            int k = (i < SIZE)? i : SIZE;
743 <            assertEquals(l.size(), k);
744 <            assertEquals(q.size(), SIZE-k);
742 >            int k = (i < SIZE) ? i : SIZE;
743 >            mustEqual(k, l.size());
744 >            mustEqual(SIZE - k, q.size());
745              for (int j = 0; j < k; ++j)
746 <                assertEquals(l.get(j), new Integer(j));
747 <            while (q.poll() != null) ;
746 >                mustEqual(l.get(j), j);
747 >            do {} while (q.poll() != null);
748 >        }
749 >    }
750 >
751 >    /**
752 >     * remove(null), contains(null) always return false
753 >     */
754 >    public void testNeverContainsNull() {
755 >        Collection<?>[] qs = {
756 >            new PriorityBlockingQueue<>(),
757 >            populatedQueue(2),
758 >        };
759 >
760 >        for (Collection<?> q : qs) {
761 >            assertFalse(q.contains(null));
762 >            assertFalse(q.remove(null));
763          }
764      }
765  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines