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.67 by jsr166, Wed Jun 1 16:08:04 2016 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 >
24 > import junit.framework.Test;
25  
26   public class PriorityBlockingQueueTest extends JSR166TestCase {
27 +
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new PriorityBlockingQueue();
31 +        }
32 +    }
33 +
34 +    public static class InitialCapacity extends BlockingQueueTest {
35 +        protected BlockingQueue emptyCollection() {
36 +            return new PriorityBlockingQueue(SIZE);
37 +        }
38 +    }
39 +
40      public static void main(String[] args) {
41 <        junit.textui.TestRunner.run (suite());  
41 >        main(suite(), args);
42      }
43 +
44      public static Test suite() {
45 <        return new TestSuite(PriorityBlockingQueueTest.class);
45 >        return newTestSuite(PriorityBlockingQueueTest.class,
46 >                            new Generic().testSuite(),
47 >                            new InitialCapacity().testSuite());
48      }
49  
21    private static final int NOCAP = Integer.MAX_VALUE;
22
50      /** Sample Comparator */
51 <    static class MyReverseComparator implements Comparator {
51 >    static class MyReverseComparator implements Comparator {
52          public int compare(Object x, Object y) {
53 <            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;
53 >            return ((Comparable)y).compareTo(x);
54          }
55      }
56  
57      /**
58 <     * Create a queue of given size containing consecutive
58 >     * Returns a new queue of given size containing consecutive
59       * Integers 0 ... n.
60       */
61 <    private PriorityBlockingQueue populatedQueue(int n) {
62 <        PriorityBlockingQueue q = new PriorityBlockingQueue(n);
61 >    private PriorityBlockingQueue<Integer> populatedQueue(int n) {
62 >        PriorityBlockingQueue<Integer> q =
63 >            new PriorityBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
65 <        for(int i = n-1; i >= 0; i-=2)
66 <            assertTrue(q.offer(new Integer(i)));
67 <        for(int i = (n & 1); i < n; i+=2)
68 <            assertTrue(q.offer(new Integer(i)));
65 >        for (int i = n - 1; i >= 0; i -= 2)
66 >            assertTrue(q.offer(new Integer(i)));
67 >        for (int i = (n & 1); i < n; i += 2)
68 >            assertTrue(q.offer(new Integer(i)));
69          assertFalse(q.isEmpty());
70 <        assertEquals(NOCAP, q.remainingCapacity());
71 <        assertEquals(n, q.size());
70 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
71 >        assertEquals(n, q.size());
72          return q;
73      }
74 <
74 >
75      /**
76       * A new queue has unbounded capacity
77       */
78      public void testConstructor1() {
79 <        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
79 >        assertEquals(Integer.MAX_VALUE,
80 >                     new PriorityBlockingQueue(SIZE).remainingCapacity());
81      }
82  
83      /**
84 <     * Constructor throws IAE if  capacity argument nonpositive
84 >     * Constructor throws IAE if capacity argument nonpositive
85       */
86      public void testConstructor2() {
87          try {
88 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
88 >            new PriorityBlockingQueue(0);
89              shouldThrow();
90 <        }
66 <        catch (IllegalArgumentException success) {}
90 >        } catch (IllegalArgumentException success) {}
91      }
92  
93      /**
# Line 71 | Line 95 | public class PriorityBlockingQueueTest e
95       */
96      public void testConstructor3() {
97          try {
98 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
98 >            new PriorityBlockingQueue(null);
99              shouldThrow();
100 <        }
77 <        catch (NullPointerException success) {}
100 >        } catch (NullPointerException success) {}
101      }
102  
103      /**
104       * Initializing from Collection of null elements throws NPE
105       */
106      public void testConstructor4() {
107 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
108          try {
109 <            Integer[] ints = new Integer[SIZE];
86 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
109 >            new PriorityBlockingQueue(elements);
110              shouldThrow();
111 <        }
89 <        catch (NullPointerException success) {}
111 >        } catch (NullPointerException success) {}
112      }
113  
114      /**
115       * Initializing from Collection with some null elements throws NPE
116       */
117      public void testConstructor5() {
118 +        Integer[] ints = new Integer[SIZE];
119 +        for (int i = 0; i < SIZE - 1; ++i)
120 +            ints[i] = i;
121 +        Collection<Integer> elements = Arrays.asList(ints);
122          try {
123 <            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));
123 >            new PriorityBlockingQueue(elements);
124              shouldThrow();
125 <        }
103 <        catch (NullPointerException success) {}
125 >        } catch (NullPointerException success) {}
126      }
127  
128      /**
129       * Queue contains all elements of collection used to initialize
130       */
131      public void testConstructor6() {
132 <        try {
133 <            Integer[] ints = new Integer[SIZE];
134 <            for (int i = 0; i < SIZE; ++i)
135 <                ints[i] = new Integer(i);
136 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137 <            for (int i = 0; i < SIZE; ++i)
116 <                assertEquals(ints[i], q.poll());
117 <        }
118 <        finally {}
132 >        Integer[] ints = new Integer[SIZE];
133 >        for (int i = 0; i < SIZE; ++i)
134 >            ints[i] = i;
135 >        PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
136 >        for (int i = 0; i < SIZE; ++i)
137 >            assertEquals(ints[i], q.poll());
138      }
139  
140      /**
141       * The comparator used in constructor is used
142       */
143      public void testConstructor7() {
144 <        try {
145 <            MyReverseComparator cmp = new MyReverseComparator();
146 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
147 <            assertEquals(cmp, q.comparator());
148 <            Integer[] ints = new Integer[SIZE];
149 <            for (int i = 0; i < SIZE; ++i)
150 <                ints[i] = new Integer(i);
151 <            q.addAll(Arrays.asList(ints));
152 <            for (int i = SIZE-1; i >= 0; --i)
134 <                assertEquals(ints[i], q.poll());
135 <        }
136 <        finally {}
144 >        MyReverseComparator cmp = new MyReverseComparator();
145 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
146 >        assertEquals(cmp, q.comparator());
147 >        Integer[] ints = new Integer[SIZE];
148 >        for (int i = 0; i < SIZE; ++i)
149 >            ints[i] = new Integer(i);
150 >        q.addAll(Arrays.asList(ints));
151 >        for (int i = SIZE - 1; i >= 0; --i)
152 >            assertEquals(ints[i], q.poll());
153      }
154  
155      /**
# Line 142 | Line 158 | public class PriorityBlockingQueueTest e
158      public void testEmpty() {
159          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
160          assertTrue(q.isEmpty());
161 <        assertEquals(NOCAP, q.remainingCapacity());
161 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
162          q.add(one);
163          assertFalse(q.isEmpty());
164          q.add(two);
# Line 152 | Line 168 | public class PriorityBlockingQueueTest e
168      }
169  
170      /**
171 <     * remainingCapacity does not change when elementa added or removed,
156 <     * but size does
171 >     * remainingCapacity() always returns Integer.MAX_VALUE
172       */
173      public void testRemainingCapacity() {
174 <        PriorityBlockingQueue q = populatedQueue(SIZE);
174 >        BlockingQueue q = populatedQueue(SIZE);
175          for (int i = 0; i < SIZE; ++i) {
176 <            assertEquals(NOCAP, q.remainingCapacity());
177 <            assertEquals(SIZE-i, q.size());
178 <            q.remove();
176 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
177 >            assertEquals(SIZE - i, q.size());
178 >            assertEquals(i, q.remove());
179          }
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(NOCAP, q.remainingCapacity());
181 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
182              assertEquals(i, q.size());
183 <            q.add(new Integer(i));
183 >            assertTrue(q.add(i));
184          }
185      }
186  
187      /**
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    /**
188       * Offer of comparable element succeeds
189       */
190      public void testOffer() {
# Line 204 | Line 197 | public class PriorityBlockingQueueTest e
197       * Offer of non-Comparable throws CCE
198       */
199      public void testOfferNonComparable() {
200 +        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201          try {
208            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
209            q.offer(new Object());
210            q.offer(new Object());
202              q.offer(new Object());
203              shouldThrow();
204 +        } catch (ClassCastException success) {
205 +            assertTrue(q.isEmpty());
206 +            assertEquals(0, q.size());
207 +            assertNull(q.poll());
208          }
214        catch(ClassCastException success) {}
209      }
210  
211      /**
# Line 226 | Line 220 | public class PriorityBlockingQueueTest e
220      }
221  
222      /**
229     * 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    /**
223       * addAll(this) throws IAE
224       */
225      public void testAddAllSelf() {
226 +        PriorityBlockingQueue q = populatedQueue(SIZE);
227          try {
245            PriorityBlockingQueue q = populatedQueue(SIZE);
228              q.addAll(q);
229              shouldThrow();
230 <        }
249 <        catch (IllegalArgumentException success) {}
230 >        } catch (IllegalArgumentException success) {}
231      }
232  
233      /**
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    /**
234       * addAll of a collection with any null elements throws NPE after
235       * possibly adding some elements
236       */
237      public void testAddAll3() {
238 +        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
239 +        Integer[] ints = new Integer[SIZE];
240 +        for (int i = 0; i < SIZE - 1; ++i)
241 +            ints[i] = new Integer(i);
242          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);
243              q.addAll(Arrays.asList(ints));
244              shouldThrow();
245 <        }
277 <        catch (NullPointerException success) {}
245 >        } catch (NullPointerException success) {}
246      }
247  
248      /**
249       * Queue contains all elements of successful addAll
250       */
251      public void testAddAll5() {
252 <        try {
253 <            Integer[] empty = new Integer[0];
254 <            Integer[] ints = new Integer[SIZE];
255 <            for (int i = SIZE-1; i >= 0; --i)
256 <                ints[i] = new Integer(i);
257 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
258 <            assertFalse(q.addAll(Arrays.asList(empty)));
259 <            assertTrue(q.addAll(Arrays.asList(ints)));
260 <            for (int i = 0; i < SIZE; ++i)
293 <                assertEquals(ints[i], q.poll());
294 <        }
295 <        finally {}
252 >        Integer[] empty = new Integer[0];
253 >        Integer[] ints = new Integer[SIZE];
254 >        for (int i = SIZE - 1; i >= 0; --i)
255 >            ints[i] = new Integer(i);
256 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
257 >        assertFalse(q.addAll(Arrays.asList(empty)));
258 >        assertTrue(q.addAll(Arrays.asList(ints)));
259 >        for (int i = 0; i < SIZE; ++i)
260 >            assertEquals(ints[i], q.poll());
261      }
262  
263      /**
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    /**
264       * all elements successfully put are contained
265       */
266 <     public void testPut() {
267 <         try {
268 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
269 <             for (int i = 0; i < SIZE; ++i) {
270 <                 Integer I = new Integer(i);
271 <                 q.put(I);
320 <                 assertTrue(q.contains(I));
321 <             }
322 <             assertEquals(SIZE, q.size());
323 <         }
324 <         finally {
266 >    public void testPut() {
267 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268 >        for (int i = 0; i < SIZE; ++i) {
269 >            Integer x = new Integer(i);
270 >            q.put(x);
271 >            assertTrue(q.contains(x));
272          }
273 +        assertEquals(SIZE, q.size());
274      }
275  
276      /**
277       * put doesn't block waiting for take
278       */
279 <    public void testPutWithTake() {
279 >    public void testPutWithTake() throws InterruptedException {
280          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
281 <        Thread t = new Thread(new Runnable() {
282 <                public void run() {
283 <                    int added = 0;
284 <                    try {
285 <                        q.put(new Integer(0));
286 <                        ++added;
287 <                        q.put(new Integer(0));
288 <                        ++added;
289 <                        q.put(new Integer(0));
290 <                        ++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 <        }
281 >        final int size = 4;
282 >        Thread t = newStartedThread(new CheckedRunnable() {
283 >            public void realRun() {
284 >                for (int i = 0; i < size; i++)
285 >                    q.put(new Integer(0));
286 >            }});
287 >
288 >        awaitTermination(t);
289 >        assertEquals(size, q.size());
290 >        q.take();
291      }
292  
293      /**
294       * timed offer does not time out
295       */
296 <    public void testTimedOffer() {
296 >    public void testTimedOffer() throws InterruptedException {
297          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
298 <        Thread t = new Thread(new Runnable() {
299 <                public void run() {
300 <                    try {
301 <                        q.put(new Integer(0));
302 <                        q.put(new Integer(0));
303 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
304 <                        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 <    }
298 >        Thread t = newStartedThread(new CheckedRunnable() {
299 >            public void realRun() {
300 >                q.put(new Integer(0));
301 >                q.put(new Integer(0));
302 >                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
303 >                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
304 >            }});
305  
306 <    /**
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 <        }  
306 >        awaitTermination(t);
307      }
308  
309      /**
310 <     * take blocks interruptibly when empty
310 >     * take retrieves elements in priority order
311       */
312 <    public void testTakeFromEmpty() {
313 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
314 <        Thread t = new Thread(new Runnable() {
315 <                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();
312 >    public void testTake() throws InterruptedException {
313 >        PriorityBlockingQueue q = populatedQueue(SIZE);
314 >        for (int i = 0; i < SIZE; ++i) {
315 >            assertEquals(i, q.take());
316          }
317      }
318  
319      /**
320       * Take removes existing elements until empty, then blocks interruptibly
321       */
322 <    public void testBlockingTake() {
323 <        Thread t = new Thread(new Runnable() {
324 <                public void run() {
325 <                    try {
326 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
327 <                        for (int i = 0; i < SIZE; ++i) {
328 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
329 <                        }
330 <                        q.take();
331 <                        threadShouldThrow();
332 <                    } catch (InterruptedException success){
333 <                    }  
334 <                }});
335 <        t.start();
336 <        try {
442 <           Thread.sleep(SHORT_DELAY_MS);
443 <           t.interrupt();
444 <           t.join();
445 <        }
446 <        catch (InterruptedException ie) {
447 <            unexpectedException();
448 <        }
449 <    }
322 >    public void testBlockingTake() throws InterruptedException {
323 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
324 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
325 >        Thread t = newStartedThread(new CheckedRunnable() {
326 >            public void realRun() throws InterruptedException {
327 >                for (int i = 0; i < SIZE; ++i) {
328 >                    assertEquals(i, q.take());
329 >                }
330 >
331 >                Thread.currentThread().interrupt();
332 >                try {
333 >                    q.take();
334 >                    shouldThrow();
335 >                } catch (InterruptedException success) {}
336 >                assertFalse(Thread.interrupted());
337  
338 +                pleaseInterrupt.countDown();
339 +                try {
340 +                    q.take();
341 +                    shouldThrow();
342 +                } catch (InterruptedException success) {}
343 +                assertFalse(Thread.interrupted());
344 +            }});
345 +
346 +        await(pleaseInterrupt);
347 +        assertThreadStaysAlive(t);
348 +        t.interrupt();
349 +        awaitTermination(t);
350 +    }
351  
352      /**
353       * poll succeeds unless empty
# Line 455 | Line 355 | public class PriorityBlockingQueueTest e
355      public void testPoll() {
356          PriorityBlockingQueue q = populatedQueue(SIZE);
357          for (int i = 0; i < SIZE; ++i) {
358 <            assertEquals(i, ((Integer)q.poll()).intValue());
358 >            assertEquals(i, q.poll());
359          }
360 <        assertNull(q.poll());
360 >        assertNull(q.poll());
361      }
362  
363      /**
364 <     * timed pool with zero timeout succeeds when non-empty, else times out
364 >     * timed poll with zero timeout succeeds when non-empty, else times out
365       */
366 <    public void testTimedPoll0() {
367 <        try {
368 <            PriorityBlockingQueue q = populatedQueue(SIZE);
369 <            for (int i = 0; i < SIZE; ++i) {
370 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
371 <            }
472 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
473 <        } catch (InterruptedException e){
474 <            unexpectedException();
475 <        }  
366 >    public void testTimedPoll0() throws InterruptedException {
367 >        PriorityBlockingQueue q = populatedQueue(SIZE);
368 >        for (int i = 0; i < SIZE; ++i) {
369 >            assertEquals(i, q.poll(0, MILLISECONDS));
370 >        }
371 >        assertNull(q.poll(0, MILLISECONDS));
372      }
373  
374      /**
375 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
375 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
376       */
377 <    public void testTimedPoll() {
378 <        try {
379 <            PriorityBlockingQueue q = populatedQueue(SIZE);
380 <            for (int i = 0; i < SIZE; ++i) {
381 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
382 <            }
383 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
384 <        } catch (InterruptedException e){
385 <            unexpectedException();
386 <        }  
377 >    public void testTimedPoll() throws InterruptedException {
378 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
379 >        for (int i = 0; i < SIZE; ++i) {
380 >            long startTime = System.nanoTime();
381 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
382 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
383 >        }
384 >        long startTime = System.nanoTime();
385 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
386 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
387 >        checkEmpty(q);
388      }
389  
390      /**
391       * Interrupted timed poll throws InterruptedException instead of
392       * returning timeout status
393       */
394 <    public void testInterruptedTimedPoll() {
395 <        Thread t = new Thread(new Runnable() {
396 <                public void run() {
397 <                    try {
398 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
399 <                        for (int i = 0; i < SIZE; ++i) {
400 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
401 <                        }
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 <    }
519 <
520 <    /**
521 <     *  timed poll before a delayed offer fails; after offer succeeds;
522 <     *  on interruption throws
523 <     */
524 <    public void testTimedPollWithOffer() {
525 <        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) { }                
394 >    public void testInterruptedTimedPoll() throws InterruptedException {
395 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
396 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
397 >        Thread t = newStartedThread(new CheckedRunnable() {
398 >            public void realRun() throws InterruptedException {
399 >                long startTime = System.nanoTime();
400 >                for (int i = 0; i < SIZE; ++i) {
401 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
402                  }
403 <            });
404 <        try {
405 <            t.start();
406 <            Thread.sleep(SMALL_DELAY_MS);
407 <            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
408 <            t.interrupt();
409 <            t.join();
410 <        } catch (Exception e){
543 <            unexpectedException();
544 <        }
545 <    }  
403 >                aboutToWait.countDown();
404 >                try {
405 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
406 >                    shouldThrow();
407 >                } catch (InterruptedException success) {
408 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
409 >                }
410 >            }});
411  
412 +        aboutToWait.await();
413 +        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
414 +        t.interrupt();
415 +        awaitTermination(t);
416 +    }
417  
418      /**
419       * peek returns next element, or null if empty
# Line 551 | Line 421 | public class PriorityBlockingQueueTest e
421      public void testPeek() {
422          PriorityBlockingQueue q = populatedQueue(SIZE);
423          for (int i = 0; i < SIZE; ++i) {
424 <            assertEquals(i, ((Integer)q.peek()).intValue());
425 <            q.poll();
424 >            assertEquals(i, q.peek());
425 >            assertEquals(i, q.poll());
426              assertTrue(q.peek() == null ||
427 <                       i != ((Integer)q.peek()).intValue());
427 >                       !q.peek().equals(i));
428          }
429 <        assertNull(q.peek());
429 >        assertNull(q.peek());
430      }
431  
432      /**
# Line 565 | Line 435 | public class PriorityBlockingQueueTest e
435      public void testElement() {
436          PriorityBlockingQueue q = populatedQueue(SIZE);
437          for (int i = 0; i < SIZE; ++i) {
438 <            assertEquals(i, ((Integer)q.element()).intValue());
439 <            q.poll();
438 >            assertEquals(i, q.element());
439 >            assertEquals(i, q.poll());
440          }
441          try {
442              q.element();
443              shouldThrow();
444 <        }
575 <        catch (NoSuchElementException success) {}
444 >        } catch (NoSuchElementException success) {}
445      }
446  
447      /**
# Line 581 | Line 450 | public class PriorityBlockingQueueTest e
450      public void testRemove() {
451          PriorityBlockingQueue q = populatedQueue(SIZE);
452          for (int i = 0; i < SIZE; ++i) {
453 <            assertEquals(i, ((Integer)q.remove()).intValue());
453 >            assertEquals(i, q.remove());
454          }
455          try {
456              q.remove();
457              shouldThrow();
458 <        } catch (NoSuchElementException success){
590 <        }  
458 >        } catch (NoSuchElementException success) {}
459      }
460  
461      /**
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    /**
462       * contains(x) reports true when elements added but not yet removed
463       */
464      public void testContains() {
# Line 625 | Line 478 | public class PriorityBlockingQueueTest e
478          q.clear();
479          assertTrue(q.isEmpty());
480          assertEquals(0, q.size());
481 <        assertEquals(NOCAP, q.remainingCapacity());
629 <        q.add(new Integer(1));
481 >        q.add(one);
482          assertFalse(q.isEmpty());
483 +        assertTrue(q.contains(one));
484          q.clear();
485          assertTrue(q.isEmpty());
486      }
# Line 660 | Line 513 | public class PriorityBlockingQueueTest e
513                  assertTrue(changed);
514  
515              assertTrue(q.containsAll(p));
516 <            assertEquals(SIZE-i, q.size());
516 >            assertEquals(SIZE - i, q.size());
517              p.remove();
518          }
519      }
# Line 673 | Line 526 | public class PriorityBlockingQueueTest e
526              PriorityBlockingQueue q = populatedQueue(SIZE);
527              PriorityBlockingQueue p = populatedQueue(i);
528              assertTrue(q.removeAll(p));
529 <            assertEquals(SIZE-i, q.size());
529 >            assertEquals(SIZE - i, q.size());
530              for (int j = 0; j < i; ++j) {
531 <                Integer I = (Integer)(p.remove());
532 <                assertFalse(q.contains(I));
531 >                Integer x = (Integer)(p.remove());
532 >                assertFalse(q.contains(x));
533              }
534          }
535      }
536  
537      /**
538 <     *  toArray contains all elements
538 >     * toArray contains all elements
539       */
540 <    public void testToArray() {
540 >    public void testToArray() throws InterruptedException {
541          PriorityBlockingQueue q = populatedQueue(SIZE);
542 <        Object[] o = q.toArray();
542 >        Object[] o = q.toArray();
543          Arrays.sort(o);
544 <        try {
545 <        for(int i = 0; i < o.length; i++)
693 <            assertEquals(o[i], q.take());
694 <        } catch (InterruptedException e){
695 <            unexpectedException();
696 <        }    
544 >        for (int i = 0; i < o.length; i++)
545 >            assertSame(o[i], q.take());
546      }
547  
548      /**
549       * toArray(a) contains all elements
550       */
551 <    public void testToArray2() {
552 <        PriorityBlockingQueue q = populatedQueue(SIZE);
553 <        Integer[] ints = new Integer[SIZE];
554 <        ints = (Integer[])q.toArray(ints);
551 >    public void testToArray2() throws InterruptedException {
552 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
553 >        Integer[] ints = new Integer[SIZE];
554 >        Integer[] array = q.toArray(ints);
555 >        assertSame(ints, array);
556          Arrays.sort(ints);
557 <        try {
558 <            for(int i = 0; i < ints.length; i++)
709 <                assertEquals(ints[i], q.take());
710 <        } catch (InterruptedException e){
711 <            unexpectedException();
712 <        }    
557 >        for (int i = 0; i < ints.length; i++)
558 >            assertSame(ints[i], q.take());
559      }
560  
561      /**
562 <     * 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){}
724 <    }
725 <
726 <    /**
727 <     * toArray with incompatable array type throws CCE
562 >     * toArray(incompatible array type) throws ArrayStoreException
563       */
564      public void testToArray1_BadArg() {
565 <        try {
566 <            PriorityBlockingQueue q = populatedQueue(SIZE);
567 <            Object o[] = q.toArray(new String[10] );
568 <            shouldThrow();
569 <        } catch(ArrayStoreException  success){}
565 >        PriorityBlockingQueue q = populatedQueue(SIZE);
566 >        try {
567 >            q.toArray(new String[10]);
568 >            shouldThrow();
569 >        } catch (ArrayStoreException success) {}
570      }
571 <    
571 >
572      /**
573       * iterator iterates through all elements
574       */
575      public void testIterator() {
576          PriorityBlockingQueue q = populatedQueue(SIZE);
577 <        int i = 0;
578 <        Iterator it = q.iterator();
579 <        while(it.hasNext()) {
577 >        Iterator it = q.iterator();
578 >        int i;
579 >        for (i = 0; it.hasNext(); i++)
580              assertTrue(q.contains(it.next()));
746            ++i;
747        }
581          assertEquals(i, SIZE);
582 +        assertIteratorExhausted(it);
583 +    }
584 +
585 +    /**
586 +     * iterator of empty collection has no elements
587 +     */
588 +    public void testEmptyIterator() {
589 +        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
590      }
591  
592      /**
593       * iterator.remove removes current element
594       */
595 <    public void testIteratorRemove () {
595 >    public void testIteratorRemove() {
596          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
597          q.add(new Integer(2));
598          q.add(new Integer(1));
# Line 767 | Line 608 | public class PriorityBlockingQueueTest e
608          assertFalse(it.hasNext());
609      }
610  
770
611      /**
612       * toString contains toStrings of elements
613       */
# Line 775 | Line 615 | public class PriorityBlockingQueueTest e
615          PriorityBlockingQueue q = populatedQueue(SIZE);
616          String s = q.toString();
617          for (int i = 0; i < SIZE; ++i) {
618 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
618 >            assertTrue(s.contains(String.valueOf(i)));
619          }
620 <    }        
620 >    }
621  
622      /**
623 <     * offer transfers elements across Executor tasks
623 >     * timed poll transfers elements across Executor tasks
624       */
625      public void testPollInExecutor() {
626          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
627 <        ExecutorService executor = Executors.newFixedThreadPool(2);
628 <        executor.execute(new Runnable() {
629 <            public void run() {
630 <                threadAssertNull(q.poll());
631 <                try {
632 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
633 <                    threadAssertTrue(q.isEmpty());
634 <                }
635 <                catch (InterruptedException e) {
636 <                    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 <    }
627 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
628 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
629 >        try (PoolCleaner cleaner = cleaner(executor)) {
630 >            executor.execute(new CheckedRunnable() {
631 >                public void realRun() throws InterruptedException {
632 >                    assertNull(q.poll());
633 >                    threadsStarted.await();
634 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
635 >                    checkEmpty(q);
636 >                }});
637  
638 <    /**
639 <     * drainTo(null) throws NPE
640 <     */
641 <    public void testDrainToNull() {
642 <        PriorityBlockingQueue q = populatedQueue(SIZE);
843 <        try {
844 <            q.drainTo(null);
845 <            shouldThrow();
846 <        } catch(NullPointerException success) {
638 >            executor.execute(new CheckedRunnable() {
639 >                public void realRun() throws InterruptedException {
640 >                    threadsStarted.await();
641 >                    q.put(one);
642 >                }});
643          }
644      }
645  
646      /**
647 <     * drainTo(this) throws IAE
648 <     */
649 <    public void testDrainToSelf() {
650 <        PriorityBlockingQueue q = populatedQueue(SIZE);
651 <        try {
652 <            q.drainTo(q);
653 <            shouldThrow();
654 <        } catch(IllegalArgumentException success) {
647 >     * A deserialized serialized queue has same elements
648 >     */
649 >    public void testSerialization() throws Exception {
650 >        Queue x = populatedQueue(SIZE);
651 >        Queue y = serialClone(x);
652 >
653 >        assertNotSame(x, y);
654 >        assertEquals(x.size(), y.size());
655 >        while (!x.isEmpty()) {
656 >            assertFalse(y.isEmpty());
657 >            assertEquals(x.remove(), y.remove());
658          }
659 +        assertTrue(y.isEmpty());
660      }
661  
662      /**
663       * drainTo(c) empties queue into another collection c
664 <     */
664 >     */
665      public void testDrainTo() {
666          PriorityBlockingQueue q = populatedQueue(SIZE);
667          ArrayList l = new ArrayList();
668          q.drainTo(l);
669 <        assertEquals(q.size(), 0);
670 <        assertEquals(l.size(), SIZE);
671 <        for (int i = 0; i < SIZE; ++i)
669 >        assertEquals(0, q.size());
670 >        assertEquals(SIZE, l.size());
671 >        for (int i = 0; i < SIZE; ++i)
672 >            assertEquals(l.get(i), new Integer(i));
673 >        q.add(zero);
674 >        q.add(one);
675 >        assertFalse(q.isEmpty());
676 >        assertTrue(q.contains(zero));
677 >        assertTrue(q.contains(one));
678 >        l.clear();
679 >        q.drainTo(l);
680 >        assertEquals(0, q.size());
681 >        assertEquals(2, l.size());
682 >        for (int i = 0; i < 2; ++i)
683              assertEquals(l.get(i), new Integer(i));
684      }
685  
686      /**
687       * drainTo empties queue
688 <     */
689 <    public void testDrainToWithActivePut() {
688 >     */
689 >    public void testDrainToWithActivePut() throws InterruptedException {
690          final PriorityBlockingQueue q = populatedQueue(SIZE);
691 <        Thread t = new Thread(new Runnable() {
692 <                public void run() {
693 <                    q.put(new Integer(SIZE+1));
694 <                }
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 <    }
691 >        Thread t = new Thread(new CheckedRunnable() {
692 >            public void realRun() {
693 >                q.put(new Integer(SIZE + 1));
694 >            }});
695  
696 <    /**
697 <     * drainTo(null, n) throws NPE
698 <     */
699 <    public void testDrainToNullN() {
700 <        PriorityBlockingQueue q = populatedQueue(SIZE);
701 <        try {
702 <            q.drainTo(null, 0);
703 <            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 <        }
696 >        t.start();
697 >        ArrayList l = new ArrayList();
698 >        q.drainTo(l);
699 >        assertTrue(l.size() >= SIZE);
700 >        for (int i = 0; i < SIZE; ++i)
701 >            assertEquals(l.get(i), new Integer(i));
702 >        t.join();
703 >        assertTrue(q.size() + l.size() >= SIZE);
704      }
705  
706      /**
707 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
708 <     */
707 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
708 >     */
709      public void testDrainToN() {
710 +        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
711          for (int i = 0; i < SIZE + 2; ++i) {
712 <            PriorityBlockingQueue q = populatedQueue(SIZE);
712 >            for (int j = 0; j < SIZE; j++)
713 >                assertTrue(q.offer(new Integer(j)));
714              ArrayList l = new ArrayList();
715              q.drainTo(l, i);
716 <            int k = (i < SIZE)? i : SIZE;
717 <            assertEquals(q.size(), SIZE-k);
718 <            assertEquals(l.size(), k);
719 <            for (int j = 0; j < k; ++j)
720 <                assertTrue(l.contains(new Integer(j)));
716 >            int k = (i < SIZE) ? i : SIZE;
717 >            assertEquals(k, l.size());
718 >            assertEquals(SIZE - k, q.size());
719 >            for (int j = 0; j < k; ++j)
720 >                assertEquals(l.get(j), new Integer(j));
721 >            do {} while (q.poll() != null);
722          }
723      }
724  
725 +    /**
726 +     * remove(null), contains(null) always return false
727 +     */
728 +    public void testNeverContainsNull() {
729 +        Collection<?>[] qs = {
730 +            new PriorityBlockingQueue<Object>(),
731 +            populatedQueue(2),
732 +        };
733 +
734 +        for (Collection<?> q : qs) {
735 +            assertFalse(q.contains(null));
736 +            assertFalse(q.remove(null));
737 +        }
738 +    }
739  
740   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines