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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines