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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines