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.7 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.48 by jsr166, Sat Nov 26 05:19:17 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(SIZE);
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();
27 <            int j = ((Integer)y).intValue();
28 <            if (i < j) return 1;
29 <            if (i > j) return -1;
30 <            return 0;
53 >            return ((Comparable)y).compareTo(x);
54          }
55      }
56  
# Line 35 | Line 58 | public class PriorityBlockingQueueTest e
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       * A new queue has unbounded capacity
77       */
# Line 56 | Line 80 | public class PriorityBlockingQueueTest e
80      }
81  
82      /**
83 <     * Constructor throws IAE if  capacity argument nonpositive
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 <        }
66 <        catch (IllegalArgumentException success) {}
89 >        } catch (IllegalArgumentException success) {}
90      }
91  
92      /**
# Line 71 | Line 94 | public class PriorityBlockingQueueTest e
94       */
95      public void testConstructor3() {
96          try {
97 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
97 >            new PriorityBlockingQueue(null);
98              shouldThrow();
99 <        }
77 <        catch (NullPointerException success) {}
99 >        } catch (NullPointerException success) {}
100      }
101  
102      /**
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];
86 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108 >            new PriorityBlockingQueue(elements);
109              shouldThrow();
110 <        }
89 <        catch (NullPointerException success) {}
110 >        } catch (NullPointerException success) {}
111      }
112  
113      /**
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];
98 <            for (int i = 0; i < SIZE-1; ++i)
99 <                ints[i] = new Integer(i);
100 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
122 >            new PriorityBlockingQueue(elements);
123              shouldThrow();
124 <        }
103 <        catch (NullPointerException success) {}
124 >        } catch (NullPointerException success) {}
125      }
126  
127      /**
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)
116 <                assertEquals(ints[i], q.poll());
117 <        }
118 <        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       * 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)
134 <                assertEquals(ints[i], q.poll());
135 <        }
136 <        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      /**
# Line 152 | Line 167 | public class PriorityBlockingQueueTest e
167      }
168  
169      /**
170 <     * remainingCapacity does not change when elementa added or removed,
170 >     * remainingCapacity does not change when elements added or removed,
171       * but size does
172       */
173      public void testRemainingCapacity() {
# Line 170 | Line 185 | public class PriorityBlockingQueueTest e
185      }
186  
187      /**
173     * offer(null) throws NPE
174     */
175    public void testOfferNull() {
176        try {
177            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
178            q.offer(null);
179            shouldThrow();
180        } catch (NullPointerException success) { }  
181    }
182
183    /**
184     * add(null) throws NPE
185     */
186    public void testAddNull() {
187        try {
188            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
189            q.add(null);
190            shouldThrow();
191        } catch (NullPointerException success) { }  
192    }
193
194    /**
188       * Offer of comparable element succeeds
189       */
190      public void testOffer() {
# Line 210 | Line 203 | public class PriorityBlockingQueueTest e
203              q.offer(new Object());
204              q.offer(new Object());
205              shouldThrow();
206 <        }
214 <        catch(ClassCastException success) {}
206 >        } catch (ClassCastException success) {}
207      }
208  
209      /**
# Line 226 | Line 218 | public class PriorityBlockingQueueTest e
218      }
219  
220      /**
229     * addAll(null) throws NPE
230     */
231    public void testAddAll1() {
232        try {
233            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
234            q.addAll(null);
235            shouldThrow();
236        }
237        catch (NullPointerException success) {}
238    }
239
240    /**
221       * addAll(this) throws IAE
222       */
223      public void testAddAllSelf() {
# Line 245 | Line 225 | public class PriorityBlockingQueueTest e
225              PriorityBlockingQueue q = populatedQueue(SIZE);
226              q.addAll(q);
227              shouldThrow();
228 <        }
249 <        catch (IllegalArgumentException success) {}
228 >        } catch (IllegalArgumentException success) {}
229      }
230  
231      /**
253     * addAll of a collection with null elements throws NPE
254     */
255    public void testAddAll2() {
256        try {
257            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
258            Integer[] ints = new Integer[SIZE];
259            q.addAll(Arrays.asList(ints));
260            shouldThrow();
261        }
262        catch (NullPointerException success) {}
263    }
264    /**
232       * addAll of a collection with any null elements throws NPE after
233       * possibly adding some elements
234       */
# Line 273 | Line 240 | public class PriorityBlockingQueueTest e
240                  ints[i] = new Integer(i);
241              q.addAll(Arrays.asList(ints));
242              shouldThrow();
243 <        }
277 <        catch (NullPointerException success) {}
243 >        } catch (NullPointerException success) {}
244      }
245  
246      /**
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)
293 <                assertEquals(ints[i], q.poll());
294 <        }
295 <        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      /**
299     * put(null) throws NPE
300     */
301     public void testPutNull() {
302        try {
303            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
304            q.put(null);
305            shouldThrow();
306        }
307        catch (NullPointerException success){
308        }  
309     }
310
311    /**
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);
320 <                 assertTrue(q.contains(I));
321 <             }
322 <             assertEquals(SIZE, q.size());
323 <         }
324 <         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       * 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;
343 <                        q.put(new Integer(0));
344 <                        ++added;
345 <                        threadAssertTrue(added == 4);
346 <                    } finally {
347 <                    }
348 <                }
349 <            });
350 <        try {
351 <            t.start();
352 <            Thread.sleep(SHORT_DELAY_MS);
353 <            q.take();
354 <            t.interrupt();
355 <            t.join();
356 <        } catch (Exception e){
357 <            unexpectedException();
358 <        }
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       * 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));
373 <                    } finally { }
374 <                }
375 <            });
376 <        
377 <        try {
378 <            t.start();
379 <            Thread.sleep(SMALL_DELAY_MS);
380 <            t.interrupt();
381 <            t.join();
382 <        } catch (Exception e){
383 <            unexpectedException();
384 <        }
385 <    }
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 <    /**
388 <     * take retrieves elements in priority order
389 <     */
390 <    public void testTake() {
391 <        try {
392 <            PriorityBlockingQueue q = populatedQueue(SIZE);
393 <            for (int i = 0; i < SIZE; ++i) {
394 <                assertEquals(i, ((Integer)q.take()).intValue());
395 <            }
396 <        } catch (InterruptedException e){
397 <            unexpectedException();
398 <        }  
304 >        awaitTermination(t);
305      }
306  
307      /**
308 <     * take blocks interruptibly when empty
308 >     * take retrieves elements in priority order
309       */
310 <    public void testTakeFromEmpty() {
311 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
312 <        Thread t = new Thread(new Runnable() {
313 <                public void run() {
408 <                    try {
409 <                        q.take();
410 <                        threadShouldThrow();
411 <                    } catch (InterruptedException success){ }                
412 <                }
413 <            });
414 <        try {
415 <            t.start();
416 <            Thread.sleep(SHORT_DELAY_MS);
417 <            t.interrupt();
418 <            t.join();
419 <        } catch (Exception e){
420 <            unexpectedException();
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       * Take removes existing elements until empty, then blocks interruptibly
319       */
320 <    public void testBlockingTake() {
321 <        Thread t = new Thread(new Runnable() {
322 <                public void run() {
323 <                    try {
324 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
325 <                        for (int i = 0; i < SIZE; ++i) {
326 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
327 <                        }
435 <                        q.take();
436 <                        threadShouldThrow();
437 <                    } catch (InterruptedException success){
438 <                    }  
439 <                }});
440 <        t.start();
441 <        try {
442 <           Thread.sleep(SHORT_DELAY_MS);
443 <           t.interrupt();
444 <           t.join();
445 <        }
446 <        catch (InterruptedException ie) {
447 <            unexpectedException();
448 <        }
449 <    }
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 >                }
328  
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       * poll succeeds unless empty
# Line 455 | Line 353 | public class PriorityBlockingQueueTest e
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 <     * timed pool with zero timeout succeeds when non-empty, else times out
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 <            }
472 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
473 <        } catch (InterruptedException e){
474 <            unexpectedException();
475 <        }  
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 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
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 <            }
381 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
382 <        } catch (InterruptedException e){
383 <            unexpectedException();
384 <        }  
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       * Interrupted timed poll throws InterruptedException instead of
390       * returning timeout status
391       */
392 <    public void testInterruptedTimedPoll() {
393 <        Thread t = new Thread(new Runnable() {
394 <                public void run() {
395 <                    try {
396 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
397 <                        for (int i = 0; i < SIZE; ++i) {
398 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
399 <                        }
400 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
506 <                    } catch (InterruptedException success){
507 <                    }  
508 <                }});
509 <        t.start();
510 <        try {
511 <           Thread.sleep(SHORT_DELAY_MS);
512 <           t.interrupt();
513 <           t.join();
514 <        }
515 <        catch (InterruptedException ie) {
516 <            unexpectedException();
517 <        }
518 <    }
519 <
520 <    /**
521 <     *  timed poll before a delayed offer fails; after offer succeeds;
522 <     *  on interruption throws
523 <     */
524 <    public void testTimedPollWithOffer() {
525 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
526 <        Thread t = new Thread(new Runnable() {
527 <                public void run() {
528 <                    try {
529 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
530 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
531 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
532 <                        threadShouldThrow();
533 <                    } 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();
544 <        }
545 <    }  
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       * peek returns next element, or null if empty
# Line 551 | Line 421 | public class PriorityBlockingQueueTest e
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      /**
# Line 565 | Line 435 | public class PriorityBlockingQueueTest e
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 <        }
575 <        catch (NoSuchElementException success) {}
444 >        } catch (NoSuchElementException success) {}
445      }
446  
447      /**
# Line 581 | Line 450 | public class PriorityBlockingQueueTest e
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){
590 <        }  
458 >        } catch (NoSuchElementException success) {}
459      }
460  
461      /**
594     * remove(x) removes x and returns true if present
595     */
596    public void testRemoveElement() {
597        PriorityBlockingQueue q = populatedQueue(SIZE);
598        for (int i = 1; i < SIZE; i+=2) {
599            assertTrue(q.remove(new Integer(i)));
600        }
601        for (int i = 0; i < SIZE; i+=2) {
602            assertTrue(q.remove(new Integer(i)));
603            assertFalse(q.remove(new Integer(i+1)));
604        }
605        assertTrue(q.isEmpty());
606    }
607        
608    /**
462       * contains(x) reports true when elements added but not yet removed
463       */
464      public void testContains() {
# Line 625 | Line 478 | public class PriorityBlockingQueueTest e
478          q.clear();
479          assertTrue(q.isEmpty());
480          assertEquals(0, q.size());
481 <        assertEquals(NOCAP, q.remainingCapacity());
629 <        q.add(new Integer(1));
481 >        q.add(one);
482          assertFalse(q.isEmpty());
483 +        assertTrue(q.contains(one));
484          q.clear();
485          assertTrue(q.isEmpty());
486      }
# Line 682 | Line 535 | public class PriorityBlockingQueueTest e
535      }
536  
537      /**
538 <     *  toArray contains all elements
538 >     * toArray contains all elements
539       */
540 <    public void testToArray() {
540 >    public void testToArray() throws InterruptedException {
541          PriorityBlockingQueue q = populatedQueue(SIZE);
542 <        Object[] o = q.toArray();
542 >        Object[] o = q.toArray();
543          Arrays.sort(o);
544 <        try {
545 <        for(int i = 0; i < o.length; i++)
693 <            assertEquals(o[i], q.take());
694 <        } catch (InterruptedException e){
695 <            unexpectedException();
696 <        }    
544 >        for (int i = 0; i < o.length; i++)
545 >            assertSame(o[i], q.take());
546      }
547  
548      /**
549       * toArray(a) contains all elements
550       */
551 <    public void testToArray2() {
552 <        PriorityBlockingQueue q = populatedQueue(SIZE);
553 <        Integer[] ints = new Integer[SIZE];
554 <        ints = (Integer[])q.toArray(ints);
551 >    public void testToArray2() throws InterruptedException {
552 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
553 >        Integer[] ints = new Integer[SIZE];
554 >        Integer[] array = q.toArray(ints);
555 >        assertSame(ints, array);
556          Arrays.sort(ints);
557 <        try {
558 <            for(int i = 0; i < ints.length; i++)
709 <                assertEquals(ints[i], q.take());
710 <        } catch (InterruptedException e){
711 <            unexpectedException();
712 <        }    
557 >        for (int i = 0; i < ints.length; i++)
558 >            assertSame(ints[i], q.take());
559      }
560  
561      /**
562 <     * toArray(null) throws NPE
717 <     */
718 <    public void testToArray_BadArg() {
719 <        try {
720 <            PriorityBlockingQueue q = populatedQueue(SIZE);
721 <            Object o[] = q.toArray(null);
722 <            shouldThrow();
723 <        } catch(NullPointerException success){}
724 <    }
725 <
726 <    /**
727 <     * toArray with incompatable array type throws CCE
562 >     * toArray(incompatible array type) throws ArrayStoreException
563       */
564      public void testToArray1_BadArg() {
565 <        try {
566 <            PriorityBlockingQueue q = populatedQueue(SIZE);
567 <            Object o[] = q.toArray(new String[10] );
568 <            shouldThrow();
569 <        } catch(ArrayStoreException  success){}
565 >        PriorityBlockingQueue q = populatedQueue(SIZE);
566 >        try {
567 >            q.toArray(new String[10]);
568 >            shouldThrow();
569 >        } catch (ArrayStoreException success) {}
570      }
571 <    
571 >
572      /**
573       * iterator iterates through all elements
574       */
575      public void testIterator() {
576          PriorityBlockingQueue q = populatedQueue(SIZE);
577          int i = 0;
578 <        Iterator it = q.iterator();
579 <        while(it.hasNext()) {
578 >        Iterator it = q.iterator();
579 >        while (it.hasNext()) {
580              assertTrue(q.contains(it.next()));
581              ++i;
582          }
# Line 751 | Line 586 | public class PriorityBlockingQueueTest e
586      /**
587       * iterator.remove removes current element
588       */
589 <    public void testIteratorRemove () {
589 >    public void testIteratorRemove() {
590          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
591          q.add(new Integer(2));
592          q.add(new Integer(1));
# Line 767 | Line 602 | public class PriorityBlockingQueueTest e
602          assertFalse(it.hasNext());
603      }
604  
770
605      /**
606       * toString contains toStrings of elements
607       */
# Line 775 | Line 609 | public class PriorityBlockingQueueTest e
609          PriorityBlockingQueue q = populatedQueue(SIZE);
610          String s = q.toString();
611          for (int i = 0; i < SIZE; ++i) {
612 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
612 >            assertTrue(s.contains(String.valueOf(i)));
613          }
614 <    }        
614 >    }
615  
616      /**
617 <     * offer transfers elements across Executor tasks
617 >     * timed poll transfers elements across Executor tasks
618       */
619      public void testPollInExecutor() {
620          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
621 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
622          ExecutorService executor = Executors.newFixedThreadPool(2);
623 <        executor.execute(new Runnable() {
624 <            public void run() {
625 <                threadAssertNull(q.poll());
626 <                try {
627 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
628 <                    threadAssertTrue(q.isEmpty());
629 <                }
630 <                catch (InterruptedException e) {
631 <                    threadUnexpectedException();
632 <                }
633 <            }
634 <        });
623 >        executor.execute(new CheckedRunnable() {
624 >            public void realRun() throws InterruptedException {
625 >                assertNull(q.poll());
626 >                threadsStarted.await();
627 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 >                checkEmpty(q);
629 >            }});
630 >
631 >        executor.execute(new CheckedRunnable() {
632 >            public void realRun() throws InterruptedException {
633 >                threadsStarted.await();
634 >                q.put(one);
635 >            }});
636  
801        executor.execute(new Runnable() {
802            public void run() {
803                try {
804                    Thread.sleep(SMALL_DELAY_MS);
805                    q.put(new Integer(1));
806                }
807                catch (InterruptedException e) {
808                    threadUnexpectedException();
809                }
810            }
811        });
812        
637          joinPool(executor);
638      }
639  
640      /**
641 <     * A deserialized serialized queue has same elements
641 >     * A deserialized serialized queue has same elements
642       */
643 <    public void testSerialization() {
644 <        PriorityBlockingQueue q = populatedQueue(SIZE);
645 <        try {
646 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
647 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
648 <            out.writeObject(q);
649 <            out.close();
650 <
651 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
828 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
829 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
830 <            assertEquals(q.size(), r.size());
831 <            while (!q.isEmpty())
832 <                assertEquals(q.remove(), r.remove());
833 <        } catch(Exception e){
834 <            unexpectedException();
835 <        }
836 <    }
837 <
838 <    /**
839 <     * drainTo(null) throws NPE
840 <     */
841 <    public void testDrainToNull() {
842 <        PriorityBlockingQueue q = populatedQueue(SIZE);
843 <        try {
844 <            q.drainTo(null);
845 <            shouldThrow();
846 <        } catch(NullPointerException success) {
847 <        }
848 <    }
849 <
850 <    /**
851 <     * drainTo(this) throws IAE
852 <     */
853 <    public void testDrainToSelf() {
854 <        PriorityBlockingQueue q = populatedQueue(SIZE);
855 <        try {
856 <            q.drainTo(q);
857 <            shouldThrow();
858 <        } catch(IllegalArgumentException success) {
643 >    public void testSerialization() throws Exception {
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646 >
647 >        assertTrue(x != y);
648 >        assertEquals(x.size(), y.size());
649 >        while (!x.isEmpty()) {
650 >            assertFalse(y.isEmpty());
651 >            assertEquals(x.remove(), y.remove());
652          }
653 +        assertTrue(y.isEmpty());
654      }
655  
656      /**
657       * drainTo(c) empties queue into another collection c
658 <     */
658 >     */
659      public void testDrainTo() {
660          PriorityBlockingQueue q = populatedQueue(SIZE);
661          ArrayList l = new ArrayList();
662          q.drainTo(l);
663 <        assertEquals(q.size(), 0);
664 <        assertEquals(l.size(), SIZE);
665 <        for (int i = 0; i < SIZE; ++i)
663 >        assertEquals(0, q.size());
664 >        assertEquals(SIZE, l.size());
665 >        for (int i = 0; i < SIZE; ++i)
666 >            assertEquals(l.get(i), new Integer(i));
667 >        q.add(zero);
668 >        q.add(one);
669 >        assertFalse(q.isEmpty());
670 >        assertTrue(q.contains(zero));
671 >        assertTrue(q.contains(one));
672 >        l.clear();
673 >        q.drainTo(l);
674 >        assertEquals(0, q.size());
675 >        assertEquals(2, l.size());
676 >        for (int i = 0; i < 2; ++i)
677              assertEquals(l.get(i), new Integer(i));
678      }
679  
680      /**
681       * drainTo empties queue
682 <     */
683 <    public void testDrainToWithActivePut() {
682 >     */
683 >    public void testDrainToWithActivePut() throws InterruptedException {
684          final PriorityBlockingQueue q = populatedQueue(SIZE);
685 <        Thread t = new Thread(new Runnable() {
686 <                public void run() {
687 <                    q.put(new Integer(SIZE+1));
688 <                }
884 <            });
885 <        try {
886 <            t.start();
887 <            ArrayList l = new ArrayList();
888 <            q.drainTo(l);
889 <            assertTrue(l.size() >= SIZE);
890 <            for (int i = 0; i < SIZE; ++i)
891 <                assertEquals(l.get(i), new Integer(i));
892 <            t.join();
893 <            assertTrue(q.size() + l.size() == SIZE+1);
894 <        } catch(Exception e){
895 <            unexpectedException();
896 <        }
897 <    }
685 >        Thread t = new Thread(new CheckedRunnable() {
686 >            public void realRun() {
687 >                q.put(new Integer(SIZE+1));
688 >            }});
689  
690 <    /**
691 <     * drainTo(null, n) throws NPE
692 <     */
693 <    public void testDrainToNullN() {
694 <        PriorityBlockingQueue q = populatedQueue(SIZE);
695 <        try {
696 <            q.drainTo(null, 0);
697 <            shouldThrow();
907 <        } catch(NullPointerException success) {
908 <        }
909 <    }
910 <
911 <    /**
912 <     * drainTo(this, n) throws IAE
913 <     */
914 <    public void testDrainToSelfN() {
915 <        PriorityBlockingQueue q = populatedQueue(SIZE);
916 <        try {
917 <            q.drainTo(q, 0);
918 <            shouldThrow();
919 <        } catch(IllegalArgumentException success) {
920 <        }
690 >        t.start();
691 >        ArrayList l = new ArrayList();
692 >        q.drainTo(l);
693 >        assertTrue(l.size() >= SIZE);
694 >        for (int i = 0; i < SIZE; ++i)
695 >            assertEquals(l.get(i), new Integer(i));
696 >        t.join();
697 >        assertTrue(q.size() + l.size() >= SIZE);
698      }
699  
700      /**
701 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
702 <     */
701 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
702 >     */
703      public void testDrainToN() {
704 +        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
705          for (int i = 0; i < SIZE + 2; ++i) {
706 <            PriorityBlockingQueue q = populatedQueue(SIZE);
706 >            for (int j = 0; j < SIZE; j++)
707 >                assertTrue(q.offer(new Integer(j)));
708              ArrayList l = new ArrayList();
709              q.drainTo(l, i);
710 <            int k = (i < SIZE)? i : SIZE;
932 <            assertEquals(q.size(), SIZE-k);
710 >            int k = (i < SIZE) ? i : SIZE;
711              assertEquals(l.size(), k);
712 <            for (int j = 0; j < k; ++j)
713 <                assertTrue(l.contains(new Integer(j)));
712 >            assertEquals(q.size(), SIZE-k);
713 >            for (int j = 0; j < k; ++j)
714 >                assertEquals(l.get(j), new Integer(j));
715 >            while (q.poll() != null) ;
716          }
717      }
718  
939
719   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines