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.3 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.43 by dl, Fri May 6 11:22:07 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines