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.75 by jsr166, Sun May 14 00:48:20 2017 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 >        main(suite(), args);
42      }
43  
44      public static Test suite() {
45 <        return new TestSuite(PriorityBlockingQueueTest.class);
45 >        class Implementation implements CollectionImplementation {
46 >            public Class<?> klazz() { return PriorityBlockingQueue.class; }
47 >            public Collection emptyCollection() { return new PriorityBlockingQueue(); }
48 >            public Object makeElement(int i) { return i; }
49 >            public boolean isConcurrent() { return true; }
50 >            public boolean permitsNulls() { return false; }
51 >        }
52 >        return newTestSuite(PriorityBlockingQueueTest.class,
53 >                            new Generic().testSuite(),
54 >                            new InitialCapacity().testSuite(),
55 >                            CollectionTest.testSuite(new Implementation()));
56      }
57  
22    private static final int NOCAP = Integer.MAX_VALUE;
23
58      /** Sample Comparator */
59 <    static class MyReverseComparator implements Comparator {
59 >    static class MyReverseComparator implements Comparator {
60          public int compare(Object x, Object y) {
61 <            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;
61 >            return ((Comparable)y).compareTo(x);
62          }
63      }
64  
35
65      /**
66 <     * Create a queue of given size containing consecutive
67 <     * Integers 0 ... n.
66 >     * Returns a new queue of given size containing consecutive
67 >     * Integers 0 ... n - 1.
68       */
69 <    private PriorityBlockingQueue populatedQueue(int n) {
70 <        PriorityBlockingQueue q = new PriorityBlockingQueue(n);
69 >    private static PriorityBlockingQueue<Integer> populatedQueue(int n) {
70 >        PriorityBlockingQueue<Integer> q =
71 >            new PriorityBlockingQueue<Integer>(n);
72          assertTrue(q.isEmpty());
73 <        for(int i = n-1; i >= 0; i-=2)
74 <            assertTrue(q.offer(new Integer(i)));
75 <        for(int i = (n & 1); i < n; i+=2)
76 <            assertTrue(q.offer(new Integer(i)));
73 >        for (int i = n - 1; i >= 0; i -= 2)
74 >            assertTrue(q.offer(new Integer(i)));
75 >        for (int i = (n & 1); i < n; i += 2)
76 >            assertTrue(q.offer(new Integer(i)));
77          assertFalse(q.isEmpty());
78 <        assertEquals(NOCAP, q.remainingCapacity());
79 <        assertEquals(n, q.size());
78 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
79 >        assertEquals(n, q.size());
80 >        assertEquals((Integer) 0, q.peek());
81          return q;
82      }
83 <
84 <    public void testConstructor1(){
85 <        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
83 >
84 >    /**
85 >     * A new queue has unbounded capacity
86 >     */
87 >    public void testConstructor1() {
88 >        assertEquals(Integer.MAX_VALUE,
89 >                     new PriorityBlockingQueue(SIZE).remainingCapacity());
90      }
91  
92 <    public void testConstructor2(){
92 >    /**
93 >     * Constructor throws IAE if capacity argument nonpositive
94 >     */
95 >    public void testConstructor2() {
96          try {
97 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
98 <            fail("Cannot make zero-sized");
99 <        }
62 <        catch (IllegalArgumentException success) {}
97 >            new PriorityBlockingQueue(0);
98 >            shouldThrow();
99 >        } catch (IllegalArgumentException success) {}
100      }
101  
102 <    public void testConstructor3(){
103 <
102 >    /**
103 >     * Initializing from null Collection throws NPE
104 >     */
105 >    public void testConstructor3() {
106          try {
107 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
108 <            fail("Cannot make from null collection");
109 <        }
71 <        catch (NullPointerException success) {}
107 >            new PriorityBlockingQueue(null);
108 >            shouldThrow();
109 >        } catch (NullPointerException success) {}
110      }
111  
112 <    public void testConstructor4(){
112 >    /**
113 >     * Initializing from Collection of null elements throws NPE
114 >     */
115 >    public void testConstructor4() {
116 >        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
117          try {
118 <            Integer[] ints = new Integer[SIZE];
119 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
120 <            fail("Cannot make with null elements");
79 <        }
80 <        catch (NullPointerException success) {}
118 >            new PriorityBlockingQueue(elements);
119 >            shouldThrow();
120 >        } catch (NullPointerException success) {}
121      }
122  
123 <    public void testConstructor5(){
124 <        try {
125 <            Integer[] ints = new Integer[SIZE];
126 <            for (int i = 0; i < SIZE-1; ++i)
127 <                ints[i] = new Integer(i);
128 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
129 <            fail("Cannot make with null elements");
130 <        }
131 <        catch (NullPointerException success) {}
123 >    /**
124 >     * Initializing from Collection with some null elements throws NPE
125 >     */
126 >    public void testConstructor5() {
127 >        Integer[] ints = new Integer[SIZE];
128 >        for (int i = 0; i < SIZE - 1; ++i)
129 >            ints[i] = i;
130 >        Collection<Integer> elements = Arrays.asList(ints);
131 >        try {
132 >            new PriorityBlockingQueue(elements);
133 >            shouldThrow();
134 >        } catch (NullPointerException success) {}
135      }
136  
137 <    public void testConstructor6(){
138 <        try {
139 <            Integer[] ints = new Integer[SIZE];
140 <            for (int i = 0; i < SIZE; ++i)
141 <                ints[i] = new Integer(i);
142 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
143 <            for (int i = 0; i < SIZE; ++i)
144 <                assertEquals(ints[i], q.poll());
145 <        }
146 <        finally {}
137 >    /**
138 >     * Queue contains all elements of collection used to initialize
139 >     */
140 >    public void testConstructor6() {
141 >        Integer[] ints = new Integer[SIZE];
142 >        for (int i = 0; i < SIZE; ++i)
143 >            ints[i] = i;
144 >        PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
145 >        for (int i = 0; i < SIZE; ++i)
146 >            assertEquals(ints[i], q.poll());
147      }
148  
149 <    public void testConstructor7(){
150 <        try {
151 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, new MyReverseComparator());
152 <            Integer[] ints = new Integer[SIZE];
153 <            for (int i = 0; i < SIZE; ++i)
154 <                ints[i] = new Integer(i);
155 <            q.addAll(Arrays.asList(ints));
156 <            for (int i = SIZE-1; i >= 0; --i)
157 <                assertEquals(ints[i], q.poll());
158 <        }
159 <        finally {}
149 >    /**
150 >     * The comparator used in constructor is used
151 >     */
152 >    public void testConstructor7() {
153 >        MyReverseComparator cmp = new MyReverseComparator();
154 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
155 >        assertEquals(cmp, q.comparator());
156 >        Integer[] ints = new Integer[SIZE];
157 >        for (int i = 0; i < SIZE; ++i)
158 >            ints[i] = new Integer(i);
159 >        q.addAll(Arrays.asList(ints));
160 >        for (int i = SIZE - 1; i >= 0; --i)
161 >            assertEquals(ints[i], q.poll());
162      }
163  
164 +    /**
165 +     * isEmpty is true before add, false after
166 +     */
167      public void testEmpty() {
168          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
169          assertTrue(q.isEmpty());
170 <        assertEquals(NOCAP, q.remainingCapacity());
171 <        q.add(new Integer(1));
170 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
171 >        q.add(one);
172          assertFalse(q.isEmpty());
173 <        q.add(new Integer(2));
173 >        q.add(two);
174          q.remove();
175          q.remove();
176          assertTrue(q.isEmpty());
177      }
178  
179 <    public void testRemainingCapacity(){
180 <        PriorityBlockingQueue q = populatedQueue(SIZE);
179 >    /**
180 >     * remainingCapacity() always returns Integer.MAX_VALUE
181 >     */
182 >    public void testRemainingCapacity() {
183 >        BlockingQueue q = populatedQueue(SIZE);
184          for (int i = 0; i < SIZE; ++i) {
185 <            assertEquals(NOCAP, q.remainingCapacity());
186 <            assertEquals(SIZE-i, q.size());
187 <            q.remove();
185 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
186 >            assertEquals(SIZE - i, q.size());
187 >            assertEquals(i, q.remove());
188          }
189          for (int i = 0; i < SIZE; ++i) {
190 <            assertEquals(NOCAP, q.remainingCapacity());
190 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191              assertEquals(i, q.size());
192 <            q.add(new Integer(i));
192 >            assertTrue(q.add(i));
193          }
194      }
195  
196 <    public void testOfferNull(){
197 <        try {
198 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
148 <            q.offer(null);
149 <            fail("should throw NPE");
150 <        } catch (NullPointerException success) { }  
151 <    }
152 <
196 >    /**
197 >     * Offer of comparable element succeeds
198 >     */
199      public void testOffer() {
200          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201 <        assertTrue(q.offer(new Integer(0)));
202 <        assertTrue(q.offer(new Integer(1)));
201 >        assertTrue(q.offer(zero));
202 >        assertTrue(q.offer(one));
203      }
204  
205 +    /**
206 +     * Offer of non-Comparable throws CCE
207 +     */
208      public void testOfferNonComparable() {
209 +        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210          try {
161            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
162            q.offer(new Object());
163            q.offer(new Object());
211              q.offer(new Object());
212 <            fail("should throw CCE");
212 >            shouldThrow();
213 >        } catch (ClassCastException success) {
214 >            assertTrue(q.isEmpty());
215 >            assertEquals(0, q.size());
216 >            assertNull(q.poll());
217          }
167        catch(ClassCastException success) {}
218      }
219  
220 <    public void testAdd(){
220 >    /**
221 >     * add of comparable succeeds
222 >     */
223 >    public void testAdd() {
224          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
225          for (int i = 0; i < SIZE; ++i) {
226              assertEquals(i, q.size());
# Line 175 | Line 228 | public class PriorityBlockingQueueTest e
228          }
229      }
230  
231 <    public void testAddAll1(){
231 >    /**
232 >     * addAll(this) throws IAE
233 >     */
234 >    public void testAddAllSelf() {
235 >        PriorityBlockingQueue q = populatedQueue(SIZE);
236          try {
237 <            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
238 <            q.addAll(null);
239 <            fail("Cannot add null collection");
183 <        }
184 <        catch (NullPointerException success) {}
237 >            q.addAll(q);
238 >            shouldThrow();
239 >        } catch (IllegalArgumentException success) {}
240      }
241 <    public void testAddAll2(){
241 >
242 >    /**
243 >     * addAll of a collection with any null elements throws NPE after
244 >     * possibly adding some elements
245 >     */
246 >    public void testAddAll3() {
247 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
248 >        Integer[] ints = new Integer[SIZE];
249 >        for (int i = 0; i < SIZE - 1; ++i)
250 >            ints[i] = new Integer(i);
251          try {
188            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
189            Integer[] ints = new Integer[SIZE];
252              q.addAll(Arrays.asList(ints));
253 <            fail("Cannot add null elements");
254 <        }
193 <        catch (NullPointerException success) {}
253 >            shouldThrow();
254 >        } catch (NullPointerException success) {}
255      }
256 <    public void testAddAll3(){
257 <        try {
258 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
259 <            Integer[] ints = new Integer[SIZE];
260 <            for (int i = 0; i < SIZE-1; ++i)
261 <                ints[i] = new Integer(i);
262 <            q.addAll(Arrays.asList(ints));
263 <            fail("Cannot add null elements");
264 <        }
265 <        catch (NullPointerException success) {}
256 >
257 >    /**
258 >     * Queue contains all elements of successful addAll
259 >     */
260 >    public void testAddAll5() {
261 >        Integer[] empty = new Integer[0];
262 >        Integer[] ints = new Integer[SIZE];
263 >        for (int i = SIZE - 1; i >= 0; --i)
264 >            ints[i] = new Integer(i);
265 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266 >        assertFalse(q.addAll(Arrays.asList(empty)));
267 >        assertTrue(q.addAll(Arrays.asList(ints)));
268 >        for (int i = 0; i < SIZE; ++i)
269 >            assertEquals(ints[i], q.poll());
270      }
271  
272 <    public void testAddAll5(){
273 <        try {
274 <            Integer[] empty = new Integer[0];
275 <            Integer[] ints = new Integer[SIZE];
276 <            for (int i = SIZE-1; i >= 0; --i)
277 <                ints[i] = new Integer(i);
278 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
279 <            assertFalse(q.addAll(Arrays.asList(empty)));
280 <            assertTrue(q.addAll(Arrays.asList(ints)));
216 <            for (int i = 0; i < SIZE; ++i)
217 <                assertEquals(ints[i], q.poll());
218 <        }
219 <        finally {}
220 <    }
221 <
222 <     public void testPutNull() {
223 <        try {
224 <            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
225 <            q.put(null);
226 <            fail("put should throw NPE");
227 <        }
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 {
272 >    /**
273 >     * all elements successfully put are contained
274 >     */
275 >    public void testPut() {
276 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
277 >        for (int i = 0; i < SIZE; ++i) {
278 >            Integer x = new Integer(i);
279 >            q.put(x);
280 >            assertTrue(q.contains(x));
281          }
282 +        assertEquals(SIZE, q.size());
283      }
284  
285 <    public void testPutWithTake() {
285 >    /**
286 >     * put doesn't block waiting for take
287 >     */
288 >    public void testPutWithTake() throws InterruptedException {
289          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
290 <        Thread t = new Thread(new Runnable() {
291 <                public void run(){
292 <                    int added = 0;
293 <                    try {
294 <                        q.put(new Integer(0));
295 <                        ++added;
296 <                        q.put(new Integer(0));
297 <                        ++added;
298 <                        q.put(new Integer(0));
299 <                        ++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");
273 <        }
290 >        final int size = 4;
291 >        Thread t = newStartedThread(new CheckedRunnable() {
292 >            public void realRun() {
293 >                for (int i = 0; i < size; i++)
294 >                    q.put(new Integer(0));
295 >            }});
296 >
297 >        awaitTermination(t);
298 >        assertEquals(size, q.size());
299 >        q.take();
300      }
301  
302 <    public void testTimedOffer() {
302 >    /**
303 >     * timed offer does not time out
304 >     */
305 >    public void testTimedOffer() throws InterruptedException {
306          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
307 <        Thread t = new Thread(new Runnable() {
308 <                public void run(){
309 <                    try {
310 <                        q.put(new Integer(0));
311 <                        q.put(new Integer(0));
312 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
313 <                        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 <    }
307 >        Thread t = newStartedThread(new CheckedRunnable() {
308 >            public void realRun() {
309 >                q.put(new Integer(0));
310 >                q.put(new Integer(0));
311 >                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
312 >                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
313 >            }});
314  
315 <    public void testTake(){
300 <        try {
301 <            PriorityBlockingQueue q = populatedQueue(SIZE);
302 <            for (int i = 0; i < SIZE; ++i) {
303 <                assertEquals(i, ((Integer)q.take()).intValue());
304 <            }
305 <        } catch (InterruptedException e){
306 <            fail("Unexpected exception");
307 <        }  
315 >        awaitTermination(t);
316      }
317  
318 <    public void testTakeFromEmpty() {
319 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
320 <        Thread t = new Thread(new Runnable() {
321 <                public void run(){
322 <                    try {
323 <                        q.take();
324 <                        threadFail("Should block");
317 <                    } catch (InterruptedException success){ }                
318 <                }
319 <            });
320 <        try {
321 <            t.start();
322 <            Thread.sleep(SHORT_DELAY_MS);
323 <            t.interrupt();
324 <            t.join();
325 <        } catch (Exception e){
326 <            fail("Unexpected exception");
318 >    /**
319 >     * take retrieves elements in priority order
320 >     */
321 >    public void testTake() throws InterruptedException {
322 >        PriorityBlockingQueue q = populatedQueue(SIZE);
323 >        for (int i = 0; i < SIZE; ++i) {
324 >            assertEquals(i, q.take());
325          }
326      }
327  
328 <    public void testBlockingTake(){
329 <        Thread t = new Thread(new Runnable() {
330 <                public void run() {
331 <                    try {
332 <                        PriorityBlockingQueue q = populatedQueue(SIZE);
333 <                        for (int i = 0; i < SIZE; ++i) {
334 <                            threadAssertEquals(i, ((Integer)q.take()).intValue());
335 <                        }
336 <                        q.take();
339 <                        threadFail("take should block");
340 <                    } catch (InterruptedException success){
341 <                    }  
342 <                }});
343 <        t.start();
344 <        try {
345 <           Thread.sleep(SHORT_DELAY_MS);
346 <           t.interrupt();
347 <           t.join();
348 <        }
349 <        catch (InterruptedException ie) {
350 <            fail("Unexpected exception");
351 <        }
352 <    }
328 >    /**
329 >     * Take removes existing elements until empty, then blocks interruptibly
330 >     */
331 >    public void testBlockingTake() throws InterruptedException {
332 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
333 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334 >        Thread t = newStartedThread(new CheckedRunnable() {
335 >            public void realRun() throws InterruptedException {
336 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
337  
338 +                Thread.currentThread().interrupt();
339 +                try {
340 +                    q.take();
341 +                    shouldThrow();
342 +                } catch (InterruptedException success) {}
343 +                assertFalse(Thread.interrupted());
344 +
345 +                pleaseInterrupt.countDown();
346 +                try {
347 +                    q.take();
348 +                    shouldThrow();
349 +                } catch (InterruptedException success) {}
350 +                assertFalse(Thread.interrupted());
351 +            }});
352 +
353 +        await(pleaseInterrupt);
354 +        assertThreadBlocks(t, Thread.State.WAITING);
355 +        t.interrupt();
356 +        awaitTermination(t);
357 +    }
358  
359 <    public void testPoll(){
359 >    /**
360 >     * poll succeeds unless empty
361 >     */
362 >    public void testPoll() {
363          PriorityBlockingQueue q = populatedQueue(SIZE);
364          for (int i = 0; i < SIZE; ++i) {
365 <            assertEquals(i, ((Integer)q.poll()).intValue());
365 >            assertEquals(i, q.poll());
366          }
367 <        assertNull(q.poll());
367 >        assertNull(q.poll());
368      }
369  
370 <    public void testTimedPoll0() {
371 <        try {
372 <            PriorityBlockingQueue q = populatedQueue(SIZE);
373 <            for (int i = 0; i < SIZE; ++i) {
374 <                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
375 <            }
376 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
377 <        } catch (InterruptedException e){
378 <            fail("Unexpected exception");
372 <        }  
370 >    /**
371 >     * timed poll with zero timeout succeeds when non-empty, else times out
372 >     */
373 >    public void testTimedPoll0() throws InterruptedException {
374 >        PriorityBlockingQueue q = populatedQueue(SIZE);
375 >        for (int i = 0; i < SIZE; ++i) {
376 >            assertEquals(i, q.poll(0, MILLISECONDS));
377 >        }
378 >        assertNull(q.poll(0, MILLISECONDS));
379      }
380  
381 <    public void testTimedPoll() {
382 <        try {
383 <            PriorityBlockingQueue q = populatedQueue(SIZE);
384 <            for (int i = 0; i < SIZE; ++i) {
385 <                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
386 <            }
387 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
388 <        } catch (InterruptedException e){
389 <            fail("Unexpected exception");
390 <        }  
391 <    }
392 <
393 <    public void testInterruptedTimedPoll(){
394 <        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");
407 <        }
381 >    /**
382 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
383 >     */
384 >    public void testTimedPoll() throws InterruptedException {
385 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
386 >        for (int i = 0; i < SIZE; ++i) {
387 >            long startTime = System.nanoTime();
388 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
389 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
390 >        }
391 >        long startTime = System.nanoTime();
392 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
393 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
394 >        checkEmpty(q);
395      }
396  
397 <    public void testTimedPollWithOffer(){
398 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
399 <        Thread t = new Thread(new Runnable() {
400 <                public void run(){
401 <                    try {
402 <                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
403 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
404 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
405 <                        threadFail("Should block");
406 <                    } catch (InterruptedException success) { }                
397 >    /**
398 >     * Interrupted timed poll throws InterruptedException instead of
399 >     * returning timeout status
400 >     */
401 >    public void testInterruptedTimedPoll() throws InterruptedException {
402 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
403 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
404 >        Thread t = newStartedThread(new CheckedRunnable() {
405 >            public void realRun() throws InterruptedException {
406 >                long startTime = System.nanoTime();
407 >                for (int i = 0; i < SIZE; ++i) {
408 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
409                  }
421            });
422        try {
423            t.start();
424            Thread.sleep(SMALL_DELAY_MS);
425            assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
426            t.interrupt();
427            t.join();
428        } catch (Exception e){
429            fail("Unexpected exception");
430        }
431    }  
410  
411 +                pleaseInterrupt.countDown();
412 +                try {
413 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
414 +                    shouldThrow();
415 +                } catch (InterruptedException success) {}
416 +                assertFalse(Thread.interrupted());
417 +
418 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
419 +            }});
420 +
421 +        await(pleaseInterrupt);
422 +        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
423 +        t.interrupt();
424 +        awaitTermination(t);
425 +    }
426  
427 <    public void testPeek(){
427 >    /**
428 >     * peek returns next element, or null if empty
429 >     */
430 >    public void testPeek() {
431          PriorityBlockingQueue q = populatedQueue(SIZE);
432          for (int i = 0; i < SIZE; ++i) {
433 <            assertEquals(i, ((Integer)q.peek()).intValue());
434 <            q.poll();
433 >            assertEquals(i, q.peek());
434 >            assertEquals(i, q.poll());
435              assertTrue(q.peek() == null ||
436 <                       i != ((Integer)q.peek()).intValue());
436 >                       !q.peek().equals(i));
437          }
438 <        assertNull(q.peek());
438 >        assertNull(q.peek());
439      }
440  
441 <    public void testElement(){
441 >    /**
442 >     * element returns next element, or throws NSEE if empty
443 >     */
444 >    public void testElement() {
445          PriorityBlockingQueue q = populatedQueue(SIZE);
446          for (int i = 0; i < SIZE; ++i) {
447 <            assertEquals(i, ((Integer)q.element()).intValue());
448 <            q.poll();
447 >            assertEquals(i, q.element());
448 >            assertEquals(i, q.poll());
449          }
450          try {
451              q.element();
452 <            fail("no such element");
453 <        }
455 <        catch (NoSuchElementException success) {}
452 >            shouldThrow();
453 >        } catch (NoSuchElementException success) {}
454      }
455  
456 <    public void testRemove(){
456 >    /**
457 >     * remove removes next element, or throws NSEE if empty
458 >     */
459 >    public void testRemove() {
460          PriorityBlockingQueue q = populatedQueue(SIZE);
461          for (int i = 0; i < SIZE; ++i) {
462 <            assertEquals(i, ((Integer)q.remove()).intValue());
462 >            assertEquals(i, q.remove());
463          }
464          try {
465              q.remove();
466 <            fail("remove should throw");
467 <        } catch (NoSuchElementException success){
467 <        }  
466 >            shouldThrow();
467 >        } catch (NoSuchElementException success) {}
468      }
469  
470 <    public void testRemoveElement(){
471 <        PriorityBlockingQueue q = populatedQueue(SIZE);
472 <        for (int i = 1; i < SIZE; i+=2) {
473 <            assertTrue(q.remove(new Integer(i)));
474 <        }
475 <        for (int i = 0; i < SIZE; i+=2) {
476 <            assertTrue(q.remove(new Integer(i)));
477 <            assertFalse(q.remove(new Integer(i+1)));
478 <        }
479 <        assertTrue(q.isEmpty());
480 <    }
481 <        
482 <    public void testContains(){
470 >    /**
471 >     * contains(x) reports true when elements added but not yet removed
472 >     */
473 >    public void testContains() {
474          PriorityBlockingQueue q = populatedQueue(SIZE);
475          for (int i = 0; i < SIZE; ++i) {
476              assertTrue(q.contains(new Integer(i)));
# Line 488 | Line 479 | public class PriorityBlockingQueueTest e
479          }
480      }
481  
482 <    public void testClear(){
482 >    /**
483 >     * clear removes all elements
484 >     */
485 >    public void testClear() {
486          PriorityBlockingQueue q = populatedQueue(SIZE);
487          q.clear();
488          assertTrue(q.isEmpty());
489          assertEquals(0, q.size());
490 <        assertEquals(NOCAP, q.remainingCapacity());
497 <        q.add(new Integer(1));
490 >        q.add(one);
491          assertFalse(q.isEmpty());
492 +        assertTrue(q.contains(one));
493          q.clear();
494          assertTrue(q.isEmpty());
495      }
496  
497 <    public void testContainsAll(){
497 >    /**
498 >     * containsAll(c) is true when c contains a subset of elements
499 >     */
500 >    public void testContainsAll() {
501          PriorityBlockingQueue q = populatedQueue(SIZE);
502          PriorityBlockingQueue p = new PriorityBlockingQueue(SIZE);
503          for (int i = 0; i < SIZE; ++i) {
# Line 511 | Line 508 | public class PriorityBlockingQueueTest e
508          assertTrue(p.containsAll(q));
509      }
510  
511 <    public void testRetainAll(){
511 >    /**
512 >     * retainAll(c) retains only those elements of c and reports true if changed
513 >     */
514 >    public void testRetainAll() {
515          PriorityBlockingQueue q = populatedQueue(SIZE);
516          PriorityBlockingQueue p = populatedQueue(SIZE);
517          for (int i = 0; i < SIZE; ++i) {
# Line 522 | Line 522 | public class PriorityBlockingQueueTest e
522                  assertTrue(changed);
523  
524              assertTrue(q.containsAll(p));
525 <            assertEquals(SIZE-i, q.size());
525 >            assertEquals(SIZE - i, q.size());
526              p.remove();
527          }
528      }
529  
530 <    public void testRemoveAll(){
530 >    /**
531 >     * removeAll(c) removes only those elements of c and reports true if changed
532 >     */
533 >    public void testRemoveAll() {
534          for (int i = 1; i < SIZE; ++i) {
535              PriorityBlockingQueue q = populatedQueue(SIZE);
536              PriorityBlockingQueue p = populatedQueue(i);
537              assertTrue(q.removeAll(p));
538 <            assertEquals(SIZE-i, q.size());
538 >            assertEquals(SIZE - i, q.size());
539              for (int j = 0; j < i; ++j) {
540 <                Integer I = (Integer)(p.remove());
541 <                assertFalse(q.contains(I));
540 >                Integer x = (Integer)(p.remove());
541 >                assertFalse(q.contains(x));
542              }
543          }
544      }
545  
546 <    public void testToArray(){
546 >    /**
547 >     * toArray contains all elements
548 >     */
549 >    public void testToArray() throws InterruptedException {
550          PriorityBlockingQueue q = populatedQueue(SIZE);
551 <        Object[] o = q.toArray();
551 >        Object[] o = q.toArray();
552          Arrays.sort(o);
553 <        try {
554 <        for(int i = 0; i < o.length; i++)
549 <            assertEquals(o[i], q.take());
550 <        } catch (InterruptedException e){
551 <            fail("Unexpected exception");
552 <        }    
553 >        for (int i = 0; i < o.length; i++)
554 >            assertSame(o[i], q.take());
555      }
556  
557 <    public void testToArray2(){
558 <        PriorityBlockingQueue q = populatedQueue(SIZE);
559 <        Integer[] ints = new Integer[SIZE];
560 <        ints = (Integer[])q.toArray(ints);
557 >    /**
558 >     * toArray(a) contains all elements
559 >     */
560 >    public void testToArray2() throws InterruptedException {
561 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
562 >        Integer[] ints = new Integer[SIZE];
563 >        Integer[] array = q.toArray(ints);
564 >        assertSame(ints, array);
565          Arrays.sort(ints);
566 <        try {
567 <            for(int i = 0; i < ints.length; i++)
568 <                assertEquals(ints[i], q.take());
569 <        } catch (InterruptedException e){
570 <            fail("Unexpected exception");
571 <        }    
572 <    }
573 <    
574 <    public void testIterator(){
575 <        PriorityBlockingQueue q = populatedQueue(SIZE);
576 <        int i = 0;
577 <        Iterator it = q.iterator();
578 <        while(it.hasNext()) {
566 >        for (int i = 0; i < ints.length; i++)
567 >            assertSame(ints[i], q.take());
568 >    }
569 >
570 >    /**
571 >     * toArray(incompatible array type) throws ArrayStoreException
572 >     */
573 >    public void testToArray1_BadArg() {
574 >        PriorityBlockingQueue q = populatedQueue(SIZE);
575 >        try {
576 >            q.toArray(new String[10]);
577 >            shouldThrow();
578 >        } catch (ArrayStoreException success) {}
579 >    }
580 >
581 >    /**
582 >     * iterator iterates through all elements
583 >     */
584 >    public void testIterator() {
585 >        PriorityBlockingQueue q = populatedQueue(SIZE);
586 >        Iterator it = q.iterator();
587 >        int i;
588 >        for (i = 0; it.hasNext(); i++)
589              assertTrue(q.contains(it.next()));
574            ++i;
575        }
590          assertEquals(i, SIZE);
591 +        assertIteratorExhausted(it);
592      }
593  
594 <    public void testIteratorRemove () {
594 >    /**
595 >     * iterator of empty collection has no elements
596 >     */
597 >    public void testEmptyIterator() {
598 >        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
599 >    }
600  
601 +    /**
602 +     * iterator.remove removes current element
603 +     */
604 +    public void testIteratorRemove() {
605          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
582
606          q.add(new Integer(2));
607          q.add(new Integer(1));
608          q.add(new Integer(3));
# Line 594 | Line 617 | public class PriorityBlockingQueueTest e
617          assertFalse(it.hasNext());
618      }
619  
620 <
621 <    public void testToString(){
620 >    /**
621 >     * toString contains toStrings of elements
622 >     */
623 >    public void testToString() {
624          PriorityBlockingQueue q = populatedQueue(SIZE);
625          String s = q.toString();
626          for (int i = 0; i < SIZE; ++i) {
627 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
627 >            assertTrue(s.contains(String.valueOf(i)));
628          }
629 <    }        
629 >    }
630  
631 +    /**
632 +     * timed poll transfers elements across Executor tasks
633 +     */
634      public void testPollInExecutor() {
607
635          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
636 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
637 +        final ExecutorService executor = Executors.newFixedThreadPool(2);
638 +        try (PoolCleaner cleaner = cleaner(executor)) {
639 +            executor.execute(new CheckedRunnable() {
640 +                public void realRun() throws InterruptedException {
641 +                    assertNull(q.poll());
642 +                    threadsStarted.await();
643 +                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
644 +                    checkEmpty(q);
645 +                }});
646  
647 <        ExecutorService executor = Executors.newFixedThreadPool(2);
647 >            executor.execute(new CheckedRunnable() {
648 >                public void realRun() throws InterruptedException {
649 >                    threadsStarted.await();
650 >                    q.put(one);
651 >                }});
652 >        }
653 >    }
654  
655 <        executor.execute(new Runnable() {
656 <            public void run() {
657 <                threadAssertNull(q.poll());
658 <                try {
659 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
660 <                    threadAssertTrue(q.isEmpty());
661 <                }
662 <                catch (InterruptedException e) {
663 <                    threadFail("should not be interrupted");
664 <                }
665 <            }
666 <        });
655 >    /**
656 >     * A deserialized serialized queue has same elements
657 >     */
658 >    public void testSerialization() throws Exception {
659 >        Queue x = populatedQueue(SIZE);
660 >        Queue y = serialClone(x);
661 >
662 >        assertNotSame(x, y);
663 >        assertEquals(x.size(), y.size());
664 >        while (!x.isEmpty()) {
665 >            assertFalse(y.isEmpty());
666 >            assertEquals(x.remove(), y.remove());
667 >        }
668 >        assertTrue(y.isEmpty());
669 >    }
670  
671 <        executor.execute(new Runnable() {
672 <            public void run() {
673 <                try {
674 <                    Thread.sleep(SMALL_DELAY_MS);
675 <                    q.put(new Integer(1));
676 <                }
677 <                catch (InterruptedException e) {
678 <                    threadFail("should not be interrupted");
679 <                }
680 <            }
681 <        });
682 <        
683 <        joinPool(executor);
671 >    /**
672 >     * drainTo(c) empties queue into another collection c
673 >     */
674 >    public void testDrainTo() {
675 >        PriorityBlockingQueue q = populatedQueue(SIZE);
676 >        ArrayList l = new ArrayList();
677 >        q.drainTo(l);
678 >        assertEquals(0, q.size());
679 >        assertEquals(SIZE, l.size());
680 >        for (int i = 0; i < SIZE; ++i)
681 >            assertEquals(l.get(i), new Integer(i));
682 >        q.add(zero);
683 >        q.add(one);
684 >        assertFalse(q.isEmpty());
685 >        assertTrue(q.contains(zero));
686 >        assertTrue(q.contains(one));
687 >        l.clear();
688 >        q.drainTo(l);
689 >        assertEquals(0, q.size());
690 >        assertEquals(2, l.size());
691 >        for (int i = 0; i < 2; ++i)
692 >            assertEquals(l.get(i), new Integer(i));
693 >    }
694 >
695 >    /**
696 >     * drainTo empties queue
697 >     */
698 >    public void testDrainToWithActivePut() throws InterruptedException {
699 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
700 >        Thread t = new Thread(new CheckedRunnable() {
701 >            public void realRun() {
702 >                q.put(new Integer(SIZE + 1));
703 >            }});
704  
705 +        t.start();
706 +        ArrayList l = new ArrayList();
707 +        q.drainTo(l);
708 +        assertTrue(l.size() >= SIZE);
709 +        for (int i = 0; i < SIZE; ++i)
710 +            assertEquals(l.get(i), new Integer(i));
711 +        t.join();
712 +        assertTrue(q.size() + l.size() >= SIZE);
713      }
714  
715 <    public void testSerialization() {
716 <        PriorityBlockingQueue q = populatedQueue(SIZE);
717 <        try {
718 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
719 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
720 <            out.writeObject(q);
721 <            out.close();
722 <
723 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
724 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
725 <            PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
726 <            assertEquals(q.size(), r.size());
727 <            while (!q.isEmpty())
728 <                assertEquals(q.remove(), r.remove());
729 <        } catch(Exception e){
730 <            fail("unexpected exception");
715 >    /**
716 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
717 >     */
718 >    public void testDrainToN() {
719 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
720 >        for (int i = 0; i < SIZE + 2; ++i) {
721 >            for (int j = 0; j < SIZE; j++)
722 >                assertTrue(q.offer(new Integer(j)));
723 >            ArrayList l = new ArrayList();
724 >            q.drainTo(l, i);
725 >            int k = (i < SIZE) ? i : SIZE;
726 >            assertEquals(k, l.size());
727 >            assertEquals(SIZE - k, q.size());
728 >            for (int j = 0; j < k; ++j)
729 >                assertEquals(l.get(j), new Integer(j));
730 >            do {} while (q.poll() != null);
731 >        }
732 >    }
733 >
734 >    /**
735 >     * remove(null), contains(null) always return false
736 >     */
737 >    public void testNeverContainsNull() {
738 >        Collection<?>[] qs = {
739 >            new PriorityBlockingQueue<Object>(),
740 >            populatedQueue(2),
741 >        };
742 >
743 >        for (Collection<?> q : qs) {
744 >            assertFalse(q.contains(null));
745 >            assertFalse(q.remove(null));
746          }
747      }
748  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines