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.12 by jsr166, Mon Nov 2 20:28:31 2009 UTC vs.
Revision 1.73 by jsr166, Sat May 13 21:43:51 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) {
434 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
435 <                        }
436 <                        q.take();
437 <                        threadShouldThrow();
438 <                    } catch (InterruptedException success){
439 <                    }
440 <                }});
441 <        t.start();
442 <        try {
443 <           Thread.sleep(SHORT_DELAY_MS);
444 <           t.interrupt();
445 <           t.join();
446 <        }
447 <        catch (InterruptedException ie) {
448 <            unexpectedException();
449 <        }
450 <    }
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++) assertEquals(i, q.take());
337  
338 +                Thread.currentThread().interrupt();
339 +                try {
340 +                    q.take();
341 +                    shouldThrow();
342 +                } catch (InterruptedException success) {}
343 +                assertFalse(Thread.interrupted());
344 +
345 +                pleaseInterrupt.countDown();
346 +                try {
347 +                    q.take();
348 +                    shouldThrow();
349 +                } catch (InterruptedException success) {}
350 +                assertFalse(Thread.interrupted());
351 +            }});
352 +
353 +        await(pleaseInterrupt);
354 +        assertThreadBlocks(t, Thread.State.WAITING);
355 +        t.interrupt();
356 +        awaitTermination(t);
357 +    }
358  
359      /**
360       * poll succeeds unless empty
# Line 456 | Line 362 | public class PriorityBlockingQueueTest e
362      public void testPoll() {
363          PriorityBlockingQueue q = populatedQueue(SIZE);
364          for (int i = 0; i < SIZE; ++i) {
365 <            assertEquals(i, ((Integer)q.poll()).intValue());
365 >            assertEquals(i, q.poll());
366          }
367 <        assertNull(q.poll());
367 >        assertNull(q.poll());
368      }
369  
370      /**
371 <     * timed pool with zero timeout succeeds when non-empty, else times out
371 >     * timed poll with zero timeout succeeds when non-empty, else times out
372       */
373 <    public void testTimedPoll0() {
374 <        try {
375 <            PriorityBlockingQueue q = populatedQueue(SIZE);
376 <            for (int i = 0; i < SIZE; ++i) {
377 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
378 <            }
473 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474 <        } catch (InterruptedException e){
475 <            unexpectedException();
476 <        }
373 >    public void testTimedPoll0() throws InterruptedException {
374 >        PriorityBlockingQueue q = populatedQueue(SIZE);
375 >        for (int i = 0; i < SIZE; ++i) {
376 >            assertEquals(i, q.poll(0, MILLISECONDS));
377 >        }
378 >        assertNull(q.poll(0, MILLISECONDS));
379      }
380  
381      /**
382 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
382 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
383       */
384 <    public void testTimedPoll() {
385 <        try {
386 <            PriorityBlockingQueue q = populatedQueue(SIZE);
387 <            for (int i = 0; i < SIZE; ++i) {
388 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
389 <            }
390 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
391 <        } catch (InterruptedException e){
392 <            unexpectedException();
393 <        }
384 >    public void testTimedPoll() throws InterruptedException {
385 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
386 >        for (int i = 0; i < SIZE; ++i) {
387 >            long startTime = System.nanoTime();
388 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
389 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
390 >        }
391 >        long startTime = System.nanoTime();
392 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
393 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
394 >        checkEmpty(q);
395      }
396  
397      /**
398       * Interrupted timed poll throws InterruptedException instead of
399       * returning timeout status
400       */
401 <    public void testInterruptedTimedPoll() {
402 <        Thread t = new Thread(new Runnable() {
403 <                public void run() {
404 <                    try {
405 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
406 <                        for (int i = 0; i < SIZE; ++i) {
407 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
408 <                        }
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) { }
401 >    public void testInterruptedTimedPoll() throws InterruptedException {
402 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
403 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
404 >        Thread t = newStartedThread(new CheckedRunnable() {
405 >            public void realRun() throws InterruptedException {
406 >                long startTime = System.nanoTime();
407 >                for (int i = 0; i < SIZE; ++i) {
408 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
409                  }
410 <            });
411 <        try {
412 <            t.start();
413 <            Thread.sleep(SMALL_DELAY_MS);
414 <            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
415 <            t.interrupt();
416 <            t.join();
417 <        } catch (Exception e){
544 <            unexpectedException();
545 <        }
546 <    }
410 >                aboutToWait.countDown();
411 >                try {
412 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
413 >                    shouldThrow();
414 >                } catch (InterruptedException success) {
415 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
416 >                }
417 >            }});
418  
419 +        await(aboutToWait);
420 +        waitForThreadToEnterWaitState(t);
421 +        t.interrupt();
422 +        awaitTermination(t);
423 +    }
424  
425      /**
426       * peek returns next element, or null if empty
# Line 552 | Line 428 | public class PriorityBlockingQueueTest e
428      public void testPeek() {
429          PriorityBlockingQueue q = populatedQueue(SIZE);
430          for (int i = 0; i < SIZE; ++i) {
431 <            assertEquals(i, ((Integer)q.peek()).intValue());
432 <            q.poll();
431 >            assertEquals(i, q.peek());
432 >            assertEquals(i, q.poll());
433              assertTrue(q.peek() == null ||
434 <                       i != ((Integer)q.peek()).intValue());
434 >                       !q.peek().equals(i));
435          }
436 <        assertNull(q.peek());
436 >        assertNull(q.peek());
437      }
438  
439      /**
# Line 566 | Line 442 | public class PriorityBlockingQueueTest e
442      public void testElement() {
443          PriorityBlockingQueue q = populatedQueue(SIZE);
444          for (int i = 0; i < SIZE; ++i) {
445 <            assertEquals(i, ((Integer)q.element()).intValue());
446 <            q.poll();
445 >            assertEquals(i, q.element());
446 >            assertEquals(i, q.poll());
447          }
448          try {
449              q.element();
450              shouldThrow();
451 <        }
576 <        catch (NoSuchElementException success) {}
451 >        } catch (NoSuchElementException success) {}
452      }
453  
454      /**
# Line 582 | Line 457 | public class PriorityBlockingQueueTest e
457      public void testRemove() {
458          PriorityBlockingQueue q = populatedQueue(SIZE);
459          for (int i = 0; i < SIZE; ++i) {
460 <            assertEquals(i, ((Integer)q.remove()).intValue());
460 >            assertEquals(i, q.remove());
461          }
462          try {
463              q.remove();
464              shouldThrow();
465 <        } 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());
465 >        } catch (NoSuchElementException success) {}
466      }
467  
468      /**
# Line 661 | Line 520 | public class PriorityBlockingQueueTest e
520                  assertTrue(changed);
521  
522              assertTrue(q.containsAll(p));
523 <            assertEquals(SIZE-i, q.size());
523 >            assertEquals(SIZE - i, q.size());
524              p.remove();
525          }
526      }
# Line 674 | Line 533 | public class PriorityBlockingQueueTest e
533              PriorityBlockingQueue q = populatedQueue(SIZE);
534              PriorityBlockingQueue p = populatedQueue(i);
535              assertTrue(q.removeAll(p));
536 <            assertEquals(SIZE-i, q.size());
536 >            assertEquals(SIZE - i, q.size());
537              for (int j = 0; j < i; ++j) {
538 <                Integer I = (Integer)(p.remove());
539 <                assertFalse(q.contains(I));
538 >                Integer x = (Integer)(p.remove());
539 >                assertFalse(q.contains(x));
540              }
541          }
542      }
543  
544      /**
545 <     *  toArray contains all elements
545 >     * toArray contains all elements
546       */
547 <    public void testToArray() {
547 >    public void testToArray() throws InterruptedException {
548          PriorityBlockingQueue q = populatedQueue(SIZE);
549 <        Object[] o = q.toArray();
549 >        Object[] o = q.toArray();
550          Arrays.sort(o);
551 <        try {
552 <        for(int i = 0; i < o.length; i++)
694 <            assertEquals(o[i], q.take());
695 <        } catch (InterruptedException e){
696 <            unexpectedException();
697 <        }
551 >        for (int i = 0; i < o.length; i++)
552 >            assertSame(o[i], q.take());
553      }
554  
555      /**
556       * toArray(a) contains all elements
557       */
558 <    public void testToArray2() {
559 <        PriorityBlockingQueue q = populatedQueue(SIZE);
560 <        Integer[] ints = new Integer[SIZE];
561 <        ints = (Integer[])q.toArray(ints);
558 >    public void testToArray2() throws InterruptedException {
559 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
560 >        Integer[] ints = new Integer[SIZE];
561 >        Integer[] array = q.toArray(ints);
562 >        assertSame(ints, array);
563          Arrays.sort(ints);
564 <        try {
565 <            for(int i = 0; i < ints.length; i++)
710 <                assertEquals(ints[i], q.take());
711 <        } catch (InterruptedException e){
712 <            unexpectedException();
713 <        }
564 >        for (int i = 0; i < ints.length; i++)
565 >            assertSame(ints[i], q.take());
566      }
567  
568      /**
569 <     * 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
569 >     * toArray(incompatible array type) throws ArrayStoreException
570       */
571      public void testToArray1_BadArg() {
572 <        try {
573 <            PriorityBlockingQueue q = populatedQueue(SIZE);
574 <            Object o[] = q.toArray(new String[10] );
575 <            shouldThrow();
576 <        } catch(ArrayStoreException  success){}
572 >        PriorityBlockingQueue q = populatedQueue(SIZE);
573 >        try {
574 >            q.toArray(new String[10]);
575 >            shouldThrow();
576 >        } catch (ArrayStoreException success) {}
577      }
578  
579      /**
# Line 740 | Line 581 | public class PriorityBlockingQueueTest e
581       */
582      public void testIterator() {
583          PriorityBlockingQueue q = populatedQueue(SIZE);
584 <        int i = 0;
585 <        Iterator it = q.iterator();
586 <        while(it.hasNext()) {
584 >        Iterator it = q.iterator();
585 >        int i;
586 >        for (i = 0; it.hasNext(); i++)
587              assertTrue(q.contains(it.next()));
747            ++i;
748        }
588          assertEquals(i, SIZE);
589 +        assertIteratorExhausted(it);
590 +    }
591 +
592 +    /**
593 +     * iterator of empty collection has no elements
594 +     */
595 +    public void testEmptyIterator() {
596 +        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
597      }
598  
599      /**
600       * iterator.remove removes current element
601       */
602 <    public void testIteratorRemove () {
602 >    public void testIteratorRemove() {
603          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
604          q.add(new Integer(2));
605          q.add(new Integer(1));
# Line 768 | Line 615 | public class PriorityBlockingQueueTest e
615          assertFalse(it.hasNext());
616      }
617  
771
618      /**
619       * toString contains toStrings of elements
620       */
# Line 776 | Line 622 | public class PriorityBlockingQueueTest e
622          PriorityBlockingQueue q = populatedQueue(SIZE);
623          String s = q.toString();
624          for (int i = 0; i < SIZE; ++i) {
625 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
625 >            assertTrue(s.contains(String.valueOf(i)));
626          }
627      }
628  
629      /**
630 <     * offer transfers elements across Executor tasks
630 >     * timed poll transfers elements across Executor tasks
631       */
632      public void testPollInExecutor() {
633          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
634 <        ExecutorService executor = Executors.newFixedThreadPool(2);
635 <        executor.execute(new Runnable() {
636 <            public void run() {
637 <                threadAssertNull(q.poll());
638 <                try {
639 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
640 <                    threadAssertTrue(q.isEmpty());
641 <                }
642 <                catch (InterruptedException e) {
643 <                    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 <    }
634 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
635 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
636 >        try (PoolCleaner cleaner = cleaner(executor)) {
637 >            executor.execute(new CheckedRunnable() {
638 >                public void realRun() throws InterruptedException {
639 >                    assertNull(q.poll());
640 >                    threadsStarted.await();
641 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
642 >                    checkEmpty(q);
643 >                }});
644  
645 <    /**
646 <     * drainTo(null) throws NPE
647 <     */
648 <    public void testDrainToNull() {
649 <        PriorityBlockingQueue q = populatedQueue(SIZE);
844 <        try {
845 <            q.drainTo(null);
846 <            shouldThrow();
847 <        } catch(NullPointerException success) {
645 >            executor.execute(new CheckedRunnable() {
646 >                public void realRun() throws InterruptedException {
647 >                    threadsStarted.await();
648 >                    q.put(one);
649 >                }});
650          }
651      }
652  
653      /**
654 <     * drainTo(this) throws IAE
654 >     * A deserialized serialized queue has same elements
655       */
656 <    public void testDrainToSelf() {
657 <        PriorityBlockingQueue q = populatedQueue(SIZE);
658 <        try {
659 <            q.drainTo(q);
660 <            shouldThrow();
661 <        } catch(IllegalArgumentException success) {
656 >    public void testSerialization() throws Exception {
657 >        Queue x = populatedQueue(SIZE);
658 >        Queue y = serialClone(x);
659 >
660 >        assertNotSame(x, y);
661 >        assertEquals(x.size(), y.size());
662 >        while (!x.isEmpty()) {
663 >            assertFalse(y.isEmpty());
664 >            assertEquals(x.remove(), y.remove());
665          }
666 +        assertTrue(y.isEmpty());
667      }
668  
669      /**
# Line 867 | Line 673 | public class PriorityBlockingQueueTest e
673          PriorityBlockingQueue q = populatedQueue(SIZE);
674          ArrayList l = new ArrayList();
675          q.drainTo(l);
676 <        assertEquals(q.size(), 0);
677 <        assertEquals(l.size(), SIZE);
676 >        assertEquals(0, q.size());
677 >        assertEquals(SIZE, l.size());
678          for (int i = 0; i < SIZE; ++i)
679              assertEquals(l.get(i), new Integer(i));
680          q.add(zero);
# Line 878 | Line 684 | public class PriorityBlockingQueueTest e
684          assertTrue(q.contains(one));
685          l.clear();
686          q.drainTo(l);
687 <        assertEquals(q.size(), 0);
688 <        assertEquals(l.size(), 2);
687 >        assertEquals(0, q.size());
688 >        assertEquals(2, l.size());
689          for (int i = 0; i < 2; ++i)
690              assertEquals(l.get(i), new Integer(i));
691      }
# Line 887 | Line 693 | public class PriorityBlockingQueueTest e
693      /**
694       * drainTo empties queue
695       */
696 <    public void testDrainToWithActivePut() {
696 >    public void testDrainToWithActivePut() throws InterruptedException {
697          final PriorityBlockingQueue q = populatedQueue(SIZE);
698 <        Thread t = new Thread(new Runnable() {
699 <                public void run() {
700 <                    q.put(new Integer(SIZE+1));
701 <                }
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 <    }
698 >        Thread t = new Thread(new CheckedRunnable() {
699 >            public void realRun() {
700 >                q.put(new Integer(SIZE + 1));
701 >            }});
702  
703 <    /**
704 <     * drainTo(null, n) throws NPE
705 <     */
706 <    public void testDrainToNullN() {
707 <        PriorityBlockingQueue q = populatedQueue(SIZE);
708 <        try {
709 <            q.drainTo(null, 0);
710 <            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 <        }
703 >        t.start();
704 >        ArrayList l = new ArrayList();
705 >        q.drainTo(l);
706 >        assertTrue(l.size() >= SIZE);
707 >        for (int i = 0; i < SIZE; ++i)
708 >            assertEquals(l.get(i), new Integer(i));
709 >        t.join();
710 >        assertTrue(q.size() + l.size() >= SIZE);
711      }
712  
713      /**
714 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
714 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
715       */
716      public void testDrainToN() {
717 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
717 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
718          for (int i = 0; i < SIZE + 2; ++i) {
719 <            for(int j = 0; j < SIZE; j++)
719 >            for (int j = 0; j < SIZE; j++)
720                  assertTrue(q.offer(new Integer(j)));
721              ArrayList l = new ArrayList();
722              q.drainTo(l, i);
723 <            int k = (i < SIZE)? i : SIZE;
724 <            assertEquals(l.size(), k);
725 <            assertEquals(q.size(), SIZE-k);
723 >            int k = (i < SIZE) ? i : SIZE;
724 >            assertEquals(k, l.size());
725 >            assertEquals(SIZE - k, q.size());
726              for (int j = 0; j < k; ++j)
727                  assertEquals(l.get(j), new Integer(j));
728 <            while (q.poll() != null) ;
728 >            do {} while (q.poll() != null);
729          }
730      }
731  
732 +    /**
733 +     * remove(null), contains(null) always return false
734 +     */
735 +    public void testNeverContainsNull() {
736 +        Collection<?>[] qs = {
737 +            new PriorityBlockingQueue<Object>(),
738 +            populatedQueue(2),
739 +        };
740 +
741 +        for (Collection<?> q : qs) {
742 +            assertFalse(q.contains(null));
743 +            assertFalse(q.remove(null));
744 +        }
745 +    }
746  
747   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines