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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines