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.4 by dl, Sat Sep 20 00:31:57 2003 UTC vs.
Revision 1.53 by jsr166, Sun Nov 23 22:27:06 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.*;
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();
28 <            int j = ((Integer)y).intValue();
29 <            if (i < j) return 1;
30 <            if (i > j) return -1;
31 <            return 0;
53 >            return ((Comparable)y).compareTo(x);
54          }
55      }
56  
35
57      /**
58 <     * Create a queue of given size containing consecutive
58 >     * Returns a new 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 <
75 <    public void testConstructor1(){
74 >
75 >    /**
76 >     * A new queue has unbounded capacity
77 >     */
78 >    public void testConstructor1() {
79          assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
80      }
81  
82 <    public void testConstructor2(){
82 >    /**
83 >     * Constructor throws IAE if capacity argument nonpositive
84 >     */
85 >    public void testConstructor2() {
86          try {
87 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
88 <            fail("Cannot make zero-sized");
89 <        }
62 <        catch (IllegalArgumentException success) {}
87 >            new PriorityBlockingQueue(0);
88 >            shouldThrow();
89 >        } catch (IllegalArgumentException success) {}
90      }
91  
92 <    public void testConstructor3(){
93 <
92 >    /**
93 >     * Initializing from null Collection throws NPE
94 >     */
95 >    public void testConstructor3() {
96          try {
97 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
98 <            fail("Cannot make from null collection");
99 <        }
71 <        catch (NullPointerException success) {}
97 >            new PriorityBlockingQueue(null);
98 >            shouldThrow();
99 >        } catch (NullPointerException success) {}
100      }
101  
102 <    public void testConstructor4(){
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];
109 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
110 <            fail("Cannot make with null elements");
79 <        }
80 <        catch (NullPointerException success) {}
108 >            new PriorityBlockingQueue(elements);
109 >            shouldThrow();
110 >        } catch (NullPointerException success) {}
111      }
112  
113 <    public void testConstructor5(){
114 <        try {
115 <            Integer[] ints = new Integer[SIZE];
116 <            for (int i = 0; i < SIZE-1; ++i)
117 <                ints[i] = new Integer(i);
118 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
119 <            fail("Cannot make with null elements");
120 <        }
121 <        catch (NullPointerException success) {}
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 >            new PriorityBlockingQueue(elements);
123 >            shouldThrow();
124 >        } catch (NullPointerException success) {}
125      }
126  
127 <    public void testConstructor6(){
128 <        try {
129 <            Integer[] ints = new Integer[SIZE];
130 <            for (int i = 0; i < SIZE; ++i)
131 <                ints[i] = new Integer(i);
132 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
133 <            for (int i = 0; i < SIZE; ++i)
134 <                assertEquals(ints[i], q.poll());
135 <        }
136 <        finally {}
127 >    /**
128 >     * Queue contains all elements of collection used to initialize
129 >     */
130 >    public void testConstructor6() {
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 <    public void testConstructor7(){
140 <        try {
141 <            MyReverseComparator cmp = new MyReverseComparator();
142 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
143 <            assertEquals(cmp, q.comparator());
144 <            Integer[] ints = new Integer[SIZE];
145 <            for (int i = 0; i < SIZE; ++i)
146 <                ints[i] = new Integer(i);
147 <            q.addAll(Arrays.asList(ints));
148 <            for (int i = SIZE-1; i >= 0; --i)
149 <                assertEquals(ints[i], q.poll());
150 <        }
151 <        finally {}
139 >    /**
140 >     * The comparator used in constructor is used
141 >     */
142 >    public void testConstructor7() {
143 >        MyReverseComparator cmp = new MyReverseComparator();
144 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
145 >        assertEquals(cmp, q.comparator());
146 >        Integer[] ints = new Integer[SIZE];
147 >        for (int i = 0; i < SIZE; ++i)
148 >            ints[i] = new Integer(i);
149 >        q.addAll(Arrays.asList(ints));
150 >        for (int i = SIZE-1; i >= 0; --i)
151 >            assertEquals(ints[i], q.poll());
152      }
153  
154 +    /**
155 +     * isEmpty is true before add, false after
156 +     */
157      public void testEmpty() {
158          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
159          assertTrue(q.isEmpty());
160          assertEquals(NOCAP, q.remainingCapacity());
161 <        q.add(new Integer(1));
161 >        q.add(one);
162          assertFalse(q.isEmpty());
163 <        q.add(new Integer(2));
163 >        q.add(two);
164          q.remove();
165          q.remove();
166          assertTrue(q.isEmpty());
167      }
168  
169 <    public void testRemainingCapacity(){
169 >    /**
170 >     * remainingCapacity does not change when elements added or removed,
171 >     * but size does
172 >     */
173 >    public void testRemainingCapacity() {
174          PriorityBlockingQueue q = populatedQueue(SIZE);
175          for (int i = 0; i < SIZE; ++i) {
176              assertEquals(NOCAP, q.remainingCapacity());
# Line 144 | Line 184 | public class PriorityBlockingQueueTest e
184          }
185      }
186  
187 <    public void testOfferNull(){
188 <        try {
189 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
150 <            q.offer(null);
151 <            fail("should throw NPE");
152 <        } catch (NullPointerException success) { }  
153 <    }
154 <
187 >    /**
188 >     * Offer of comparable element succeeds
189 >     */
190      public void testOffer() {
191          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
192 <        assertTrue(q.offer(new Integer(0)));
193 <        assertTrue(q.offer(new Integer(1)));
192 >        assertTrue(q.offer(zero));
193 >        assertTrue(q.offer(one));
194      }
195  
196 +    /**
197 +     * Offer of non-Comparable throws CCE
198 +     */
199      public void testOfferNonComparable() {
200          try {
201              PriorityBlockingQueue q = new PriorityBlockingQueue(1);
202              q.offer(new Object());
203              q.offer(new Object());
204              q.offer(new Object());
205 <            fail("should throw CCE");
206 <        }
169 <        catch(ClassCastException success) {}
205 >            shouldThrow();
206 >        } catch (ClassCastException success) {}
207      }
208  
209 <    public void testAdd(){
209 >    /**
210 >     * add of comparable succeeds
211 >     */
212 >    public void testAdd() {
213          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
214          for (int i = 0; i < SIZE; ++i) {
215              assertEquals(i, q.size());
# Line 177 | Line 217 | public class PriorityBlockingQueueTest e
217          }
218      }
219  
220 <    public void testAddAll1(){
221 <        try {
222 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
223 <            q.addAll(null);
184 <            fail("Cannot add null collection");
185 <        }
186 <        catch (NullPointerException success) {}
187 <    }
188 <    public void testAddAll2(){
220 >    /**
221 >     * addAll(this) throws IAE
222 >     */
223 >    public void testAddAllSelf() {
224          try {
225 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
226 <            Integer[] ints = new Integer[SIZE];
227 <            q.addAll(Arrays.asList(ints));
228 <            fail("Cannot add null elements");
194 <        }
195 <        catch (NullPointerException success) {}
225 >            PriorityBlockingQueue q = populatedQueue(SIZE);
226 >            q.addAll(q);
227 >            shouldThrow();
228 >        } catch (IllegalArgumentException success) {}
229      }
230 <    public void testAddAll3(){
230 >
231 >    /**
232 >     * addAll of a collection with any null elements throws NPE after
233 >     * possibly adding some elements
234 >     */
235 >    public void testAddAll3() {
236          try {
237              PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
238              Integer[] ints = new Integer[SIZE];
239              for (int i = 0; i < SIZE-1; ++i)
240                  ints[i] = new Integer(i);
241              q.addAll(Arrays.asList(ints));
242 <            fail("Cannot add null elements");
243 <        }
206 <        catch (NullPointerException success) {}
242 >            shouldThrow();
243 >        } catch (NullPointerException success) {}
244      }
245  
246 <    public void testAddAll5(){
247 <        try {
248 <            Integer[] empty = new Integer[0];
249 <            Integer[] ints = new Integer[SIZE];
250 <            for (int i = SIZE-1; i >= 0; --i)
251 <                ints[i] = new Integer(i);
252 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
253 <            assertFalse(q.addAll(Arrays.asList(empty)));
254 <            assertTrue(q.addAll(Arrays.asList(ints)));
255 <            for (int i = 0; i < SIZE; ++i)
256 <                assertEquals(ints[i], q.poll());
257 <        }
258 <        finally {}
246 >    /**
247 >     * Queue contains all elements of successful addAll
248 >     */
249 >    public void testAddAll5() {
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 <     public void testPutNull() {
262 <        try {
263 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
264 <            q.put(null);
265 <            fail("put should throw NPE");
266 <        }
267 <        catch (NullPointerException success){
268 <        }  
269 <     }
233 <
234 <     public void testPut() {
235 <         try {
236 <             PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
237 <             for (int i = 0; i < SIZE; ++i) {
238 <                 Integer I = new Integer(i);
239 <                 q.put(I);
240 <                 assertTrue(q.contains(I));
241 <             }
242 <             assertEquals(SIZE, q.size());
243 <         }
244 <         finally {
261 >    /**
262 >     * all elements successfully put are contained
263 >     */
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 <    public void testPutWithTake() {
274 >    /**
275 >     * put doesn't block waiting for take
276 >     */
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;
260 <                        q.put(new Integer(0));
261 <                        ++added;
262 <                        threadAssertTrue(added == 4);
263 <                    } finally {
264 <                    }
265 <                }
266 <            });
267 <        try {
268 <            t.start();
269 <            Thread.sleep(SHORT_DELAY_MS);
270 <            q.take();
271 <            t.interrupt();
272 <            t.join();
273 <        } catch (Exception e){
274 <            fail("Unexpected exception");
275 <        }
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 <    public void testTimedOffer() {
291 >    /**
292 >     * timed offer does not time out
293 >     */
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));
287 <                    } finally { }
288 <                }
289 <            });
290 <        
291 <        try {
292 <            t.start();
293 <            Thread.sleep(SMALL_DELAY_MS);
294 <            t.interrupt();
295 <            t.join();
296 <        } catch (Exception e){
297 <            fail("Unexpected exception");
298 <        }
299 <    }
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 <    public void testTake(){
302 <        try {
303 <            PriorityBlockingQueue q = populatedQueue(SIZE);
304 <            for (int i = 0; i < SIZE; ++i) {
305 <                assertEquals(i, ((Integer)q.take()).intValue());
306 <            }
307 <        } catch (InterruptedException e){
308 <            fail("Unexpected exception");
309 <        }  
304 >        awaitTermination(t);
305      }
306  
307 <    public void testTakeFromEmpty() {
308 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
309 <        Thread t = new Thread(new Runnable() {
310 <                public void run(){
311 <                    try {
312 <                        q.take();
313 <                        threadFail("Should block");
319 <                    } catch (InterruptedException success){ }                
320 <                }
321 <            });
322 <        try {
323 <            t.start();
324 <            Thread.sleep(SHORT_DELAY_MS);
325 <            t.interrupt();
326 <            t.join();
327 <        } catch (Exception e){
328 <            fail("Unexpected exception");
307 >    /**
308 >     * take retrieves elements in priority order
309 >     */
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 <    public void testBlockingTake(){
318 <        Thread t = new Thread(new Runnable() {
319 <                public void run() {
320 <                    try {
321 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
322 <                        for (int i = 0; i < SIZE; ++i) {
323 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
324 <                        }
325 <                        q.take();
326 <                        threadFail("take should block");
327 <                    } catch (InterruptedException success){
343 <                    }  
344 <                }});
345 <        t.start();
346 <        try {
347 <           Thread.sleep(SHORT_DELAY_MS);
348 <           t.interrupt();
349 <           t.join();
350 <        }
351 <        catch (InterruptedException ie) {
352 <            fail("Unexpected exception");
353 <        }
354 <    }
317 >    /**
318 >     * Take removes existing elements until empty, then blocks interruptibly
319 >     */
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 <    public void testPoll(){
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
352 >     */
353 >    public void testPoll() {
354          PriorityBlockingQueue q = populatedQueue(SIZE);
355          for (int i = 0; i < SIZE; ++i) {
356 <            assertEquals(i, ((Integer)q.poll()).intValue());
356 >            assertEquals(i, q.poll());
357          }
358 <        assertNull(q.poll());
358 >        assertNull(q.poll());
359      }
360  
361 <    public void testTimedPoll0() {
362 <        try {
363 <            PriorityBlockingQueue q = populatedQueue(SIZE);
364 <            for (int i = 0; i < SIZE; ++i) {
365 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
366 <            }
367 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
368 <        } catch (InterruptedException e){
369 <            fail("Unexpected exception");
374 <        }  
361 >    /**
362 >     * timed poll with zero timeout succeeds when non-empty, else times out
363 >     */
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 <    public void testTimedPoll() {
373 <        try {
374 <            PriorityBlockingQueue q = populatedQueue(SIZE);
375 <            for (int i = 0; i < SIZE; ++i) {
376 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
377 <            }
378 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
379 <        } catch (InterruptedException e){
380 <            fail("Unexpected exception");
381 <        }  
382 <    }
383 <
384 <    public void testInterruptedTimedPoll(){
385 <        Thread t = new Thread(new Runnable() {
391 <                public void run() {
392 <                    try {
393 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
394 <                        for (int i = 0; i < SIZE; ++i) {
395 <                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
396 <                        }
397 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
398 <                    } catch (InterruptedException success){
399 <                    }  
400 <                }});
401 <        t.start();
402 <        try {
403 <           Thread.sleep(SHORT_DELAY_MS);
404 <           t.interrupt();
405 <           t.join();
406 <        }
407 <        catch (InterruptedException ie) {
408 <            fail("Unexpected exception");
409 <        }
372 >    /**
373 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
374 >     */
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 <    public void testTimedPollWithOffer(){
389 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
390 <        Thread t = new Thread(new Runnable() {
391 <                public void run(){
392 <                    try {
393 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
394 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
395 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
396 <                        threadFail("Should block");
397 <                    } catch (InterruptedException success) { }                
388 >    /**
389 >     * Interrupted timed poll throws InterruptedException instead of
390 >     * returning timeout status
391 >     */
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 <            fail("Unexpected exception");
432 <        }
433 <    }  
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 <    public void testPeek(){
418 >    /**
419 >     * peek returns next element, or null if empty
420 >     */
421 >    public void testPeek() {
422          PriorityBlockingQueue q = populatedQueue(SIZE);
423          for (int i = 0; i < SIZE; ++i) {
424 <            assertEquals(i, ((Integer)q.peek()).intValue());
425 <            q.poll();
424 >            assertEquals(i, q.peek());
425 >            assertEquals(i, q.poll());
426              assertTrue(q.peek() == null ||
427 <                       i != ((Integer)q.peek()).intValue());
427 >                       !q.peek().equals(i));
428          }
429 <        assertNull(q.peek());
429 >        assertNull(q.peek());
430      }
431  
432 <    public void testElement(){
432 >    /**
433 >     * element returns next element, or throws NSEE if empty
434 >     */
435 >    public void testElement() {
436          PriorityBlockingQueue q = populatedQueue(SIZE);
437          for (int i = 0; i < SIZE; ++i) {
438 <            assertEquals(i, ((Integer)q.element()).intValue());
439 <            q.poll();
438 >            assertEquals(i, q.element());
439 >            assertEquals(i, q.poll());
440          }
441          try {
442              q.element();
443 <            fail("no such element");
444 <        }
457 <        catch (NoSuchElementException success) {}
443 >            shouldThrow();
444 >        } catch (NoSuchElementException success) {}
445      }
446  
447 <    public void testRemove(){
447 >    /**
448 >     * remove removes next element, or throws NSEE if empty
449 >     */
450 >    public void testRemove() {
451          PriorityBlockingQueue q = populatedQueue(SIZE);
452          for (int i = 0; i < SIZE; ++i) {
453 <            assertEquals(i, ((Integer)q.remove()).intValue());
453 >            assertEquals(i, q.remove());
454          }
455          try {
456              q.remove();
457 <            fail("remove should throw");
458 <        } catch (NoSuchElementException success){
469 <        }  
457 >            shouldThrow();
458 >        } catch (NoSuchElementException success) {}
459      }
460  
461 <    public void testRemoveElement(){
462 <        PriorityBlockingQueue q = populatedQueue(SIZE);
463 <        for (int i = 1; i < SIZE; i+=2) {
464 <            assertTrue(q.remove(new Integer(i)));
476 <        }
477 <        for (int i = 0; i < SIZE; i+=2) {
478 <            assertTrue(q.remove(new Integer(i)));
479 <            assertFalse(q.remove(new Integer(i+1)));
480 <        }
481 <        assertTrue(q.isEmpty());
482 <    }
483 <        
484 <    public void testContains(){
461 >    /**
462 >     * contains(x) reports true when elements added but not yet removed
463 >     */
464 >    public void testContains() {
465          PriorityBlockingQueue q = populatedQueue(SIZE);
466          for (int i = 0; i < SIZE; ++i) {
467              assertTrue(q.contains(new Integer(i)));
# Line 490 | Line 470 | public class PriorityBlockingQueueTest e
470          }
471      }
472  
473 <    public void testClear(){
473 >    /**
474 >     * clear removes all elements
475 >     */
476 >    public void testClear() {
477          PriorityBlockingQueue q = populatedQueue(SIZE);
478          q.clear();
479          assertTrue(q.isEmpty());
480          assertEquals(0, q.size());
481 <        assertEquals(NOCAP, q.remainingCapacity());
499 <        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      }
487  
488 <    public void testContainsAll(){
488 >    /**
489 >     * containsAll(c) is true when c contains a subset of elements
490 >     */
491 >    public void testContainsAll() {
492          PriorityBlockingQueue q = populatedQueue(SIZE);
493          PriorityBlockingQueue p = new PriorityBlockingQueue(SIZE);
494          for (int i = 0; i < SIZE; ++i) {
# Line 513 | Line 499 | public class PriorityBlockingQueueTest e
499          assertTrue(p.containsAll(q));
500      }
501  
502 <    public void testRetainAll(){
502 >    /**
503 >     * retainAll(c) retains only those elements of c and reports true if changed
504 >     */
505 >    public void testRetainAll() {
506          PriorityBlockingQueue q = populatedQueue(SIZE);
507          PriorityBlockingQueue p = populatedQueue(SIZE);
508          for (int i = 0; i < SIZE; ++i) {
# Line 529 | Line 518 | public class PriorityBlockingQueueTest e
518          }
519      }
520  
521 <    public void testRemoveAll(){
521 >    /**
522 >     * removeAll(c) removes only those elements of c and reports true if changed
523 >     */
524 >    public void testRemoveAll() {
525          for (int i = 1; i < SIZE; ++i) {
526              PriorityBlockingQueue q = populatedQueue(SIZE);
527              PriorityBlockingQueue p = populatedQueue(i);
# Line 542 | Line 534 | public class PriorityBlockingQueueTest e
534          }
535      }
536  
537 <    public void testToArray(){
537 >    /**
538 >     * toArray contains all elements
539 >     */
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++)
551 <            assertEquals(o[i], q.take());
552 <        } catch (InterruptedException e){
553 <            fail("Unexpected exception");
554 <        }    
544 >        for (int i = 0; i < o.length; i++)
545 >            assertSame(o[i], q.take());
546      }
547  
548 <    public void testToArray2(){
549 <        PriorityBlockingQueue q = populatedQueue(SIZE);
550 <        Integer[] ints = new Integer[SIZE];
551 <        ints = (Integer[])q.toArray(ints);
548 >    /**
549 >     * toArray(a) contains all elements
550 >     */
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++)
564 <                assertEquals(ints[i], q.take());
565 <        } catch (InterruptedException e){
566 <            fail("Unexpected exception");
567 <        }    
557 >        for (int i = 0; i < ints.length; i++)
558 >            assertSame(ints[i], q.take());
559      }
560 <    
561 <    public void testIterator(){
560 >
561 >    /**
562 >     * toArray(incompatible array type) throws ArrayStoreException
563 >     */
564 >    public void testToArray1_BadArg() {
565 >        PriorityBlockingQueue q = populatedQueue(SIZE);
566 >        try {
567 >            q.toArray(new String[10]);
568 >            shouldThrow();
569 >        } catch (ArrayStoreException success) {}
570 >    }
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          }
583          assertEquals(i, SIZE);
584      }
585  
586 <    public void testIteratorRemove () {
587 <
586 >    /**
587 >     * iterator.remove removes current element
588 >     */
589 >    public void testIteratorRemove() {
590          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
584
591          q.add(new Integer(2));
592          q.add(new Integer(1));
593          q.add(new Integer(3));
# Line 596 | Line 602 | public class PriorityBlockingQueueTest e
602          assertFalse(it.hasNext());
603      }
604  
605 <
606 <    public void testToString(){
605 >    /**
606 >     * toString contains toStrings of elements
607 >     */
608 >    public void testToString() {
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 +     * timed poll transfers elements across Executor tasks
618 +     */
619      public void testPollInExecutor() {
609
620          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
621 <
621 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
622          ExecutorService executor = Executors.newFixedThreadPool(2);
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  
614        executor.execute(new Runnable() {
615            public void run() {
616                threadAssertNull(q.poll());
617                try {
618                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
619                    threadAssertTrue(q.isEmpty());
620                }
621                catch (InterruptedException e) {
622                    threadFail("should not be interrupted");
623                }
624            }
625        });
626
627        executor.execute(new Runnable() {
628            public void run() {
629                try {
630                    Thread.sleep(SMALL_DELAY_MS);
631                    q.put(new Integer(1));
632                }
633                catch (InterruptedException e) {
634                    threadFail("should not be interrupted");
635                }
636            }
637        });
638        
637          joinPool(executor);
638 +    }
639  
640 +    /**
641 +     * A deserialized serialized queue has same elements
642 +     */
643 +    public void testSerialization() throws Exception {
644 +        Queue x = populatedQueue(SIZE);
645 +        Queue y = serialClone(x);
646 +
647 +        assertNotSame(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 <    public void testSerialization() {
656 >    /**
657 >     * drainTo(c) empties queue into another collection c
658 >     */
659 >    public void testDrainTo() {
660          PriorityBlockingQueue q = populatedQueue(SIZE);
661 <        try {
662 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
663 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
664 <            out.writeObject(q);
665 <            out.close();
666 <
667 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
668 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
669 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
670 <            assertEquals(q.size(), r.size());
671 <            while (!q.isEmpty())
672 <                assertEquals(q.remove(), r.remove());
673 <        } catch(Exception e){
674 <            fail("unexpected exception");
661 >        ArrayList l = new ArrayList();
662 >        q.drainTo(l);
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() throws InterruptedException {
684 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
685 >        Thread t = new Thread(new CheckedRunnable() {
686 >            public void realRun() {
687 >                q.put(new Integer(SIZE+1));
688 >            }});
689 >
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 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 >            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;
711 >            assertEquals(k, l.size());
712 >            assertEquals(SIZE-k, q.size());
713 >            for (int j = 0; j < k; ++j)
714 >                assertEquals(l.get(j), new Integer(j));
715 >            while (q.poll() != null) ;
716 >        }
717 >    }
718 >
719 >    /**
720 >     * remove(null), contains(null) always return false
721 >     */
722 >    public void testNeverContainsNull() {
723 >        Collection<?>[] qs = {
724 >            new PriorityBlockingQueue<Object>(),
725 >            populatedQueue(2),
726 >        };
727 >
728 >        for (Collection<?> q : qs) {
729 >            assertFalse(q.contains(null));
730 >            assertFalse(q.remove(null));
731          }
732      }
733  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines