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.5 by dl, Sat Sep 20 18:20:08 2003 UTC vs.
Revision 1.24 by jsr166, Sun Nov 22 18:57:17 2009 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
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 static java.util.concurrent.TimeUnit.MILLISECONDS;
13   import java.io.*;
14  
15   public class PriorityBlockingQueueTest extends JSR166TestCase {
16      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());  
17 >        junit.textui.TestRunner.run (suite());
18      }
17
19      public static Test suite() {
20 <        return new TestSuite(PriorityBlockingQueueTest.class);
20 >        return new TestSuite(PriorityBlockingQueueTest.class);
21      }
22  
23      private static final int NOCAP = Integer.MAX_VALUE;
24  
25      /** Sample Comparator */
26 <    static class MyReverseComparator implements Comparator {
26 >    static class MyReverseComparator implements Comparator {
27          public int compare(Object x, Object y) {
28 <            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;
28 >            return ((Comparable)y).compareTo(x);
29          }
30      }
31  
35
32      /**
33       * Create a queue of given size containing consecutive
34       * Integers 0 ... n.
# Line 40 | Line 36 | public class PriorityBlockingQueueTest e
36      private PriorityBlockingQueue populatedQueue(int n) {
37          PriorityBlockingQueue q = new PriorityBlockingQueue(n);
38          assertTrue(q.isEmpty());
39 <        for(int i = n-1; i >= 0; i-=2)
40 <            assertTrue(q.offer(new Integer(i)));
41 <        for(int i = (n & 1); i < n; i+=2)
42 <            assertTrue(q.offer(new Integer(i)));
39 >        for (int i = n-1; i >= 0; i-=2)
40 >            assertTrue(q.offer(new Integer(i)));
41 >        for (int i = (n & 1); i < n; i+=2)
42 >            assertTrue(q.offer(new Integer(i)));
43          assertFalse(q.isEmpty());
44          assertEquals(NOCAP, q.remainingCapacity());
45 <        assertEquals(n, q.size());
45 >        assertEquals(n, q.size());
46          return q;
47      }
48 <
48 >
49      /**
50 <     *
50 >     * A new queue has unbounded capacity
51       */
52      public void testConstructor1() {
53          assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
54      }
55  
56      /**
57 <     *
57 >     * Constructor throws IAE if capacity argument nonpositive
58       */
59      public void testConstructor2() {
60          try {
61              PriorityBlockingQueue q = new PriorityBlockingQueue(0);
62              shouldThrow();
63 <        }
68 <        catch (IllegalArgumentException success) {}
63 >        } catch (IllegalArgumentException success) {}
64      }
65  
66      /**
67 <     *
67 >     * Initializing from null Collection throws NPE
68       */
69      public void testConstructor3() {
75
70          try {
71              PriorityBlockingQueue q = new PriorityBlockingQueue(null);
72              shouldThrow();
73 <        }
80 <        catch (NullPointerException success) {}
73 >        } catch (NullPointerException success) {}
74      }
75  
76      /**
77 <     *
77 >     * Initializing from Collection of null elements throws NPE
78       */
79      public void testConstructor4() {
80          try {
81              Integer[] ints = new Integer[SIZE];
82              PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
83              shouldThrow();
84 <        }
92 <        catch (NullPointerException success) {}
84 >        } catch (NullPointerException success) {}
85      }
86  
87      /**
88 <     *
88 >     * Initializing from Collection with some null elements throws NPE
89       */
90      public void testConstructor5() {
91          try {
# Line 102 | Line 94 | public class PriorityBlockingQueueTest e
94                  ints[i] = new Integer(i);
95              PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
96              shouldThrow();
97 <        }
106 <        catch (NullPointerException success) {}
97 >        } catch (NullPointerException success) {}
98      }
99  
100      /**
101 <     *
101 >     * Queue contains all elements of collection used to initialize
102       */
103      public void testConstructor6() {
104 <        try {
105 <            Integer[] ints = new Integer[SIZE];
106 <            for (int i = 0; i < SIZE; ++i)
107 <                ints[i] = new Integer(i);
108 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
109 <            for (int i = 0; i < SIZE; ++i)
119 <                assertEquals(ints[i], q.poll());
120 <        }
121 <        finally {}
104 >        Integer[] ints = new Integer[SIZE];
105 >        for (int i = 0; i < SIZE; ++i)
106 >            ints[i] = new Integer(i);
107 >        PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108 >        for (int i = 0; i < SIZE; ++i)
109 >            assertEquals(ints[i], q.poll());
110      }
111  
112      /**
113 <     *
113 >     * The comparator used in constructor is used
114       */
115      public void testConstructor7() {
116 <        try {
117 <            MyReverseComparator cmp = new MyReverseComparator();
118 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
119 <            assertEquals(cmp, q.comparator());
120 <            Integer[] ints = new Integer[SIZE];
121 <            for (int i = 0; i < SIZE; ++i)
122 <                ints[i] = new Integer(i);
123 <            q.addAll(Arrays.asList(ints));
124 <            for (int i = SIZE-1; i >= 0; --i)
137 <                assertEquals(ints[i], q.poll());
138 <        }
139 <        finally {}
116 >        MyReverseComparator cmp = new MyReverseComparator();
117 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
118 >        assertEquals(cmp, q.comparator());
119 >        Integer[] ints = new Integer[SIZE];
120 >        for (int i = 0; i < SIZE; ++i)
121 >            ints[i] = new Integer(i);
122 >        q.addAll(Arrays.asList(ints));
123 >        for (int i = SIZE-1; i >= 0; --i)
124 >            assertEquals(ints[i], q.poll());
125      }
126  
127      /**
128 <     *
128 >     * isEmpty is true before add, false after
129       */
130      public void testEmpty() {
131          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
132          assertTrue(q.isEmpty());
133          assertEquals(NOCAP, q.remainingCapacity());
134 <        q.add(new Integer(1));
134 >        q.add(one);
135          assertFalse(q.isEmpty());
136 <        q.add(new Integer(2));
136 >        q.add(two);
137          q.remove();
138          q.remove();
139          assertTrue(q.isEmpty());
140      }
141  
142      /**
143 <     *
143 >     * remainingCapacity does not change when elements added or removed,
144 >     * but size does
145       */
146      public void testRemainingCapacity() {
147          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 172 | Line 158 | public class PriorityBlockingQueueTest e
158      }
159  
160      /**
161 <     *
161 >     * offer(null) throws NPE
162       */
163      public void testOfferNull() {
164 <        try {
164 >        try {
165              PriorityBlockingQueue q = new PriorityBlockingQueue(1);
166              q.offer(null);
167              shouldThrow();
168 <        } catch (NullPointerException success) { }  
168 >        } catch (NullPointerException success) {}
169 >    }
170 >
171 >    /**
172 >     * add(null) throws NPE
173 >     */
174 >    public void testAddNull() {
175 >        try {
176 >            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
177 >            q.add(null);
178 >            shouldThrow();
179 >        } catch (NullPointerException success) {}
180      }
181  
182      /**
183 <     *
183 >     * Offer of comparable element succeeds
184       */
185      public void testOffer() {
186          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
187 <        assertTrue(q.offer(new Integer(0)));
188 <        assertTrue(q.offer(new Integer(1)));
187 >        assertTrue(q.offer(zero));
188 >        assertTrue(q.offer(one));
189      }
190  
191      /**
192 <     *
192 >     * Offer of non-Comparable throws CCE
193       */
194      public void testOfferNonComparable() {
195          try {
# Line 201 | Line 198 | public class PriorityBlockingQueueTest e
198              q.offer(new Object());
199              q.offer(new Object());
200              shouldThrow();
201 <        }
205 <        catch(ClassCastException success) {}
201 >        } catch (ClassCastException success) {}
202      }
203  
204      /**
205 <     *
205 >     * add of comparable succeeds
206       */
207      public void testAdd() {
208          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
# Line 217 | Line 213 | public class PriorityBlockingQueueTest e
213      }
214  
215      /**
216 <     *
216 >     * addAll(null) throws NPE
217       */
218      public void testAddAll1() {
219          try {
220              PriorityBlockingQueue q = new PriorityBlockingQueue(1);
221              q.addAll(null);
222              shouldThrow();
223 <        }
224 <        catch (NullPointerException success) {}
223 >        } catch (NullPointerException success) {}
224 >    }
225 >
226 >    /**
227 >     * addAll(this) throws IAE
228 >     */
229 >    public void testAddAllSelf() {
230 >        try {
231 >            PriorityBlockingQueue q = populatedQueue(SIZE);
232 >            q.addAll(q);
233 >            shouldThrow();
234 >        } catch (IllegalArgumentException success) {}
235      }
236 +
237      /**
238 <     *
238 >     * addAll of a collection with null elements throws NPE
239       */
240      public void testAddAll2() {
241          try {
# Line 236 | Line 243 | public class PriorityBlockingQueueTest e
243              Integer[] ints = new Integer[SIZE];
244              q.addAll(Arrays.asList(ints));
245              shouldThrow();
246 <        }
240 <        catch (NullPointerException success) {}
246 >        } catch (NullPointerException success) {}
247      }
248      /**
249 <     *
249 >     * addAll of a collection with any null elements throws NPE after
250 >     * possibly adding some elements
251       */
252      public void testAddAll3() {
253          try {
# Line 250 | Line 257 | public class PriorityBlockingQueueTest e
257                  ints[i] = new Integer(i);
258              q.addAll(Arrays.asList(ints));
259              shouldThrow();
260 <        }
254 <        catch (NullPointerException success) {}
260 >        } catch (NullPointerException success) {}
261      }
262  
263      /**
264 <     *
264 >     * Queue contains all elements of successful addAll
265       */
266      public void testAddAll5() {
267 <        try {
268 <            Integer[] empty = new Integer[0];
269 <            Integer[] ints = new Integer[SIZE];
270 <            for (int i = SIZE-1; i >= 0; --i)
271 <                ints[i] = new Integer(i);
272 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
273 <            assertFalse(q.addAll(Arrays.asList(empty)));
274 <            assertTrue(q.addAll(Arrays.asList(ints)));
275 <            for (int i = 0; i < SIZE; ++i)
270 <                assertEquals(ints[i], q.poll());
271 <        }
272 <        finally {}
267 >        Integer[] empty = new Integer[0];
268 >        Integer[] ints = new Integer[SIZE];
269 >        for (int i = SIZE-1; i >= 0; --i)
270 >            ints[i] = new Integer(i);
271 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
272 >        assertFalse(q.addAll(Arrays.asList(empty)));
273 >        assertTrue(q.addAll(Arrays.asList(ints)));
274 >        for (int i = 0; i < SIZE; ++i)
275 >            assertEquals(ints[i], q.poll());
276      }
277  
278      /**
279 <     *
279 >     * put(null) throws NPE
280       */
281       public void testPutNull() {
282 <        try {
282 >        try {
283              PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
284              q.put(null);
285              shouldThrow();
286 <        }
284 <        catch (NullPointerException success){
285 <        }  
286 >        } catch (NullPointerException success) {}
287       }
288  
289      /**
290 <     *
290 >     * all elements successfully put are contained
291       */
292       public void testPut() {
293 <         try {
294 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
295 <             for (int i = 0; i < SIZE; ++i) {
296 <                 Integer I = new Integer(i);
297 <                 q.put(I);
297 <                 assertTrue(q.contains(I));
298 <             }
299 <             assertEquals(SIZE, q.size());
293 >         PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
294 >         for (int i = 0; i < SIZE; ++i) {
295 >             Integer I = new Integer(i);
296 >             q.put(I);
297 >             assertTrue(q.contains(I));
298           }
299 <         finally {
302 <        }
299 >         assertEquals(SIZE, q.size());
300      }
301  
302      /**
303 <     *
303 >     * put doesn't block waiting for take
304       */
305 <    public void testPutWithTake() {
305 >    public void testPutWithTake() throws InterruptedException {
306          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
307 <        Thread t = new Thread(new Runnable() {
308 <                public void run() {
309 <                    int added = 0;
310 <                    try {
311 <                        q.put(new Integer(0));
312 <                        ++added;
313 <                        q.put(new Integer(0));
314 <                        ++added;
315 <                        q.put(new Integer(0));
316 <                        ++added;
317 <                        q.put(new Integer(0));
318 <                        ++added;
319 <                        threadAssertTrue(added == 4);
323 <                    } finally {
324 <                    }
325 <                }
326 <            });
327 <        try {
328 <            t.start();
329 <            Thread.sleep(SHORT_DELAY_MS);
330 <            q.take();
331 <            t.interrupt();
332 <            t.join();
333 <        } catch (Exception e){
334 <            unexpectedException();
335 <        }
307 >        final int size = 4;
308 >        Thread t = new Thread(new CheckedRunnable() {
309 >            public void realRun() {
310 >                for (int i = 0; i < size; i++)
311 >                    q.put(new Integer(0));
312 >            }});
313 >
314 >        t.start();
315 >        Thread.sleep(SHORT_DELAY_MS);
316 >        assertEquals(q.size(), size);
317 >        q.take();
318 >        t.interrupt();
319 >        t.join();
320      }
321  
322      /**
323 <     *
323 >     * timed offer does not time out
324       */
325 <    public void testTimedOffer() {
325 >    public void testTimedOffer() throws InterruptedException {
326          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
327 <        Thread t = new Thread(new Runnable() {
328 <                public void run() {
329 <                    try {
330 <                        q.put(new Integer(0));
331 <                        q.put(new Integer(0));
332 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
333 <                        threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
334 <                    } finally { }
335 <                }
336 <            });
337 <        
338 <        try {
355 <            t.start();
356 <            Thread.sleep(SMALL_DELAY_MS);
357 <            t.interrupt();
358 <            t.join();
359 <        } catch (Exception e){
360 <            unexpectedException();
361 <        }
327 >        Thread t = new Thread(new CheckedRunnable() {
328 >            public void realRun() {
329 >                q.put(new Integer(0));
330 >                q.put(new Integer(0));
331 >                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
332 >                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
333 >            }});
334 >
335 >        t.start();
336 >        Thread.sleep(SMALL_DELAY_MS);
337 >        t.interrupt();
338 >        t.join();
339      }
340  
341      /**
342 <     *
342 >     * take retrieves elements in priority order
343       */
344 <    public void testTake() {
345 <        try {
346 <            PriorityBlockingQueue q = populatedQueue(SIZE);
347 <            for (int i = 0; i < SIZE; ++i) {
348 <                assertEquals(i, ((Integer)q.take()).intValue());
372 <            }
373 <        } catch (InterruptedException e){
374 <            unexpectedException();
375 <        }  
344 >    public void testTake() throws InterruptedException {
345 >        PriorityBlockingQueue q = populatedQueue(SIZE);
346 >        for (int i = 0; i < SIZE; ++i) {
347 >            assertEquals(i, q.take());
348 >        }
349      }
350  
351      /**
352 <     *
352 >     * take blocks interruptibly when empty
353       */
354 <    public void testTakeFromEmpty() {
354 >    public void testTakeFromEmpty() throws InterruptedException {
355          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
356 <        Thread t = new Thread(new Runnable() {
357 <                public void run() {
358 <                    try {
359 <                        q.take();
360 <                        threadShouldThrow();
361 <                    } catch (InterruptedException success){ }                
362 <                }
363 <            });
364 <        try {
392 <            t.start();
393 <            Thread.sleep(SHORT_DELAY_MS);
394 <            t.interrupt();
395 <            t.join();
396 <        } catch (Exception e){
397 <            unexpectedException();
398 <        }
356 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
357 >            public void realRun() throws InterruptedException {
358 >                q.take();
359 >            }});
360 >
361 >        t.start();
362 >        Thread.sleep(SHORT_DELAY_MS);
363 >        t.interrupt();
364 >        t.join();
365      }
366  
367      /**
368 <     *
369 <     */
370 <    public void testBlockingTake() {
371 <        Thread t = new Thread(new Runnable() {
372 <                public void run() {
373 <                    try {
374 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
375 <                        for (int i = 0; i < SIZE; ++i) {
376 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
377 <                        }
378 <                        q.take();
379 <                        threadShouldThrow();
380 <                    } catch (InterruptedException success){
381 <                    }  
382 <                }});
368 >     * Take removes existing elements until empty, then blocks interruptibly
369 >     */
370 >    public void testBlockingTake() throws InterruptedException {
371 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
372 >        Thread t = new Thread(new CheckedRunnable() {
373 >            public void realRun() throws InterruptedException {
374 >                for (int i = 0; i < SIZE; ++i) {
375 >                    assertEquals(i, q.take());
376 >                }
377 >                try {
378 >                    q.take();
379 >                    shouldThrow();
380 >                } catch (InterruptedException success) {}
381 >            }});
382 >
383          t.start();
384 <        try {
385 <           Thread.sleep(SHORT_DELAY_MS);
386 <           t.interrupt();
421 <           t.join();
422 <        }
423 <        catch (InterruptedException ie) {
424 <            unexpectedException();
425 <        }
384 >        Thread.sleep(SHORT_DELAY_MS);
385 >        t.interrupt();
386 >        t.join();
387      }
388  
389  
390      /**
391 <     *
391 >     * poll succeeds unless empty
392       */
393      public void testPoll() {
394          PriorityBlockingQueue q = populatedQueue(SIZE);
395          for (int i = 0; i < SIZE; ++i) {
396 <            assertEquals(i, ((Integer)q.poll()).intValue());
396 >            assertEquals(i, q.poll());
397          }
398 <        assertNull(q.poll());
398 >        assertNull(q.poll());
399      }
400  
401      /**
402 <     *
402 >     * timed pool with zero timeout succeeds when non-empty, else times out
403       */
404 <    public void testTimedPoll0() {
405 <        try {
406 <            PriorityBlockingQueue q = populatedQueue(SIZE);
407 <            for (int i = 0; i < SIZE; ++i) {
408 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
409 <            }
449 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
450 <        } catch (InterruptedException e){
451 <            unexpectedException();
452 <        }  
404 >    public void testTimedPoll0() throws InterruptedException {
405 >        PriorityBlockingQueue q = populatedQueue(SIZE);
406 >        for (int i = 0; i < SIZE; ++i) {
407 >            assertEquals(i, q.poll(0, MILLISECONDS));
408 >        }
409 >        assertNull(q.poll(0, MILLISECONDS));
410      }
411  
412      /**
413 <     *
413 >     * timed pool with nonzero timeout succeeds when non-empty, else times out
414       */
415 <    public void testTimedPoll() {
416 <        try {
417 <            PriorityBlockingQueue q = populatedQueue(SIZE);
418 <            for (int i = 0; i < SIZE; ++i) {
419 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
420 <            }
464 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
465 <        } catch (InterruptedException e){
466 <            unexpectedException();
467 <        }  
415 >    public void testTimedPoll() throws InterruptedException {
416 >        PriorityBlockingQueue q = populatedQueue(SIZE);
417 >        for (int i = 0; i < SIZE; ++i) {
418 >            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
419 >        }
420 >        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
421      }
422  
423      /**
424 <     *
425 <     */
426 <    public void testInterruptedTimedPoll() {
427 <        Thread t = new Thread(new Runnable() {
428 <                public void run() {
429 <                    try {
430 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
431 <                        for (int i = 0; i < SIZE; ++i) {
432 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
433 <                        }
434 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
435 <                    } catch (InterruptedException success){
436 <                    }  
437 <                }});
424 >     * Interrupted timed poll throws InterruptedException instead of
425 >     * returning timeout status
426 >     */
427 >    public void testInterruptedTimedPoll() throws InterruptedException {
428 >        Thread t = new Thread(new CheckedRunnable() {
429 >            public void realRun() throws InterruptedException {
430 >                PriorityBlockingQueue q = populatedQueue(SIZE);
431 >                for (int i = 0; i < SIZE; ++i) {
432 >                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
433 >                }
434 >                try {
435 >                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
436 >                    shouldThrow();
437 >                } catch (InterruptedException success) {}
438 >            }});
439 >
440          t.start();
441 <        try {
442 <           Thread.sleep(SHORT_DELAY_MS);
443 <           t.interrupt();
489 <           t.join();
490 <        }
491 <        catch (InterruptedException ie) {
492 <            unexpectedException();
493 <        }
441 >        Thread.sleep(SHORT_DELAY_MS);
442 >        t.interrupt();
443 >        t.join();
444      }
445  
446      /**
447 <     *
447 >     *  timed poll before a delayed offer fails; after offer succeeds;
448 >     *  on interruption throws
449       */
450 <    public void testTimedPollWithOffer() {
450 >    public void testTimedPollWithOffer() throws InterruptedException {
451          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
452 <        Thread t = new Thread(new Runnable() {
453 <                public void run() {
454 <                    try {
455 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
456 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
457 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
458 <                        threadShouldThrow();
459 <                    } catch (InterruptedException success) { }                
460 <                }
461 <            });
462 <        try {
463 <            t.start();
464 <            Thread.sleep(SMALL_DELAY_MS);
465 <            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
466 <            t.interrupt();
467 <            t.join();
517 <        } catch (Exception e){
518 <            unexpectedException();
519 <        }
520 <    }  
452 >        Thread t = new Thread(new CheckedRunnable() {
453 >            public void realRun() throws InterruptedException {
454 >                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
455 >                assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
456 >                try {
457 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
458 >                    shouldThrow();
459 >                } catch (InterruptedException success) {}
460 >            }});
461 >
462 >        t.start();
463 >        Thread.sleep(SMALL_DELAY_MS);
464 >        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
465 >        t.interrupt();
466 >        t.join();
467 >    }
468  
469  
470      /**
471 <     *
471 >     * peek returns next element, or null if empty
472       */
473      public void testPeek() {
474          PriorityBlockingQueue q = populatedQueue(SIZE);
475          for (int i = 0; i < SIZE; ++i) {
476 <            assertEquals(i, ((Integer)q.peek()).intValue());
477 <            q.poll();
476 >            assertEquals(i, q.peek());
477 >            assertEquals(i, q.poll());
478              assertTrue(q.peek() == null ||
479 <                       i != ((Integer)q.peek()).intValue());
479 >                       !q.peek().equals(i));
480          }
481 <        assertNull(q.peek());
481 >        assertNull(q.peek());
482      }
483  
484      /**
485 <     *
485 >     * element returns next element, or throws NSEE if empty
486       */
487      public void testElement() {
488          PriorityBlockingQueue q = populatedQueue(SIZE);
489          for (int i = 0; i < SIZE; ++i) {
490 <            assertEquals(i, ((Integer)q.element()).intValue());
491 <            q.poll();
490 >            assertEquals(i, q.element());
491 >            assertEquals(i, q.poll());
492          }
493          try {
494              q.element();
495              shouldThrow();
496 <        }
550 <        catch (NoSuchElementException success) {}
496 >        } catch (NoSuchElementException success) {}
497      }
498  
499      /**
500 <     *
500 >     * remove removes next element, or throws NSEE if empty
501       */
502      public void testRemove() {
503          PriorityBlockingQueue q = populatedQueue(SIZE);
504          for (int i = 0; i < SIZE; ++i) {
505 <            assertEquals(i, ((Integer)q.remove()).intValue());
505 >            assertEquals(i, q.remove());
506          }
507          try {
508              q.remove();
509              shouldThrow();
510 <        } catch (NoSuchElementException success){
565 <        }  
510 >        } catch (NoSuchElementException success) {}
511      }
512  
513      /**
514 <     *
514 >     * remove(x) removes x and returns true if present
515       */
516      public void testRemoveElement() {
517          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 579 | Line 524 | public class PriorityBlockingQueueTest e
524          }
525          assertTrue(q.isEmpty());
526      }
527 <        
527 >
528      /**
529 <     *
529 >     * contains(x) reports true when elements added but not yet removed
530       */
531      public void testContains() {
532          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 593 | Line 538 | public class PriorityBlockingQueueTest e
538      }
539  
540      /**
541 <     *
541 >     * clear removes all elements
542       */
543      public void testClear() {
544          PriorityBlockingQueue q = populatedQueue(SIZE);
545          q.clear();
546          assertTrue(q.isEmpty());
547          assertEquals(0, q.size());
548 <        assertEquals(NOCAP, q.remainingCapacity());
604 <        q.add(new Integer(1));
548 >        q.add(one);
549          assertFalse(q.isEmpty());
550 +        assertTrue(q.contains(one));
551          q.clear();
552          assertTrue(q.isEmpty());
553      }
554  
555      /**
556 <     *
556 >     * containsAll(c) is true when c contains a subset of elements
557       */
558      public void testContainsAll() {
559          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 622 | Line 567 | public class PriorityBlockingQueueTest e
567      }
568  
569      /**
570 <     *
570 >     * retainAll(c) retains only those elements of c and reports true if changed
571       */
572      public void testRetainAll() {
573          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 641 | Line 586 | public class PriorityBlockingQueueTest e
586      }
587  
588      /**
589 <     *
589 >     * removeAll(c) removes only those elements of c and reports true if changed
590       */
591      public void testRemoveAll() {
592          for (int i = 1; i < SIZE; ++i) {
# Line 657 | Line 602 | public class PriorityBlockingQueueTest e
602      }
603  
604      /**
605 <     *
605 >     *  toArray contains all elements
606       */
607 <    public void testToArray() {
607 >    public void testToArray() throws InterruptedException {
608          PriorityBlockingQueue q = populatedQueue(SIZE);
609 <        Object[] o = q.toArray();
609 >        Object[] o = q.toArray();
610          Arrays.sort(o);
611 <        try {
612 <        for(int i = 0; i < o.length; i++)
668 <            assertEquals(o[i], q.take());
669 <        } catch (InterruptedException e){
670 <            unexpectedException();
671 <        }    
611 >        for (int i = 0; i < o.length; i++)
612 >            assertEquals(o[i], q.take());
613      }
614  
615      /**
616 <     *
616 >     * toArray(a) contains all elements
617       */
618 <    public void testToArray2() {
618 >    public void testToArray2() throws InterruptedException {
619          PriorityBlockingQueue q = populatedQueue(SIZE);
620 <        Integer[] ints = new Integer[SIZE];
621 <        ints = (Integer[])q.toArray(ints);
620 >        Integer[] ints = new Integer[SIZE];
621 >        ints = (Integer[])q.toArray(ints);
622          Arrays.sort(ints);
623 <        try {
624 <            for(int i = 0; i < ints.length; i++)
625 <                assertEquals(ints[i], q.take());
626 <        } catch (InterruptedException e){
627 <            unexpectedException();
628 <        }    
623 >        for (int i = 0; i < ints.length; i++)
624 >            assertEquals(ints[i], q.take());
625 >    }
626 >
627 >    /**
628 >     * toArray(null) throws NPE
629 >     */
630 >    public void testToArray_BadArg() {
631 >        PriorityBlockingQueue q = populatedQueue(SIZE);
632 >        try {
633 >            Object o[] = q.toArray(null);
634 >            shouldThrow();
635 >        } catch (NullPointerException success) {}
636      }
637 <    
637 >
638      /**
639 <     *
639 >     * toArray with incompatible array type throws CCE
640 >     */
641 >    public void testToArray1_BadArg() {
642 >        PriorityBlockingQueue q = populatedQueue(SIZE);
643 >        try {
644 >            Object o[] = q.toArray(new String[10]);
645 >            shouldThrow();
646 >        } catch (ArrayStoreException success) {}
647 >    }
648 >
649 >    /**
650 >     * iterator iterates through all elements
651       */
652      public void testIterator() {
653          PriorityBlockingQueue q = populatedQueue(SIZE);
654          int i = 0;
655 <        Iterator it = q.iterator();
656 <        while(it.hasNext()) {
655 >        Iterator it = q.iterator();
656 >        while (it.hasNext()) {
657              assertTrue(q.contains(it.next()));
658              ++i;
659          }
# Line 702 | Line 661 | public class PriorityBlockingQueueTest e
661      }
662  
663      /**
664 <     *
664 >     * iterator.remove removes current element
665       */
666      public void testIteratorRemove () {
667          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
# Line 722 | Line 681 | public class PriorityBlockingQueueTest e
681  
682  
683      /**
684 <     *
684 >     * toString contains toStrings of elements
685       */
686      public void testToString() {
687          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 730 | Line 689 | public class PriorityBlockingQueueTest e
689          for (int i = 0; i < SIZE; ++i) {
690              assertTrue(s.indexOf(String.valueOf(i)) >= 0);
691          }
692 <    }        
692 >    }
693  
694      /**
695 <     *
695 >     * offer transfers elements across Executor tasks
696       */
697      public void testPollInExecutor() {
739
698          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
741
699          ExecutorService executor = Executors.newFixedThreadPool(2);
700 <
701 <        executor.execute(new Runnable() {
745 <            public void run() {
700 >        executor.execute(new CheckedRunnable() {
701 >            public void realRun() throws InterruptedException {
702                  threadAssertNull(q.poll());
703 <                try {
704 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
705 <                    threadAssertTrue(q.isEmpty());
706 <                }
707 <                catch (InterruptedException e) {
708 <                    threadUnexpectedException();
709 <                }
710 <            }
711 <        });
703 >                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
704 >                threadAssertTrue(q.isEmpty());
705 >            }});
706 >
707 >        executor.execute(new CheckedRunnable() {
708 >            public void realRun() throws InterruptedException {
709 >                Thread.sleep(SMALL_DELAY_MS);
710 >                q.put(new Integer(1));
711 >            }});
712  
757        executor.execute(new Runnable() {
758            public void run() {
759                try {
760                    Thread.sleep(SMALL_DELAY_MS);
761                    q.put(new Integer(1));
762                }
763                catch (InterruptedException e) {
764                    threadUnexpectedException();
765                }
766            }
767        });
768        
713          joinPool(executor);
714 +    }
715 +
716 +    /**
717 +     * A deserialized serialized queue has same elements
718 +     */
719 +    public void testSerialization() throws Exception {
720 +        PriorityBlockingQueue q = populatedQueue(SIZE);
721 +        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
722 +        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
723 +        out.writeObject(q);
724 +        out.close();
725  
726 +        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
727 +        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
728 +        PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
729 +        assertEquals(q.size(), r.size());
730 +        while (!q.isEmpty())
731 +            assertEquals(q.remove(), r.remove());
732 +    }
733 +
734 +    /**
735 +     * drainTo(null) throws NPE
736 +     */
737 +    public void testDrainToNull() {
738 +        PriorityBlockingQueue q = populatedQueue(SIZE);
739 +        try {
740 +            q.drainTo(null);
741 +            shouldThrow();
742 +        } catch (NullPointerException success) {}
743      }
744  
745      /**
746 <     *
746 >     * drainTo(this) throws IAE
747       */
748 <    public void testSerialization() {
748 >    public void testDrainToSelf() {
749          PriorityBlockingQueue q = populatedQueue(SIZE);
750          try {
751 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
752 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
753 <            out.writeObject(q);
754 <            out.close();
755 <
756 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
757 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
758 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
759 <            assertEquals(q.size(), r.size());
760 <            while (!q.isEmpty())
761 <                assertEquals(q.remove(), r.remove());
762 <        } catch(Exception e){
763 <            unexpectedException();
751 >            q.drainTo(q);
752 >            shouldThrow();
753 >        } catch (IllegalArgumentException success) {}
754 >    }
755 >
756 >    /**
757 >     * drainTo(c) empties queue into another collection c
758 >     */
759 >    public void testDrainTo() {
760 >        PriorityBlockingQueue q = populatedQueue(SIZE);
761 >        ArrayList l = new ArrayList();
762 >        q.drainTo(l);
763 >        assertEquals(q.size(), 0);
764 >        assertEquals(l.size(), SIZE);
765 >        for (int i = 0; i < SIZE; ++i)
766 >            assertEquals(l.get(i), new Integer(i));
767 >        q.add(zero);
768 >        q.add(one);
769 >        assertFalse(q.isEmpty());
770 >        assertTrue(q.contains(zero));
771 >        assertTrue(q.contains(one));
772 >        l.clear();
773 >        q.drainTo(l);
774 >        assertEquals(q.size(), 0);
775 >        assertEquals(l.size(), 2);
776 >        for (int i = 0; i < 2; ++i)
777 >            assertEquals(l.get(i), new Integer(i));
778 >    }
779 >
780 >    /**
781 >     * drainTo empties queue
782 >     */
783 >    public void testDrainToWithActivePut() throws InterruptedException {
784 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
785 >        Thread t = new Thread(new CheckedRunnable() {
786 >            public void realRun() {
787 >                q.put(new Integer(SIZE+1));
788 >            }});
789 >
790 >        t.start();
791 >        ArrayList l = new ArrayList();
792 >        q.drainTo(l);
793 >        assertTrue(l.size() >= SIZE);
794 >        for (int i = 0; i < SIZE; ++i)
795 >            assertEquals(l.get(i), new Integer(i));
796 >        t.join();
797 >        assertTrue(q.size() + l.size() >= SIZE);
798 >    }
799 >
800 >    /**
801 >     * drainTo(null, n) throws NPE
802 >     */
803 >    public void testDrainToNullN() {
804 >        PriorityBlockingQueue q = populatedQueue(SIZE);
805 >        try {
806 >            q.drainTo(null, 0);
807 >            shouldThrow();
808 >        } catch (NullPointerException success) {}
809 >    }
810 >
811 >    /**
812 >     * drainTo(this, n) throws IAE
813 >     */
814 >    public void testDrainToSelfN() {
815 >        PriorityBlockingQueue q = populatedQueue(SIZE);
816 >        try {
817 >            q.drainTo(q, 0);
818 >            shouldThrow();
819 >        } catch (IllegalArgumentException success) {}
820 >    }
821 >
822 >    /**
823 >     * drainTo(c, n) empties first max {n, size} elements of queue into c
824 >     */
825 >    public void testDrainToN() {
826 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
827 >        for (int i = 0; i < SIZE + 2; ++i) {
828 >            for (int j = 0; j < SIZE; j++)
829 >                assertTrue(q.offer(new Integer(j)));
830 >            ArrayList l = new ArrayList();
831 >            q.drainTo(l, i);
832 >            int k = (i < SIZE)? i : SIZE;
833 >            assertEquals(l.size(), k);
834 >            assertEquals(q.size(), SIZE-k);
835 >            for (int j = 0; j < k; ++j)
836 >                assertEquals(l.get(j), new Integer(j));
837 >            while (q.poll() != null) ;
838          }
839      }
840  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines