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.27 by jsr166, Wed Aug 25 01:44:48 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      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());  
17 >        junit.textui.TestRunner.run(suite());
18      }
17
19      public static Test suite() {
20 <        return new TestSuite(PriorityBlockingQueueTest.class);
20 >        return new TestSuite(PriorityBlockingQueueTest.class);
21      }
22  
23      private static final int NOCAP = Integer.MAX_VALUE;
24  
25      /** Sample Comparator */
26 <    static class MyReverseComparator implements Comparator {
26 >    static class MyReverseComparator implements Comparator {
27          public int compare(Object x, Object y) {
28 <            int i = ((Integer)x).intValue();
28 <            int j = ((Integer)y).intValue();
29 <            if (i < j) return 1;
30 <            if (i > j) return -1;
31 <            return 0;
28 >            return ((Comparable)y).compareTo(x);
29          }
30      }
31  
35
32      /**
33       * Create a queue of given size containing consecutive
34       * Integers 0 ... n.
# Line 40 | Line 36 | public class PriorityBlockingQueueTest e
36      private PriorityBlockingQueue populatedQueue(int n) {
37          PriorityBlockingQueue q = new PriorityBlockingQueue(n);
38          assertTrue(q.isEmpty());
39 <        for(int i = n-1; i >= 0; i-=2)
40 <            assertTrue(q.offer(new Integer(i)));
41 <        for(int i = (n & 1); i < n; i+=2)
42 <            assertTrue(q.offer(new Integer(i)));
39 >        for (int i = n-1; i >= 0; i-=2)
40 >            assertTrue(q.offer(new Integer(i)));
41 >        for (int i = (n & 1); i < n; i+=2)
42 >            assertTrue(q.offer(new Integer(i)));
43          assertFalse(q.isEmpty());
44          assertEquals(NOCAP, q.remainingCapacity());
45 <        assertEquals(n, q.size());
45 >        assertEquals(n, q.size());
46          return q;
47      }
48 <
48 >
49      /**
50 <     *
50 >     * A new queue has unbounded capacity
51       */
52      public void testConstructor1() {
53          assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
54      }
55  
56      /**
57 <     *
57 >     * Constructor throws IAE if capacity argument nonpositive
58       */
59      public void testConstructor2() {
60          try {
61              PriorityBlockingQueue q = new PriorityBlockingQueue(0);
62              shouldThrow();
63 <        }
68 <        catch (IllegalArgumentException success) {}
63 >        } catch (IllegalArgumentException success) {}
64      }
65  
66      /**
67 <     *
67 >     * Initializing from null Collection throws NPE
68       */
69      public void testConstructor3() {
75
70          try {
71              PriorityBlockingQueue q = new PriorityBlockingQueue(null);
72              shouldThrow();
73 <        }
80 <        catch (NullPointerException success) {}
73 >        } catch (NullPointerException success) {}
74      }
75  
76      /**
77 <     *
77 >     * Initializing from Collection of null elements throws NPE
78       */
79      public void testConstructor4() {
80          try {
81              Integer[] ints = new Integer[SIZE];
82              PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
83              shouldThrow();
84 <        }
92 <        catch (NullPointerException success) {}
84 >        } catch (NullPointerException success) {}
85      }
86  
87      /**
88 <     *
88 >     * Initializing from Collection with some null elements throws NPE
89       */
90      public void testConstructor5() {
91          try {
# Line 102 | Line 94 | public class PriorityBlockingQueueTest e
94                  ints[i] = new Integer(i);
95              PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
96              shouldThrow();
97 <        }
106 <        catch (NullPointerException success) {}
97 >        } catch (NullPointerException success) {}
98      }
99  
100      /**
101 <     *
101 >     * Queue contains all elements of collection used to initialize
102       */
103      public void testConstructor6() {
104 <        try {
105 <            Integer[] ints = new Integer[SIZE];
106 <            for (int i = 0; i < SIZE; ++i)
107 <                ints[i] = new Integer(i);
108 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
109 <            for (int i = 0; i < SIZE; ++i)
119 <                assertEquals(ints[i], q.poll());
120 <        }
121 <        finally {}
104 >        Integer[] ints = new Integer[SIZE];
105 >        for (int i = 0; i < SIZE; ++i)
106 >            ints[i] = new Integer(i);
107 >        PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108 >        for (int i = 0; i < SIZE; ++i)
109 >            assertEquals(ints[i], q.poll());
110      }
111  
112      /**
113 <     *
113 >     * The comparator used in constructor is used
114       */
115      public void testConstructor7() {
116 <        try {
117 <            MyReverseComparator cmp = new MyReverseComparator();
118 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
119 <            assertEquals(cmp, q.comparator());
120 <            Integer[] ints = new Integer[SIZE];
121 <            for (int i = 0; i < SIZE; ++i)
122 <                ints[i] = new Integer(i);
123 <            q.addAll(Arrays.asList(ints));
124 <            for (int i = SIZE-1; i >= 0; --i)
137 <                assertEquals(ints[i], q.poll());
138 <        }
139 <        finally {}
116 >        MyReverseComparator cmp = new MyReverseComparator();
117 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
118 >        assertEquals(cmp, q.comparator());
119 >        Integer[] ints = new Integer[SIZE];
120 >        for (int i = 0; i < SIZE; ++i)
121 >            ints[i] = new Integer(i);
122 >        q.addAll(Arrays.asList(ints));
123 >        for (int i = SIZE-1; i >= 0; --i)
124 >            assertEquals(ints[i], q.poll());
125      }
126  
127      /**
128 <     *
128 >     * isEmpty is true before add, false after
129       */
130      public void testEmpty() {
131          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
132          assertTrue(q.isEmpty());
133          assertEquals(NOCAP, q.remainingCapacity());
134 <        q.add(new Integer(1));
134 >        q.add(one);
135          assertFalse(q.isEmpty());
136 <        q.add(new Integer(2));
136 >        q.add(two);
137          q.remove();
138          q.remove();
139          assertTrue(q.isEmpty());
140      }
141  
142      /**
143 <     *
143 >     * remainingCapacity does not change when elements added or removed,
144 >     * but size does
145       */
146      public void testRemainingCapacity() {
147          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 172 | Line 158 | public class PriorityBlockingQueueTest e
158      }
159  
160      /**
161 <     *
161 >     * offer(null) throws NPE
162       */
163      public void testOfferNull() {
164 <        try {
164 >        try {
165              PriorityBlockingQueue q = new PriorityBlockingQueue(1);
166              q.offer(null);
167              shouldThrow();
168 <        } catch (NullPointerException success) { }  
168 >        } catch (NullPointerException success) {}
169 >    }
170 >
171 >    /**
172 >     * add(null) throws NPE
173 >     */
174 >    public void testAddNull() {
175 >        try {
176 >            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
177 >            q.add(null);
178 >            shouldThrow();
179 >        } catch (NullPointerException success) {}
180      }
181  
182      /**
183 <     *
183 >     * Offer of comparable element succeeds
184       */
185      public void testOffer() {
186          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
187 <        assertTrue(q.offer(new Integer(0)));
188 <        assertTrue(q.offer(new Integer(1)));
187 >        assertTrue(q.offer(zero));
188 >        assertTrue(q.offer(one));
189      }
190  
191      /**
192 <     *
192 >     * Offer of non-Comparable throws CCE
193       */
194      public void testOfferNonComparable() {
195          try {
# Line 201 | Line 198 | public class PriorityBlockingQueueTest e
198              q.offer(new Object());
199              q.offer(new Object());
200              shouldThrow();
201 <        }
205 <        catch(ClassCastException success) {}
201 >        } catch (ClassCastException success) {}
202      }
203  
204      /**
205 <     *
205 >     * add of comparable succeeds
206       */
207      public void testAdd() {
208          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
# Line 217 | Line 213 | public class PriorityBlockingQueueTest e
213      }
214  
215      /**
216 <     *
216 >     * addAll(null) throws NPE
217       */
218      public void testAddAll1() {
219          try {
220              PriorityBlockingQueue q = new PriorityBlockingQueue(1);
221              q.addAll(null);
222              shouldThrow();
223 <        }
224 <        catch (NullPointerException success) {}
223 >        } catch (NullPointerException success) {}
224 >    }
225 >
226 >    /**
227 >     * addAll(this) throws IAE
228 >     */
229 >    public void testAddAllSelf() {
230 >        try {
231 >            PriorityBlockingQueue q = populatedQueue(SIZE);
232 >            q.addAll(q);
233 >            shouldThrow();
234 >        } catch (IllegalArgumentException success) {}
235      }
236 +
237      /**
238 <     *
238 >     * addAll of a collection with null elements throws NPE
239       */
240      public void testAddAll2() {
241          try {
# Line 236 | Line 243 | public class PriorityBlockingQueueTest e
243              Integer[] ints = new Integer[SIZE];
244              q.addAll(Arrays.asList(ints));
245              shouldThrow();
246 <        }
240 <        catch (NullPointerException success) {}
246 >        } catch (NullPointerException success) {}
247      }
248 +
249      /**
250 <     *
250 >     * addAll of a collection with any null elements throws NPE after
251 >     * possibly adding some elements
252       */
253      public void testAddAll3() {
254          try {
# Line 250 | Line 258 | public class PriorityBlockingQueueTest e
258                  ints[i] = new Integer(i);
259              q.addAll(Arrays.asList(ints));
260              shouldThrow();
261 <        }
254 <        catch (NullPointerException success) {}
261 >        } catch (NullPointerException success) {}
262      }
263  
264      /**
265 <     *
265 >     * Queue contains all elements of successful addAll
266       */
267      public void testAddAll5() {
268 <        try {
269 <            Integer[] empty = new Integer[0];
270 <            Integer[] ints = new Integer[SIZE];
271 <            for (int i = SIZE-1; i >= 0; --i)
272 <                ints[i] = new Integer(i);
273 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
274 <            assertFalse(q.addAll(Arrays.asList(empty)));
275 <            assertTrue(q.addAll(Arrays.asList(ints)));
276 <            for (int i = 0; i < SIZE; ++i)
270 <                assertEquals(ints[i], q.poll());
271 <        }
272 <        finally {}
268 >        Integer[] empty = new Integer[0];
269 >        Integer[] ints = new Integer[SIZE];
270 >        for (int i = SIZE-1; i >= 0; --i)
271 >            ints[i] = new Integer(i);
272 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
273 >        assertFalse(q.addAll(Arrays.asList(empty)));
274 >        assertTrue(q.addAll(Arrays.asList(ints)));
275 >        for (int i = 0; i < SIZE; ++i)
276 >            assertEquals(ints[i], q.poll());
277      }
278  
279      /**
280 <     *
280 >     * put(null) throws NPE
281       */
282       public void testPutNull() {
283 <        try {
283 >        try {
284              PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
285              q.put(null);
286              shouldThrow();
287 <        }
284 <        catch (NullPointerException success){
285 <        }  
287 >        } catch (NullPointerException success) {}
288       }
289  
290      /**
291 <     *
291 >     * all elements successfully put are contained
292       */
293       public void testPut() {
294 <         try {
295 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
296 <             for (int i = 0; i < SIZE; ++i) {
297 <                 Integer I = new Integer(i);
298 <                 q.put(I);
297 <                 assertTrue(q.contains(I));
298 <             }
299 <             assertEquals(SIZE, q.size());
294 >         PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
295 >         for (int i = 0; i < SIZE; ++i) {
296 >             Integer I = new Integer(i);
297 >             q.put(I);
298 >             assertTrue(q.contains(I));
299           }
300 <         finally {
302 <        }
300 >         assertEquals(SIZE, q.size());
301      }
302  
303      /**
304 <     *
304 >     * put doesn't block waiting for take
305       */
306 <    public void testPutWithTake() {
306 >    public void testPutWithTake() throws InterruptedException {
307          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
308 <        Thread t = new Thread(new Runnable() {
309 <                public void run() {
310 <                    int added = 0;
311 <                    try {
312 <                        q.put(new Integer(0));
313 <                        ++added;
314 <                        q.put(new Integer(0));
315 <                        ++added;
316 <                        q.put(new Integer(0));
317 <                        ++added;
318 <                        q.put(new Integer(0));
319 <                        ++added;
320 <                        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 <        }
308 >        final int size = 4;
309 >        Thread t = new Thread(new CheckedRunnable() {
310 >            public void realRun() {
311 >                for (int i = 0; i < size; i++)
312 >                    q.put(new Integer(0));
313 >            }});
314 >
315 >        t.start();
316 >        Thread.sleep(SHORT_DELAY_MS);
317 >        assertEquals(q.size(), size);
318 >        q.take();
319 >        t.interrupt();
320 >        t.join();
321      }
322  
323      /**
324 <     *
324 >     * timed offer does not time out
325       */
326 <    public void testTimedOffer() {
326 >    public void testTimedOffer() throws InterruptedException {
327          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
328 <        Thread t = new Thread(new Runnable() {
329 <                public void run() {
330 <                    try {
331 <                        q.put(new Integer(0));
332 <                        q.put(new Integer(0));
333 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
334 <                        threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
335 <                    } finally { }
336 <                }
337 <            });
338 <        
339 <        try {
355 <            t.start();
356 <            Thread.sleep(SMALL_DELAY_MS);
357 <            t.interrupt();
358 <            t.join();
359 <        } catch (Exception e){
360 <            unexpectedException();
361 <        }
328 >        Thread t = new Thread(new CheckedRunnable() {
329 >            public void realRun() {
330 >                q.put(new Integer(0));
331 >                q.put(new Integer(0));
332 >                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
333 >                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
334 >            }});
335 >
336 >        t.start();
337 >        Thread.sleep(SMALL_DELAY_MS);
338 >        t.interrupt();
339 >        t.join();
340      }
341  
342      /**
343 <     *
343 >     * take retrieves elements in priority order
344       */
345 <    public void testTake() {
346 <        try {
347 <            PriorityBlockingQueue q = populatedQueue(SIZE);
348 <            for (int i = 0; i < SIZE; ++i) {
349 <                assertEquals(i, ((Integer)q.take()).intValue());
372 <            }
373 <        } catch (InterruptedException e){
374 <            unexpectedException();
375 <        }  
345 >    public void testTake() throws InterruptedException {
346 >        PriorityBlockingQueue q = populatedQueue(SIZE);
347 >        for (int i = 0; i < SIZE; ++i) {
348 >            assertEquals(i, q.take());
349 >        }
350      }
351  
352      /**
353 <     *
353 >     * take blocks interruptibly when empty
354       */
355 <    public void testTakeFromEmpty() {
355 >    public void testTakeFromEmpty() throws InterruptedException {
356          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
357 <        Thread t = new Thread(new Runnable() {
358 <                public void run() {
359 <                    try {
360 <                        q.take();
361 <                        threadShouldThrow();
362 <                    } catch (InterruptedException success){ }                
363 <                }
364 <            });
365 <        try {
392 <            t.start();
393 <            Thread.sleep(SHORT_DELAY_MS);
394 <            t.interrupt();
395 <            t.join();
396 <        } catch (Exception e){
397 <            unexpectedException();
398 <        }
357 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
358 >            public void realRun() throws InterruptedException {
359 >                q.take();
360 >            }});
361 >
362 >        t.start();
363 >        Thread.sleep(SHORT_DELAY_MS);
364 >        t.interrupt();
365 >        t.join();
366      }
367  
368      /**
369 <     *
370 <     */
371 <    public void testBlockingTake() {
372 <        Thread t = new Thread(new Runnable() {
373 <                public void run() {
374 <                    try {
375 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
376 <                        for (int i = 0; i < SIZE; ++i) {
377 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
378 <                        }
379 <                        q.take();
380 <                        threadShouldThrow();
381 <                    } catch (InterruptedException success){
382 <                    }  
383 <                }});
369 >     * Take removes existing elements until empty, then blocks interruptibly
370 >     */
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 >                try {
379 >                    q.take();
380 >                    shouldThrow();
381 >                } catch (InterruptedException success) {}
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());
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) {
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, q.poll(SHORT_DELAY_MS, MILLISECONDS));
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, q.poll(SHORT_DELAY_MS, MILLISECONDS));
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 >                assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
457 >                try {
458 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
459 >                    shouldThrow();
460 >                } catch (InterruptedException success) {}
461 >            }});
462 >
463 >        t.start();
464 >        Thread.sleep(SMALL_DELAY_MS);
465 >        assertTrue(q.offer(zero, 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);
476          for (int i = 0; i < SIZE; ++i) {
477 <            assertEquals(i, ((Integer)q.peek()).intValue());
478 <            q.poll();
477 >            assertEquals(i, q.peek());
478 >            assertEquals(i, q.poll());
479              assertTrue(q.peek() == null ||
480 <                       i != ((Integer)q.peek()).intValue());
480 >                       !q.peek().equals(i));
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);
490          for (int i = 0; i < SIZE; ++i) {
491 <            assertEquals(i, ((Integer)q.element()).intValue());
492 <            q.poll();
491 >            assertEquals(i, q.element());
492 >            assertEquals(i, q.poll());
493          }
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);
505          for (int i = 0; i < SIZE; ++i) {
506 <            assertEquals(i, ((Integer)q.remove()).intValue());
506 >            assertEquals(i, q.remove());
507          }
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++)
626 <                assertEquals(ints[i], q.take());
627 <        } catch (InterruptedException e){
628 <            unexpectedException();
629 <        }    
624 >        for (int i = 0; i < ints.length; i++)
625 >            assertEquals(ints[i], q.take());
626 >    }
627 >
628 >    /**
629 >     * toArray(null) throws NPE
630 >     */
631 >    public void testToArray_BadArg() {
632 >        PriorityBlockingQueue q = populatedQueue(SIZE);
633 >        try {
634 >            Object o[] = q.toArray(null);
635 >            shouldThrow();
636 >        } catch (NullPointerException success) {}
637      }
638 <    
638 >
639 >    /**
640 >     * toArray with incompatible array type throws CCE
641 >     */
642 >    public void testToArray1_BadArg() {
643 >        PriorityBlockingQueue q = populatedQueue(SIZE);
644 >        try {
645 >            Object o[] = q.toArray(new String[10]);
646 >            shouldThrow();
647 >        } catch (ArrayStoreException success) {}
648 >    }
649 >
650      /**
651 <     *
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 () {
667 >    public void testIteratorRemove() {
668          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
669          q.add(new Integer(2));
670          q.add(new Integer(1));
# 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 +        executor.execute(new CheckedRunnable() {
702 +            public void realRun() throws InterruptedException {
703 +                assertNull(q.poll());
704 +                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
705 +                assertTrue(q.isEmpty());
706 +            }});
707 +
708 +        executor.execute(new CheckedRunnable() {
709 +            public void realRun() throws InterruptedException {
710 +                Thread.sleep(SMALL_DELAY_MS);
711 +                q.put(one);
712 +            }});
713  
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        
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 +     * drainTo(this) throws IAE
748 +     */
749 +    public void testDrainToSelf() {
750 +        PriorityBlockingQueue q = populatedQueue(SIZE);
751 +        try {
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 <     *
813 >     * drainTo(this, n) throws IAE
814       */
815 <    public void testSerialization() {
815 >    public void testDrainToSelfN() {
816          PriorityBlockingQueue q = populatedQueue(SIZE);
817          try {
818 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
819 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
820 <            out.writeObject(q);
821 <            out.close();
822 <
823 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
824 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
825 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
826 <            assertEquals(q.size(), r.size());
827 <            while (!q.isEmpty())
828 <                assertEquals(q.remove(), r.remove());
829 <        } catch(Exception e){
830 <            unexpectedException();
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