ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.14 by jsr166, Mon Nov 16 05:30:08 2009 UTC vs.
Revision 1.71 by jsr166, Sat Mar 11 18:20:47 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines