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.58 by jsr166, Sat Jan 17 22:55:06 2015 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();
28 <            int j = ((Integer)y).intValue();
29 <            if (i < j) return 1;
30 <            if (i > j) return -1;
31 <            return 0;
55 >            return ((Comparable)y).compareTo(x);
56          }
57      }
58  
35
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 <     *
78 >     * A new queue has unbounded capacity
79       */
80      public void testConstructor1() {
81          assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
82      }
83  
84      /**
85 <     *
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 <        }
68 <        catch (IllegalArgumentException success) {}
91 >        } catch (IllegalArgumentException success) {}
92      }
93  
94      /**
95 <     *
95 >     * Initializing from null Collection throws NPE
96       */
97      public void testConstructor3() {
75
98          try {
99 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
99 >            new PriorityBlockingQueue(null);
100              shouldThrow();
101 <        }
80 <        catch (NullPointerException success) {}
101 >        } catch (NullPointerException success) {}
102      }
103  
104      /**
105 <     *
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];
89 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
110 >            new PriorityBlockingQueue(elements);
111              shouldThrow();
112 <        }
92 <        catch (NullPointerException success) {}
112 >        } catch (NullPointerException success) {}
113      }
114  
115      /**
116 <     *
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];
101 <            for (int i = 0; i < SIZE-1; ++i)
102 <                ints[i] = new Integer(i);
103 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
124 >            new PriorityBlockingQueue(elements);
125              shouldThrow();
126 <        }
106 <        catch (NullPointerException success) {}
126 >        } catch (NullPointerException success) {}
127      }
128  
129      /**
130 <     *
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)
119 <                assertEquals(ints[i], q.poll());
120 <        }
121 <        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 <     *
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)
137 <                assertEquals(ints[i], q.poll());
138 <        }
139 <        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      /**
157 <     *
157 >     * isEmpty is true before add, false after
158       */
159      public void testEmpty() {
160          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
161          assertTrue(q.isEmpty());
162          assertEquals(NOCAP, q.remainingCapacity());
163 <        q.add(new Integer(1));
163 >        q.add(one);
164          assertFalse(q.isEmpty());
165 <        q.add(new Integer(2));
165 >        q.add(two);
166          q.remove();
167          q.remove();
168          assertTrue(q.isEmpty());
169      }
170  
171      /**
172 <     *
172 >     * remainingCapacity does not change when elements added or removed,
173 >     * but size does
174       */
175      public void testRemainingCapacity() {
176          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 172 | Line 187 | public class PriorityBlockingQueueTest e
187      }
188  
189      /**
190 <     *
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 <     *
190 >     * Offer of comparable element succeeds
191       */
192      public void testOffer() {
193          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
194 <        assertTrue(q.offer(new Integer(0)));
195 <        assertTrue(q.offer(new Integer(1)));
194 >        assertTrue(q.offer(zero));
195 >        assertTrue(q.offer(one));
196      }
197  
198      /**
199 <     *
199 >     * Offer of non-Comparable throws CCE
200       */
201      public void testOfferNonComparable() {
202          try {
# Line 201 | Line 205 | public class PriorityBlockingQueueTest e
205              q.offer(new Object());
206              q.offer(new Object());
207              shouldThrow();
208 <        }
205 <        catch(ClassCastException success) {}
208 >        } catch (ClassCastException success) {}
209      }
210  
211      /**
212 <     *
212 >     * add of comparable succeeds
213       */
214      public void testAdd() {
215          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
# Line 217 | Line 220 | public class PriorityBlockingQueueTest e
220      }
221  
222      /**
223 <     *
223 >     * addAll(this) throws IAE
224       */
225 <    public void testAddAll1() {
225 >    public void testAddAllSelf() {
226          try {
227 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
228 <            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));
227 >            PriorityBlockingQueue q = populatedQueue(SIZE);
228 >            q.addAll(q);
229              shouldThrow();
230 <        }
240 <        catch (NullPointerException success) {}
230 >        } catch (IllegalArgumentException success) {}
231      }
232 +
233      /**
234 <     *
234 >     * addAll of a collection with any null elements throws NPE after
235 >     * possibly adding some elements
236       */
237      public void testAddAll3() {
238          try {
# Line 250 | Line 242 | public class PriorityBlockingQueueTest e
242                  ints[i] = new Integer(i);
243              q.addAll(Arrays.asList(ints));
244              shouldThrow();
245 <        }
254 <        catch (NullPointerException success) {}
245 >        } catch (NullPointerException success) {}
246      }
247  
248      /**
249 <     *
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)
270 <                assertEquals(ints[i], q.poll());
271 <        }
272 <        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      /**
264 <     *
264 >     * all elements successfully put are contained
265       */
266 <     public void testPutNull() {
267 <        try {
268 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
269 <            q.put(null);
270 <            shouldThrow();
271 <        }
284 <        catch (NullPointerException success){
285 <        }  
286 <     }
287 <
288 <    /**
289 <     *
290 <     */
291 <     public void testPut() {
292 <         try {
293 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
294 <             for (int i = 0; i < SIZE; ++i) {
295 <                 Integer I = new Integer(i);
296 <                 q.put(I);
297 <                 assertTrue(q.contains(I));
298 <             }
299 <             assertEquals(SIZE, q.size());
300 <         }
301 <         finally {
266 >    public void testPut() {
267 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268 >        for (int i = 0; i < SIZE; ++i) {
269 >            Integer x = new Integer(i);
270 >            q.put(x);
271 >            assertTrue(q.contains(x));
272          }
273 +        assertEquals(SIZE, q.size());
274      }
275  
276      /**
277 <     *
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;
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 <        }
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 <     *
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));
305 <                    } finally { }
306 <                }
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 <        }
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 >        awaitTermination(t);
307      }
308  
309      /**
310 <     *
310 >     * take retrieves elements in priority order
311       */
312 <    public void testTake() {
313 <        try {
314 <            PriorityBlockingQueue q = populatedQueue(SIZE);
315 <            for (int i = 0; i < SIZE; ++i) {
316 <                assertEquals(i, ((Integer)q.take()).intValue());
372 <            }
373 <        } catch (InterruptedException e){
374 <            unexpectedException();
375 <        }  
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 <     *
320 >     * Take removes existing elements until empty, then blocks interruptibly
321       */
322 <    public void testTakeFromEmpty() {
323 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
324 <        Thread t = new Thread(new Runnable() {
325 <                public void run() {
326 <                    try {
327 <                        q.take();
328 <                        threadShouldThrow();
388 <                    } catch (InterruptedException success){ }                
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                  }
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    }
330  
331 <    /**
332 <     *
333 <     */
334 <    public void testBlockingTake() {
335 <        Thread t = new Thread(new Runnable() {
336 <                public void run() {
337 <                    try {
338 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
339 <                        for (int i = 0; i < SIZE; ++i) {
340 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
341 <                        }
342 <                        q.take();
343 <                        threadShouldThrow();
344 <                    } 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 <    }
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 <     *
353 >     * poll succeeds unless empty
354       */
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 <     *
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 <            }
449 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
450 <        } catch (InterruptedException e){
451 <            unexpectedException();
452 <        }  
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 <     *
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 <            }
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();
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 <     *
391 >     * Interrupted timed poll throws InterruptedException instead of
392 >     * returning timeout status
393       */
394 <    public void testTimedPollWithOffer() {
395 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
396 <        Thread t = new Thread(new Runnable() {
397 <                public void run() {
398 <                    try {
399 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
400 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
401 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
402 <                        threadShouldThrow();
508 <                    } 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();
519 <        }
520 <    }  
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 <     *
421 >     * peek returns next element, or null if empty
422       */
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      /**
435 <     *
435 >     * element returns next element, or throws NSEE if empty
436       */
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 <        }
550 <        catch (NoSuchElementException success) {}
446 >        } catch (NoSuchElementException success) {}
447      }
448  
449      /**
450 <     *
450 >     * remove removes next element, or throws NSEE if empty
451       */
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){
565 <        }  
460 >        } catch (NoSuchElementException success) {}
461      }
462  
463      /**
464 <     *
570 <     */
571 <    public void testRemoveElement() {
572 <        PriorityBlockingQueue q = populatedQueue(SIZE);
573 <        for (int i = 1; i < SIZE; i+=2) {
574 <            assertTrue(q.remove(new Integer(i)));
575 <        }
576 <        for (int i = 0; i < SIZE; i+=2) {
577 <            assertTrue(q.remove(new Integer(i)));
578 <            assertFalse(q.remove(new Integer(i+1)));
579 <        }
580 <        assertTrue(q.isEmpty());
581 <    }
582 <        
583 <    /**
584 <     *
464 >     * contains(x) reports true when elements added but not yet removed
465       */
466      public void testContains() {
467          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 593 | Line 473 | public class PriorityBlockingQueueTest e
473      }
474  
475      /**
476 <     *
476 >     * clear removes all elements
477       */
478      public void testClear() {
479          PriorityBlockingQueue q = populatedQueue(SIZE);
480          q.clear();
481          assertTrue(q.isEmpty());
482          assertEquals(0, q.size());
483 <        assertEquals(NOCAP, q.remainingCapacity());
604 <        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      }
489  
490      /**
491 <     *
491 >     * containsAll(c) is true when c contains a subset of elements
492       */
493      public void testContainsAll() {
494          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 622 | Line 502 | public class PriorityBlockingQueueTest e
502      }
503  
504      /**
505 <     *
505 >     * retainAll(c) retains only those elements of c and reports true if changed
506       */
507      public void testRetainAll() {
508          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 641 | Line 521 | public class PriorityBlockingQueueTest e
521      }
522  
523      /**
524 <     *
524 >     * removeAll(c) removes only those elements of c and reports true if changed
525       */
526      public void testRemoveAll() {
527          for (int i = 1; i < SIZE; ++i) {
# Line 650 | Line 530 | public class PriorityBlockingQueueTest e
530              assertTrue(q.removeAll(p));
531              assertEquals(SIZE-i, q.size());
532              for (int j = 0; j < i; ++j) {
533 <                Integer I = (Integer)(p.remove());
534 <                assertFalse(q.contains(I));
533 >                Integer x = (Integer)(p.remove());
534 >                assertFalse(q.contains(x));
535              }
536          }
537      }
538  
539      /**
540 <     *
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++)
668 <            assertEquals(o[i], q.take());
669 <        } catch (InterruptedException e){
670 <            unexpectedException();
671 <        }    
546 >        for (int i = 0; i < o.length; i++)
547 >            assertSame(o[i], q.take());
548      }
549  
550      /**
551 <     *
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++)
684 <                assertEquals(ints[i], q.take());
685 <        } catch (InterruptedException e){
686 <            unexpectedException();
687 <        }    
559 >        for (int i = 0; i < ints.length; i++)
560 >            assertSame(ints[i], q.take());
561      }
562 <    
562 >
563      /**
564 <     *
564 >     * toArray(incompatible array type) throws ArrayStoreException
565 >     */
566 >    public void testToArray1_BadArg() {
567 >        PriorityBlockingQueue q = populatedQueue(SIZE);
568 >        try {
569 >            q.toArray(new String[10]);
570 >            shouldThrow();
571 >        } catch (ArrayStoreException success) {}
572 >    }
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()) {
579 >        Iterator it = q.iterator();
580 >        int i;
581 >        for (i = 0; it.hasNext(); i++)
582              assertTrue(q.contains(it.next()));
699            ++i;
700        }
583          assertEquals(i, SIZE);
584 +        assertIteratorExhausted(it);
585      }
586  
587      /**
588 <     *
588 >     * iterator of empty collection has no elements
589       */
590 <    public void testIteratorRemove () {
590 >    public void testEmptyIterator() {
591 >        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
592 >    }
593 >
594 >    /**
595 >     * iterator.remove removes current element
596 >     */
597 >    public void testIteratorRemove() {
598          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
599          q.add(new Integer(2));
600          q.add(new Integer(1));
# Line 720 | Line 610 | public class PriorityBlockingQueueTest e
610          assertFalse(it.hasNext());
611      }
612  
723
613      /**
614 <     *
614 >     * toString contains toStrings of elements
615       */
616      public void testToString() {
617          PriorityBlockingQueue q = populatedQueue(SIZE);
618          String s = q.toString();
619          for (int i = 0; i < SIZE; ++i) {
620 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
620 >            assertTrue(s.contains(String.valueOf(i)));
621          }
622 <    }        
622 >    }
623  
624      /**
625 <     *
625 >     * timed poll transfers elements across Executor tasks
626       */
627      public void testPollInExecutor() {
739
628          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
629 <
629 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
630          ExecutorService executor = Executors.newFixedThreadPool(2);
631 +        executor.execute(new CheckedRunnable() {
632 +            public void realRun() throws InterruptedException {
633 +                assertNull(q.poll());
634 +                threadsStarted.await();
635 +                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
636 +                checkEmpty(q);
637 +            }});
638 +
639 +        executor.execute(new CheckedRunnable() {
640 +            public void realRun() throws InterruptedException {
641 +                threadsStarted.await();
642 +                q.put(one);
643 +            }});
644  
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        
645          joinPool(executor);
646 +    }
647  
648 +    /**
649 +     * A deserialized serialized queue has same elements
650 +     */
651 +    public void testSerialization() throws Exception {
652 +        Queue x = populatedQueue(SIZE);
653 +        Queue y = serialClone(x);
654 +
655 +        assertNotSame(x, y);
656 +        assertEquals(x.size(), y.size());
657 +        while (!x.isEmpty()) {
658 +            assertFalse(y.isEmpty());
659 +            assertEquals(x.remove(), y.remove());
660 +        }
661 +        assertTrue(y.isEmpty());
662      }
663  
664      /**
665 <     *
665 >     * drainTo(c) empties queue into another collection c
666       */
667 <    public void testSerialization() {
667 >    public void testDrainTo() {
668          PriorityBlockingQueue q = populatedQueue(SIZE);
669 <        try {
670 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
671 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
672 <            out.writeObject(q);
673 <            out.close();
674 <
675 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
676 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
677 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
678 <            assertEquals(q.size(), r.size());
679 <            while (!q.isEmpty())
680 <                assertEquals(q.remove(), r.remove());
681 <        } catch(Exception e){
682 <            unexpectedException();
669 >        ArrayList l = new ArrayList();
670 >        q.drainTo(l);
671 >        assertEquals(0, q.size());
672 >        assertEquals(SIZE, l.size());
673 >        for (int i = 0; i < SIZE; ++i)
674 >            assertEquals(l.get(i), new Integer(i));
675 >        q.add(zero);
676 >        q.add(one);
677 >        assertFalse(q.isEmpty());
678 >        assertTrue(q.contains(zero));
679 >        assertTrue(q.contains(one));
680 >        l.clear();
681 >        q.drainTo(l);
682 >        assertEquals(0, q.size());
683 >        assertEquals(2, l.size());
684 >        for (int i = 0; i < 2; ++i)
685 >            assertEquals(l.get(i), new Integer(i));
686 >    }
687 >
688 >    /**
689 >     * drainTo empties queue
690 >     */
691 >    public void testDrainToWithActivePut() throws InterruptedException {
692 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
693 >        Thread t = new Thread(new CheckedRunnable() {
694 >            public void realRun() {
695 >                q.put(new Integer(SIZE+1));
696 >            }});
697 >
698 >        t.start();
699 >        ArrayList l = new ArrayList();
700 >        q.drainTo(l);
701 >        assertTrue(l.size() >= SIZE);
702 >        for (int i = 0; i < SIZE; ++i)
703 >            assertEquals(l.get(i), new Integer(i));
704 >        t.join();
705 >        assertTrue(q.size() + l.size() >= SIZE);
706 >    }
707 >
708 >    /**
709 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
710 >     */
711 >    public void testDrainToN() {
712 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
713 >        for (int i = 0; i < SIZE + 2; ++i) {
714 >            for (int j = 0; j < SIZE; j++)
715 >                assertTrue(q.offer(new Integer(j)));
716 >            ArrayList l = new ArrayList();
717 >            q.drainTo(l, i);
718 >            int k = (i < SIZE) ? i : SIZE;
719 >            assertEquals(k, l.size());
720 >            assertEquals(SIZE-k, q.size());
721 >            for (int j = 0; j < k; ++j)
722 >                assertEquals(l.get(j), new Integer(j));
723 >            do {} while (q.poll() != null);
724 >        }
725 >    }
726 >
727 >    /**
728 >     * remove(null), contains(null) always return false
729 >     */
730 >    public void testNeverContainsNull() {
731 >        Collection<?>[] qs = {
732 >            new PriorityBlockingQueue<Object>(),
733 >            populatedQueue(2),
734 >        };
735 >
736 >        for (Collection<?> q : qs) {
737 >            assertFalse(q.contains(null));
738 >            assertFalse(q.remove(null));
739          }
740      }
741  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines