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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines