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.7 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.84 by jsr166, Thu Sep 5 21:11:13 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines