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.6 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.43 by dl, Fri May 6 11:22:07 2011 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/publicdomain/zero/1.0/
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();
27 <            int j = ((Integer)y).intValue();
28 <            if (i < j) return 1;
29 <            if (i > j) return -1;
30 <            return 0;
44 >            return ((Comparable)y).compareTo(x);
45          }
46      }
47  
# Line 35 | Line 49 | public class PriorityBlockingQueueTest e
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       * A new queue has unbounded capacity
68       */
# Line 56 | Line 71 | public class PriorityBlockingQueueTest e
71      }
72  
73      /**
74 <     * Constructor throws IAE if  capacity argument nonpositive
74 >     * Constructor throws IAE if capacity argument nonpositive
75       */
76      public void testConstructor2() {
77          try {
78              PriorityBlockingQueue q = new PriorityBlockingQueue(0);
79              shouldThrow();
80 <        }
66 <        catch (IllegalArgumentException success) {}
80 >        } catch (IllegalArgumentException success) {}
81      }
82  
83      /**
# Line 73 | Line 87 | public class PriorityBlockingQueueTest e
87          try {
88              PriorityBlockingQueue q = new PriorityBlockingQueue(null);
89              shouldThrow();
90 <        }
77 <        catch (NullPointerException success) {}
90 >        } catch (NullPointerException success) {}
91      }
92  
93      /**
# Line 85 | Line 98 | public class PriorityBlockingQueueTest e
98              Integer[] ints = new Integer[SIZE];
99              PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
100              shouldThrow();
101 <        }
89 <        catch (NullPointerException success) {}
101 >        } catch (NullPointerException success) {}
102      }
103  
104      /**
# Line 99 | Line 111 | public class PriorityBlockingQueueTest e
111                  ints[i] = new Integer(i);
112              PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
113              shouldThrow();
114 <        }
103 <        catch (NullPointerException success) {}
114 >        } catch (NullPointerException success) {}
115      }
116  
117      /**
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)
116 <                assertEquals(ints[i], q.poll());
117 <        }
118 <        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       * 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)
134 <                assertEquals(ints[i], q.poll());
135 <        }
136 <        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      /**
# Line 152 | Line 157 | public class PriorityBlockingQueueTest e
157      }
158  
159      /**
160 <     * remainingCapacity does not change when elementa added or removed,
160 >     * remainingCapacity does not change when elements added or removed,
161       * but size does
162       */
163      public void testRemainingCapacity() {
# Line 173 | Line 178 | public class PriorityBlockingQueueTest e
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      /**
# Line 199 | Line 215 | public class PriorityBlockingQueueTest e
215              q.offer(new Object());
216              q.offer(new Object());
217              shouldThrow();
218 <        }
203 <        catch(ClassCastException success) {}
218 >        } catch (ClassCastException success) {}
219      }
220  
221      /**
# Line 222 | Line 237 | public class PriorityBlockingQueueTest e
237              PriorityBlockingQueue q = new PriorityBlockingQueue(1);
238              q.addAll(null);
239              shouldThrow();
240 <        }
226 <        catch (NullPointerException success) {}
240 >        } catch (NullPointerException success) {}
241      }
242 +
243 +    /**
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       */
# Line 234 | Line 260 | public class PriorityBlockingQueueTest e
260              Integer[] ints = new Integer[SIZE];
261              q.addAll(Arrays.asList(ints));
262              shouldThrow();
263 <        }
238 <        catch (NullPointerException success) {}
263 >        } catch (NullPointerException success) {}
264      }
265 +
266      /**
267       * addAll of a collection with any null elements throws NPE after
268       * possibly adding some elements
# Line 249 | Line 275 | public class PriorityBlockingQueueTest e
275                  ints[i] = new Integer(i);
276              q.addAll(Arrays.asList(ints));
277              shouldThrow();
278 <        }
253 <        catch (NullPointerException success) {}
278 >        } catch (NullPointerException success) {}
279      }
280  
281      /**
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)
269 <                assertEquals(ints[i], q.poll());
270 <        }
271 <        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       * put(null) throws NPE
298       */
299 <     public void testPutNull() {
300 <        try {
299 >    public void testPutNull() {
300 >        try {
301              PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302              q.put(null);
303              shouldThrow();
304 <        }
305 <        catch (NullPointerException success){
284 <        }  
285 <     }
304 >        } catch (NullPointerException success) {}
305 >    }
306  
307      /**
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);
296 <                 assertTrue(q.contains(I));
297 <             }
298 <             assertEquals(SIZE, q.size());
299 <         }
300 <         finally {
310 >    public void testPut() {
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 +        assertEquals(SIZE, q.size());
318      }
319  
320      /**
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);
322 <                    } finally {
323 <                    }
324 <                }
325 <            });
326 <        try {
327 <            t.start();
328 <            Thread.sleep(SHORT_DELAY_MS);
329 <            q.take();
330 <            t.interrupt();
331 <            t.join();
332 <        } catch (Exception e){
333 <            unexpectedException();
334 <        }
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 >        delay(SHORT_DELAY_MS);
334 >        assertEquals(q.size(), size);
335 >        q.take();
336 >        t.interrupt();
337 >        t.join();
338      }
339  
340      /**
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));
349 <                    } finally { }
350 <                }
351 <            });
352 <        
353 <        try {
354 <            t.start();
355 <            Thread.sleep(SMALL_DELAY_MS);
356 <            t.interrupt();
357 <            t.join();
358 <        } catch (Exception e){
359 <            unexpectedException();
360 <        }
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 <    /**
354 <     * take retrieves elements in priority order
355 <     */
356 <    public void testTake() {
367 <        try {
368 <            PriorityBlockingQueue q = populatedQueue(SIZE);
369 <            for (int i = 0; i < SIZE; ++i) {
370 <                assertEquals(i, ((Integer)q.take()).intValue());
371 <            }
372 <        } catch (InterruptedException e){
373 <            unexpectedException();
374 <        }  
353 >        t.start();
354 >        delay(SMALL_DELAY_MS);
355 >        t.interrupt();
356 >        t.join();
357      }
358  
359      /**
360 <     * take blocks interruptibly when empty
360 >     * take retrieves elements in priority order
361       */
362 <    public void testTakeFromEmpty() {
363 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
364 <        Thread t = new Thread(new Runnable() {
365 <                public void run() {
384 <                    try {
385 <                        q.take();
386 <                        threadShouldThrow();
387 <                    } catch (InterruptedException success){ }                
388 <                }
389 <            });
390 <        try {
391 <            t.start();
392 <            Thread.sleep(SHORT_DELAY_MS);
393 <            t.interrupt();
394 <            t.join();
395 <        } catch (Exception e){
396 <            unexpectedException();
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       * Take removes existing elements until empty, then blocks interruptibly
371       */
372 <    public void testBlockingTake() {
373 <        Thread t = new Thread(new Runnable() {
374 <                public void run() {
375 <                    try {
376 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
377 <                        for (int i = 0; i < SIZE; ++i) {
378 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
379 <                        }
380 <                        q.take();
381 <                        threadShouldThrow();
382 <                    } catch (InterruptedException success){
383 <                    }  
384 <                }});
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 >                try {
380 >                    q.take();
381 >                    shouldThrow();
382 >                } catch (InterruptedException success) {}
383 >            }});
384 >
385          t.start();
386 <        try {
387 <           Thread.sleep(SHORT_DELAY_MS);
388 <           t.interrupt();
420 <           t.join();
421 <        }
422 <        catch (InterruptedException ie) {
423 <            unexpectedException();
424 <        }
386 >        delay(SHORT_DELAY_MS);
387 >        t.interrupt();
388 >        t.join();
389      }
390  
391  
# Line 431 | Line 395 | public class PriorityBlockingQueueTest e
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 <     * timed pool with zero timeout succeeds when non-empty, else times out
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 <            }
448 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
449 <        } catch (InterruptedException e){
450 <            unexpectedException();
451 <        }  
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 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
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) {
421 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
422 <            }
463 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
464 <        } catch (InterruptedException e){
465 <            unexpectedException();
466 <        }  
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       * Interrupted timed poll throws InterruptedException instead of
427       * returning timeout status
428       */
429 <    public void testInterruptedTimedPoll() {
430 <        Thread t = new Thread(new Runnable() {
431 <                public void run() {
432 <                    try {
433 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
434 <                        for (int i = 0; i < SIZE; ++i) {
435 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
436 <                        }
437 <                        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();
493 <        }
494 <    }
495 <
496 <    /**
497 <     *  timed poll before a delayed offer fails; after offer succeeds;
498 <     *  on interruption throws
499 <     */
500 <    public void testTimedPollWithOffer() {
501 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
502 <        Thread t = new Thread(new Runnable() {
503 <                public void run() {
504 <                    try {
505 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
506 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
507 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
508 <                        threadShouldThrow();
509 <                    } catch (InterruptedException success) { }                
429 >    public void testInterruptedTimedPoll() throws InterruptedException {
430 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
431 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
432 >        Thread t = newStartedThread(new CheckedRunnable() {
433 >            public void realRun() throws InterruptedException {
434 >                for (int i = 0; i < SIZE; ++i) {
435 >                    long t0 = System.nanoTime();
436 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
437 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
438                  }
439 <            });
440 <        try {
441 <            t.start();
442 <            Thread.sleep(SMALL_DELAY_MS);
443 <            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
444 <            t.interrupt();
445 <            t.join();
446 <        } catch (Exception e){
447 <            unexpectedException();
520 <        }
521 <    }  
439 >                long t0 = System.nanoTime();
440 >                aboutToWait.countDown();
441 >                try {
442 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
443 >                    shouldThrow();
444 >                } catch (InterruptedException success) {
445 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
446 >                }
447 >            }});
448  
449 +        aboutToWait.await();
450 +        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
451 +        t.interrupt();
452 +        awaitTermination(t, MEDIUM_DELAY_MS);
453 +    }
454  
455      /**
456       * peek returns next element, or null if empty
# Line 527 | Line 458 | public class PriorityBlockingQueueTest e
458      public void testPeek() {
459          PriorityBlockingQueue q = populatedQueue(SIZE);
460          for (int i = 0; i < SIZE; ++i) {
461 <            assertEquals(i, ((Integer)q.peek()).intValue());
462 <            q.poll();
461 >            assertEquals(i, q.peek());
462 >            assertEquals(i, q.poll());
463              assertTrue(q.peek() == null ||
464 <                       i != ((Integer)q.peek()).intValue());
464 >                       !q.peek().equals(i));
465          }
466 <        assertNull(q.peek());
466 >        assertNull(q.peek());
467      }
468  
469      /**
# Line 541 | Line 472 | public class PriorityBlockingQueueTest e
472      public void testElement() {
473          PriorityBlockingQueue q = populatedQueue(SIZE);
474          for (int i = 0; i < SIZE; ++i) {
475 <            assertEquals(i, ((Integer)q.element()).intValue());
476 <            q.poll();
475 >            assertEquals(i, q.element());
476 >            assertEquals(i, q.poll());
477          }
478          try {
479              q.element();
480              shouldThrow();
481 <        }
551 <        catch (NoSuchElementException success) {}
481 >        } catch (NoSuchElementException success) {}
482      }
483  
484      /**
# Line 557 | Line 487 | public class PriorityBlockingQueueTest e
487      public void testRemove() {
488          PriorityBlockingQueue q = populatedQueue(SIZE);
489          for (int i = 0; i < SIZE; ++i) {
490 <            assertEquals(i, ((Integer)q.remove()).intValue());
490 >            assertEquals(i, q.remove());
491          }
492          try {
493              q.remove();
494              shouldThrow();
495 <        } catch (NoSuchElementException success){
566 <        }  
495 >        } catch (NoSuchElementException success) {}
496      }
497  
498      /**
# Line 572 | Line 501 | public class PriorityBlockingQueueTest e
501      public void testRemoveElement() {
502          PriorityBlockingQueue q = populatedQueue(SIZE);
503          for (int i = 1; i < SIZE; i+=2) {
504 <            assertTrue(q.remove(new Integer(i)));
504 >            assertTrue(q.contains(i));
505 >            assertTrue(q.remove(i));
506 >            assertFalse(q.contains(i));
507 >            assertTrue(q.contains(i-1));
508          }
509          for (int i = 0; i < SIZE; i+=2) {
510 <            assertTrue(q.remove(new Integer(i)));
511 <            assertFalse(q.remove(new Integer(i+1)));
510 >            assertTrue(q.contains(i));
511 >            assertTrue(q.remove(i));
512 >            assertFalse(q.contains(i));
513 >            assertFalse(q.remove(i+1));
514 >            assertFalse(q.contains(i+1));
515          }
516          assertTrue(q.isEmpty());
517      }
518 <        
518 >
519      /**
520       * contains(x) reports true when elements added but not yet removed
521       */
# Line 601 | Line 536 | public class PriorityBlockingQueueTest e
536          q.clear();
537          assertTrue(q.isEmpty());
538          assertEquals(0, q.size());
539 <        assertEquals(NOCAP, q.remainingCapacity());
605 <        q.add(new Integer(1));
539 >        q.add(one);
540          assertFalse(q.isEmpty());
541 +        assertTrue(q.contains(one));
542          q.clear();
543          assertTrue(q.isEmpty());
544      }
# Line 658 | Line 593 | public class PriorityBlockingQueueTest e
593      }
594  
595      /**
596 <     *  toArray contains all elements
596 >     * toArray contains all elements
597       */
598 <    public void testToArray() {
598 >    public void testToArray() throws InterruptedException {
599          PriorityBlockingQueue q = populatedQueue(SIZE);
600 <        Object[] o = q.toArray();
600 >        Object[] o = q.toArray();
601          Arrays.sort(o);
602 <        try {
603 <        for(int i = 0; i < o.length; i++)
669 <            assertEquals(o[i], q.take());
670 <        } catch (InterruptedException e){
671 <            unexpectedException();
672 <        }    
602 >        for (int i = 0; i < o.length; i++)
603 >            assertSame(o[i], q.take());
604      }
605  
606      /**
607       * toArray(a) contains all elements
608       */
609 <    public void testToArray2() {
610 <        PriorityBlockingQueue q = populatedQueue(SIZE);
611 <        Integer[] ints = new Integer[SIZE];
612 <        ints = (Integer[])q.toArray(ints);
609 >    public void testToArray2() throws InterruptedException {
610 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
611 >        Integer[] ints = new Integer[SIZE];
612 >        Integer[] array = q.toArray(ints);
613 >        assertSame(ints, array);
614          Arrays.sort(ints);
615 <        try {
616 <            for(int i = 0; i < ints.length; i++)
617 <                assertEquals(ints[i], q.take());
618 <        } catch (InterruptedException e){
619 <            unexpectedException();
620 <        }    
615 >        for (int i = 0; i < ints.length; i++)
616 >            assertSame(ints[i], q.take());
617 >    }
618 >
619 >    /**
620 >     * toArray(null) throws NullPointerException
621 >     */
622 >    public void testToArray_NullArg() {
623 >        PriorityBlockingQueue q = populatedQueue(SIZE);
624 >        try {
625 >            q.toArray(null);
626 >            shouldThrow();
627 >        } catch (NullPointerException success) {}
628      }
629 <    
629 >
630 >    /**
631 >     * toArray(incompatible array type) throws ArrayStoreException
632 >     */
633 >    public void testToArray1_BadArg() {
634 >        PriorityBlockingQueue q = populatedQueue(SIZE);
635 >        try {
636 >            q.toArray(new String[10]);
637 >            shouldThrow();
638 >        } catch (ArrayStoreException success) {}
639 >    }
640 >
641      /**
642       * iterator iterates through all elements
643       */
644      public void testIterator() {
645          PriorityBlockingQueue q = populatedQueue(SIZE);
646          int i = 0;
647 <        Iterator it = q.iterator();
648 <        while(it.hasNext()) {
647 >        Iterator it = q.iterator();
648 >        while (it.hasNext()) {
649              assertTrue(q.contains(it.next()));
650              ++i;
651          }
# Line 705 | Line 655 | public class PriorityBlockingQueueTest e
655      /**
656       * iterator.remove removes current element
657       */
658 <    public void testIteratorRemove () {
658 >    public void testIteratorRemove() {
659          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
660          q.add(new Integer(2));
661          q.add(new Integer(1));
# Line 731 | Line 681 | public class PriorityBlockingQueueTest e
681          for (int i = 0; i < SIZE; ++i) {
682              assertTrue(s.indexOf(String.valueOf(i)) >= 0);
683          }
684 <    }        
684 >    }
685  
686      /**
687       * offer transfers elements across Executor tasks
# Line 739 | Line 689 | public class PriorityBlockingQueueTest e
689      public void testPollInExecutor() {
690          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
691          ExecutorService executor = Executors.newFixedThreadPool(2);
692 <        executor.execute(new Runnable() {
693 <            public void run() {
694 <                threadAssertNull(q.poll());
695 <                try {
696 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
697 <                    threadAssertTrue(q.isEmpty());
698 <                }
699 <                catch (InterruptedException e) {
700 <                    threadUnexpectedException();
701 <                }
702 <            }
703 <        });
692 >        executor.execute(new CheckedRunnable() {
693 >            public void realRun() throws InterruptedException {
694 >                assertNull(q.poll());
695 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
696 >                assertTrue(q.isEmpty());
697 >            }});
698 >
699 >        executor.execute(new CheckedRunnable() {
700 >            public void realRun() throws InterruptedException {
701 >                delay(SMALL_DELAY_MS);
702 >                q.put(one);
703 >            }});
704  
755        executor.execute(new Runnable() {
756            public void run() {
757                try {
758                    Thread.sleep(SMALL_DELAY_MS);
759                    q.put(new Integer(1));
760                }
761                catch (InterruptedException e) {
762                    threadUnexpectedException();
763                }
764            }
765        });
766        
705          joinPool(executor);
706      }
707  
708      /**
709 <     * A deserialized serialized queue has same elements
709 >     * A deserialized serialized queue has same elements
710 >     */
711 >    public void testSerialization() throws Exception {
712 >        PriorityBlockingQueue q = populatedQueue(SIZE);
713 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
714 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
715 >        out.writeObject(q);
716 >        out.close();
717 >
718 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
719 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
720 >        PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
721 >        assertEquals(q.size(), r.size());
722 >        while (!q.isEmpty())
723 >            assertEquals(q.remove(), r.remove());
724 >    }
725 >
726 >    /**
727 >     * drainTo(null) throws NPE
728       */
729 <    public void testSerialization() {
729 >    public void testDrainToNull() {
730          PriorityBlockingQueue q = populatedQueue(SIZE);
731          try {
732 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
733 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
734 <            out.writeObject(q);
735 <            out.close();
736 <
737 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
738 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
739 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
740 <            assertEquals(q.size(), r.size());
741 <            while (!q.isEmpty())
742 <                assertEquals(q.remove(), r.remove());
743 <        } catch(Exception e){
744 <            unexpectedException();
732 >            q.drainTo(null);
733 >            shouldThrow();
734 >        } catch (NullPointerException success) {}
735 >    }
736 >
737 >    /**
738 >     * drainTo(this) throws IAE
739 >     */
740 >    public void testDrainToSelf() {
741 >        PriorityBlockingQueue q = populatedQueue(SIZE);
742 >        try {
743 >            q.drainTo(q);
744 >            shouldThrow();
745 >        } catch (IllegalArgumentException success) {}
746 >    }
747 >
748 >    /**
749 >     * drainTo(c) empties queue into another collection c
750 >     */
751 >    public void testDrainTo() {
752 >        PriorityBlockingQueue q = populatedQueue(SIZE);
753 >        ArrayList l = new ArrayList();
754 >        q.drainTo(l);
755 >        assertEquals(q.size(), 0);
756 >        assertEquals(l.size(), SIZE);
757 >        for (int i = 0; i < SIZE; ++i)
758 >            assertEquals(l.get(i), new Integer(i));
759 >        q.add(zero);
760 >        q.add(one);
761 >        assertFalse(q.isEmpty());
762 >        assertTrue(q.contains(zero));
763 >        assertTrue(q.contains(one));
764 >        l.clear();
765 >        q.drainTo(l);
766 >        assertEquals(q.size(), 0);
767 >        assertEquals(l.size(), 2);
768 >        for (int i = 0; i < 2; ++i)
769 >            assertEquals(l.get(i), new Integer(i));
770 >    }
771 >
772 >    /**
773 >     * drainTo empties queue
774 >     */
775 >    public void testDrainToWithActivePut() throws InterruptedException {
776 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
777 >        Thread t = new Thread(new CheckedRunnable() {
778 >            public void realRun() {
779 >                q.put(new Integer(SIZE+1));
780 >            }});
781 >
782 >        t.start();
783 >        ArrayList l = new ArrayList();
784 >        q.drainTo(l);
785 >        assertTrue(l.size() >= SIZE);
786 >        for (int i = 0; i < SIZE; ++i)
787 >            assertEquals(l.get(i), new Integer(i));
788 >        t.join();
789 >        assertTrue(q.size() + l.size() >= SIZE);
790 >    }
791 >
792 >    /**
793 >     * drainTo(null, n) throws NPE
794 >     */
795 >    public void testDrainToNullN() {
796 >        PriorityBlockingQueue q = populatedQueue(SIZE);
797 >        try {
798 >            q.drainTo(null, 0);
799 >            shouldThrow();
800 >        } catch (NullPointerException success) {}
801 >    }
802 >
803 >    /**
804 >     * drainTo(this, n) throws IAE
805 >     */
806 >    public void testDrainToSelfN() {
807 >        PriorityBlockingQueue q = populatedQueue(SIZE);
808 >        try {
809 >            q.drainTo(q, 0);
810 >            shouldThrow();
811 >        } catch (IllegalArgumentException success) {}
812 >    }
813 >
814 >    /**
815 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
816 >     */
817 >    public void testDrainToN() {
818 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
819 >        for (int i = 0; i < SIZE + 2; ++i) {
820 >            for (int j = 0; j < SIZE; j++)
821 >                assertTrue(q.offer(new Integer(j)));
822 >            ArrayList l = new ArrayList();
823 >            q.drainTo(l, i);
824 >            int k = (i < SIZE) ? i : SIZE;
825 >            assertEquals(l.size(), k);
826 >            assertEquals(q.size(), SIZE-k);
827 >            for (int j = 0; j < k; ++j)
828 >                assertEquals(l.get(j), new Integer(j));
829 >            while (q.poll() != null) ;
830          }
831      }
832  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines