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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines