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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines