ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ArrayBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.90 by jsr166, Sun May 14 04:14:09 2017 UTC

# Line 1 | Line 1
1   /*
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/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9
10 import junit.framework.*;
11 import java.util.*;
12 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
10 >
11 > import java.util.ArrayList;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.Collections;
15 > import java.util.Iterator;
16 > import java.util.NoSuchElementException;
17 > import java.util.Queue;
18 > import java.util.concurrent.ArrayBlockingQueue;
19 > import java.util.concurrent.BlockingQueue;
20 > import java.util.concurrent.CountDownLatch;
21 > import java.util.concurrent.Executors;
22 > import java.util.concurrent.ExecutorService;
23 > import java.util.concurrent.ThreadLocalRandom;
24 >
25 > import junit.framework.Test;
26  
27   public class ArrayBlockingQueueTest extends JSR166TestCase {
28 +
29      public static void main(String[] args) {
30 <        junit.textui.TestRunner.run (suite());
30 >        main(suite(), args);
31      }
32 +
33      public static Test suite() {
34 <        return new TestSuite(ArrayBlockingQueueTest.class);
34 >        class Implementation implements CollectionImplementation {
35 >            public Class<?> klazz() { return ArrayBlockingQueue.class; }
36 >            public Collection emptyCollection() {
37 >                boolean fair = ThreadLocalRandom.current().nextBoolean();
38 >                return populatedQueue(0, SIZE, 2 * SIZE, fair);
39 >            }
40 >            public Object makeElement(int i) { return i; }
41 >            public boolean isConcurrent() { return true; }
42 >            public boolean permitsNulls() { return false; }
43 >        }
44 >
45 >        return newTestSuite(
46 >            ArrayBlockingQueueTest.class,
47 >            new Fair().testSuite(),
48 >            new NonFair().testSuite(),
49 >            CollectionTest.testSuite(new Implementation()));
50 >    }
51 >
52 >    public static class Fair extends BlockingQueueTest {
53 >        protected BlockingQueue emptyCollection() {
54 >            return populatedQueue(0, SIZE, 2 * SIZE, true);
55 >        }
56 >    }
57 >
58 >    public static class NonFair extends BlockingQueueTest {
59 >        protected BlockingQueue emptyCollection() {
60 >            return populatedQueue(0, SIZE, 2 * SIZE, false);
61 >        }
62      }
63  
64      /**
65 <     * Create a queue of given size containing consecutive
66 <     * Integers 0 ... n.
65 >     * Returns a new queue of given size containing consecutive
66 >     * Integers 0 ... n - 1.
67       */
68 <    private ArrayBlockingQueue populatedQueue(int n) {
69 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
68 >    static ArrayBlockingQueue<Integer> populatedQueue(int n) {
69 >        return populatedQueue(n, n, n, false);
70 >    }
71 >
72 >    /**
73 >     * Returns a new queue of given size containing consecutive
74 >     * Integers 0 ... n - 1, with given capacity range and fairness.
75 >     */
76 >    static ArrayBlockingQueue<Integer> populatedQueue(
77 >        int size, int minCapacity, int maxCapacity, boolean fair) {
78 >        ThreadLocalRandom rnd = ThreadLocalRandom.current();
79 >        int capacity = rnd.nextInt(minCapacity, maxCapacity + 1);
80 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
81          assertTrue(q.isEmpty());
82 <        for (int i = 0; i < n; i++)
83 <            assertTrue(q.offer(new Integer(i)));
84 <        assertFalse(q.isEmpty());
85 <        assertEquals(0, q.remainingCapacity());
86 <        assertEquals(n, q.size());
82 >        // shuffle circular array elements so they wrap
83 >        {
84 >            int n = rnd.nextInt(capacity);
85 >            for (int i = 0; i < n; i++) q.add(42);
86 >            for (int i = 0; i < n; i++) q.remove();
87 >        }
88 >        for (int i = 0; i < size; i++)
89 >            assertTrue(q.offer((Integer) i));
90 >        assertEquals(size == 0, q.isEmpty());
91 >        assertEquals(capacity - size, q.remainingCapacity());
92 >        assertEquals(size, q.size());
93 >        if (size > 0)
94 >            assertEquals((Integer) 0, q.peek());
95          return q;
96      }
97  
# Line 46 | Line 105 | public class ArrayBlockingQueueTest exte
105      /**
106       * Constructor throws IAE if capacity argument nonpositive
107       */
108 <    public void testConstructor2() {
109 <        try {
110 <            ArrayBlockingQueue q = new ArrayBlockingQueue(0);
111 <            shouldThrow();
112 <        } catch (IllegalArgumentException success) {}
108 >    public void testConstructor_nonPositiveCapacity() {
109 >        for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) {
110 >            try {
111 >                new ArrayBlockingQueue(i);
112 >                shouldThrow();
113 >            } catch (IllegalArgumentException success) {}
114 >            for (boolean fair : new boolean[] { true, false }) {
115 >                try {
116 >                    new ArrayBlockingQueue(i, fair);
117 >                    shouldThrow();
118 >                } catch (IllegalArgumentException success) {}
119 >            }
120 >        }
121      }
122  
123      /**
124       * Initializing from null Collection throws NPE
125       */
126 <    public void testConstructor3() {
126 >    public void testConstructor_nullCollection() {
127          try {
128 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
128 >            new ArrayBlockingQueue(1, true, null);
129              shouldThrow();
130          } catch (NullPointerException success) {}
131      }
# Line 67 | Line 134 | public class ArrayBlockingQueueTest exte
134       * Initializing from Collection of null elements throws NPE
135       */
136      public void testConstructor4() {
137 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
138          try {
139 <            Integer[] ints = new Integer[SIZE];
72 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
139 >            new ArrayBlockingQueue(SIZE, false, elements);
140              shouldThrow();
141          } catch (NullPointerException success) {}
142      }
# Line 78 | Line 145 | public class ArrayBlockingQueueTest exte
145       * Initializing from Collection with some null elements throws NPE
146       */
147      public void testConstructor5() {
148 +        Integer[] ints = new Integer[SIZE];
149 +        for (int i = 0; i < SIZE - 1; ++i)
150 +            ints[i] = i;
151 +        Collection<Integer> elements = Arrays.asList(ints);
152          try {
153 <            Integer[] ints = new Integer[SIZE];
83 <            for (int i = 0; i < SIZE-1; ++i)
84 <                ints[i] = new Integer(i);
85 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
153 >            new ArrayBlockingQueue(SIZE, false, elements);
154              shouldThrow();
155          } catch (NullPointerException success) {}
156      }
# Line 90 | Line 158 | public class ArrayBlockingQueueTest exte
158      /**
159       * Initializing from too large collection throws IAE
160       */
161 <    public void testConstructor6() {
161 >    public void testConstructor_collectionTooLarge() {
162 >        // just barely fits - succeeds
163 >        new ArrayBlockingQueue(SIZE, false,
164 >                               Collections.nCopies(SIZE, ""));
165          try {
166 <            Integer[] ints = new Integer[SIZE];
167 <            for (int i = 0; i < SIZE; ++i)
97 <                ints[i] = new Integer(i);
98 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
166 >            new ArrayBlockingQueue(SIZE - 1, false,
167 >                                   Collections.nCopies(SIZE, ""));
168              shouldThrow();
169          } catch (IllegalArgumentException success) {}
170      }
# Line 104 | Line 173 | public class ArrayBlockingQueueTest exte
173       * Queue contains all elements of collection used to initialize
174       */
175      public void testConstructor7() {
176 <        try {
177 <            Integer[] ints = new Integer[SIZE];
178 <            for (int i = 0; i < SIZE; ++i)
179 <                ints[i] = new Integer(i);
180 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
181 <            for (int i = 0; i < SIZE; ++i)
182 <                assertEquals(ints[i], q.poll());
114 <        }
115 <        finally {}
176 >        Integer[] ints = new Integer[SIZE];
177 >        for (int i = 0; i < SIZE; ++i)
178 >            ints[i] = i;
179 >        Collection<Integer> elements = Arrays.asList(ints);
180 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
181 >        for (int i = 0; i < SIZE; ++i)
182 >            assertEquals(ints[i], q.poll());
183      }
184  
185      /**
186       * Queue transitions from empty to full when elements added
187       */
188      public void testEmptyFull() {
189 <        ArrayBlockingQueue q = new ArrayBlockingQueue(2);
189 >        BlockingQueue q = populatedQueue(0, 2, 2, false);
190          assertTrue(q.isEmpty());
191          assertEquals(2, q.remainingCapacity());
192          q.add(one);
193          assertFalse(q.isEmpty());
194 <        q.add(two);
194 >        assertTrue(q.offer(two));
195          assertFalse(q.isEmpty());
196          assertEquals(0, q.remainingCapacity());
197          assertFalse(q.offer(three));
# Line 134 | Line 201 | public class ArrayBlockingQueueTest exte
201       * remainingCapacity decreases on add, increases on remove
202       */
203      public void testRemainingCapacity() {
204 <        ArrayBlockingQueue q = populatedQueue(SIZE);
205 <        for (int i = 0; i < SIZE; ++i) {
206 <            assertEquals(i, q.remainingCapacity());
207 <            assertEquals(SIZE-i, q.size());
208 <            q.remove();
209 <        }
210 <        for (int i = 0; i < SIZE; ++i) {
211 <            assertEquals(SIZE-i, q.remainingCapacity());
212 <            assertEquals(i, q.size());
213 <            q.add(new Integer(i));
204 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
205 >        BlockingQueue q = populatedQueue(size, size, 2 * size, false);
206 >        int spare = q.remainingCapacity();
207 >        int capacity = spare + size;
208 >        for (int i = 0; i < size; i++) {
209 >            assertEquals(spare + i, q.remainingCapacity());
210 >            assertEquals(capacity, q.size() + q.remainingCapacity());
211 >            assertEquals(i, q.remove());
212 >        }
213 >        for (int i = 0; i < size; i++) {
214 >            assertEquals(capacity - i, q.remainingCapacity());
215 >            assertEquals(capacity, q.size() + q.remainingCapacity());
216 >            assertTrue(q.add(i));
217          }
218      }
219  
220      /**
151     *  offer(null) throws NPE
152     */
153    public void testOfferNull() {
154        try {
155            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
156            q.offer(null);
157            shouldThrow();
158        } catch (NullPointerException success) {}
159    }
160
161    /**
162     *  add(null) throws NPE
163     */
164    public void testAddNull() {
165        try {
166            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
167            q.add(null);
168            shouldThrow();
169        } catch (NullPointerException success) {}
170    }
171
172    /**
221       * Offer succeeds if not full; fails if full
222       */
223      public void testOffer() {
# Line 182 | Line 230 | public class ArrayBlockingQueueTest exte
230       * add succeeds if not full; throws ISE if full
231       */
232      public void testAdd() {
233 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
234 +        for (int i = 0; i < SIZE; i++) assertTrue(q.add((Integer) i));
235 +        assertEquals(0, q.remainingCapacity());
236          try {
237 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
187 <            for (int i = 0; i < SIZE; ++i) {
188 <                assertTrue(q.add(new Integer(i)));
189 <            }
190 <            assertEquals(0, q.remainingCapacity());
191 <            q.add(new Integer(SIZE));
237 >            q.add((Integer) SIZE);
238              shouldThrow();
239          } catch (IllegalStateException success) {}
240      }
241  
242      /**
197     *  addAll(null) throws NPE
198     */
199    public void testAddAll1() {
200        try {
201            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
202            q.addAll(null);
203            shouldThrow();
204        } catch (NullPointerException success) {}
205    }
206
207    /**
243       * addAll(this) throws IAE
244       */
245      public void testAddAllSelf() {
246 +        ArrayBlockingQueue q = populatedQueue(SIZE);
247          try {
212            ArrayBlockingQueue q = populatedQueue(SIZE);
248              q.addAll(q);
249              shouldThrow();
250          } catch (IllegalArgumentException success) {}
251      }
252  
218
219    /**
220     *  addAll of a collection with null elements throws NPE
221     */
222    public void testAddAll2() {
223        try {
224            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
225            Integer[] ints = new Integer[SIZE];
226            q.addAll(Arrays.asList(ints));
227            shouldThrow();
228        } catch (NullPointerException success) {}
229    }
253      /**
254       * addAll of a collection with any null elements throws NPE after
255       * possibly adding some elements
256       */
257      public void testAddAll3() {
258 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259 +        Integer[] ints = new Integer[SIZE];
260 +        for (int i = 0; i < SIZE - 1; ++i)
261 +            ints[i] = new Integer(i);
262          try {
236            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
237            Integer[] ints = new Integer[SIZE];
238            for (int i = 0; i < SIZE-1; ++i)
239                ints[i] = new Integer(i);
263              q.addAll(Arrays.asList(ints));
264              shouldThrow();
265          } catch (NullPointerException success) {}
266      }
267 +
268      /**
269       * addAll throws ISE if not enough room
270       */
271 <    public void testAddAll4() {
271 >    public void testAddAll_insufficientSpace() {
272 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
273 >        ArrayBlockingQueue q = populatedQueue(0, size, size, false);
274 >        // Just fits:
275 >        q.addAll(populatedQueue(size, size, 2 * size, false));
276 >        assertEquals(0, q.remainingCapacity());
277 >        assertEquals(size, q.size());
278 >        assertEquals(0, q.peek());
279          try {
280 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
281 <            Integer[] ints = new Integer[SIZE];
251 <            for (int i = 0; i < SIZE; ++i)
252 <                ints[i] = new Integer(i);
253 <            q.addAll(Arrays.asList(ints));
280 >            q = populatedQueue(0, size, size, false);
281 >            q.addAll(Collections.nCopies(size + 1, 42));
282              shouldThrow();
283          } catch (IllegalStateException success) {}
284      }
285 +
286      /**
287       * Queue contains all elements, in traversal order, of successful addAll
288       */
# Line 270 | Line 299 | public class ArrayBlockingQueueTest exte
299      }
300  
301      /**
273     *  put(null) throws NPE
274     */
275    public void testPutNull() throws InterruptedException {
276        try {
277            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
278            q.put(null);
279            shouldThrow();
280        } catch (NullPointerException success) {}
281     }
282
283    /**
302       * all elements successfully put are contained
303       */
304      public void testPut() throws InterruptedException {
305          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
306          for (int i = 0; i < SIZE; ++i) {
307 <            Integer I = new Integer(i);
308 <            q.put(I);
309 <            assertTrue(q.contains(I));
307 >            Integer x = new Integer(i);
308 >            q.put(x);
309 >            assertTrue(q.contains(x));
310          }
311          assertEquals(0, q.remainingCapacity());
312      }
# Line 298 | Line 316 | public class ArrayBlockingQueueTest exte
316       */
317      public void testBlockingPut() throws InterruptedException {
318          final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
319 <        Thread t = new Thread(new CheckedRunnable() {
320 <            public void realRun() {
321 <                int added = 0;
319 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
320 >        Thread t = newStartedThread(new CheckedRunnable() {
321 >            public void realRun() throws InterruptedException {
322 >                for (int i = 0; i < SIZE; ++i)
323 >                    q.put(i);
324 >                assertEquals(SIZE, q.size());
325 >                assertEquals(0, q.remainingCapacity());
326 >
327 >                Thread.currentThread().interrupt();
328                  try {
329 <                    for (int i = 0; i < SIZE; ++i) {
330 <                        q.put(new Integer(i));
331 <                        ++added;
332 <                    }
309 <                    q.put(new Integer(SIZE));
310 <                    threadShouldThrow();
311 <                } catch (InterruptedException ie) {
312 <                    threadAssertEquals(added, SIZE);
313 <                }}});
329 >                    q.put(99);
330 >                    shouldThrow();
331 >                } catch (InterruptedException success) {}
332 >                assertFalse(Thread.interrupted());
333  
334 <        t.start();
335 <        Thread.sleep(MEDIUM_DELAY_MS);
334 >                pleaseInterrupt.countDown();
335 >                try {
336 >                    q.put(99);
337 >                    shouldThrow();
338 >                } catch (InterruptedException success) {}
339 >                assertFalse(Thread.interrupted());
340 >            }});
341 >
342 >        await(pleaseInterrupt);
343 >        assertThreadBlocks(t, Thread.State.WAITING);
344          t.interrupt();
345 <        t.join();
345 >        awaitTermination(t);
346 >        assertEquals(SIZE, q.size());
347 >        assertEquals(0, q.remainingCapacity());
348      }
349  
350      /**
351 <     * put blocks waiting for take when full
351 >     * put blocks interruptibly waiting for take when full
352       */
353      public void testPutWithTake() throws InterruptedException {
354 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
355 <        Thread t = new Thread(new CheckedRunnable() {
356 <            public void realRun() {
357 <                int added = 0;
354 >        final int capacity = 2;
355 >        final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
356 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
357 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
358 >        Thread t = newStartedThread(new CheckedRunnable() {
359 >            public void realRun() throws InterruptedException {
360 >                for (int i = 0; i < capacity; i++)
361 >                    q.put(i);
362 >                pleaseTake.countDown();
363 >                q.put(86);
364 >
365 >                Thread.currentThread().interrupt();
366 >                try {
367 >                    q.put(99);
368 >                    shouldThrow();
369 >                } catch (InterruptedException success) {}
370 >                assertFalse(Thread.interrupted());
371 >
372 >                pleaseInterrupt.countDown();
373                  try {
374 <                    q.put(new Object());
375 <                    ++added;
376 <                    q.put(new Object());
377 <                    ++added;
334 <                    q.put(new Object());
335 <                    ++added;
336 <                    q.put(new Object());
337 <                    ++added;
338 <                    threadShouldThrow();
339 <                } catch (InterruptedException e) {
340 <                    threadAssertTrue(added >= 2);
341 <                }
374 >                    q.put(99);
375 >                    shouldThrow();
376 >                } catch (InterruptedException success) {}
377 >                assertFalse(Thread.interrupted());
378              }});
379  
380 <        t.start();
381 <        Thread.sleep(SHORT_DELAY_MS);
382 <        q.take();
380 >        await(pleaseTake);
381 >        assertEquals(0, q.remainingCapacity());
382 >        assertEquals(0, q.take());
383 >
384 >        await(pleaseInterrupt);
385 >        assertThreadBlocks(t, Thread.State.WAITING);
386          t.interrupt();
387 <        t.join();
387 >        awaitTermination(t);
388 >        assertEquals(0, q.remainingCapacity());
389      }
390  
391      /**
392       * timed offer times out if full and elements not taken
393       */
394 <    public void testTimedOffer() throws InterruptedException {
394 >    public void testTimedOffer() {
395          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
396 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
396 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
397 >        Thread t = newStartedThread(new CheckedRunnable() {
398              public void realRun() throws InterruptedException {
399                  q.put(new Object());
400                  q.put(new Object());
401 <                threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
402 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
403 <            }};
401 >                long startTime = System.nanoTime();
402 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
403 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
404  
405 <        t.start();
406 <        Thread.sleep(SHORT_DELAY_MS);
405 >                Thread.currentThread().interrupt();
406 >                try {
407 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
408 >                    shouldThrow();
409 >                } catch (InterruptedException success) {}
410 >                assertFalse(Thread.interrupted());
411 >
412 >                pleaseInterrupt.countDown();
413 >                try {
414 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
415 >                    shouldThrow();
416 >                } catch (InterruptedException success) {}
417 >                assertFalse(Thread.interrupted());
418 >            }});
419 >
420 >        await(pleaseInterrupt);
421 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
422          t.interrupt();
423 <        t.join();
423 >        awaitTermination(t);
424      }
425  
426      /**
# Line 373 | Line 429 | public class ArrayBlockingQueueTest exte
429      public void testTake() throws InterruptedException {
430          ArrayBlockingQueue q = populatedQueue(SIZE);
431          for (int i = 0; i < SIZE; ++i) {
432 <            assertEquals(i, ((Integer)q.take()).intValue());
432 >            assertEquals(i, q.take());
433          }
434      }
435  
436      /**
381     * take blocks interruptibly when empty
382     */
383    public void testTakeFromEmpty() throws InterruptedException {
384        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
385        Thread t = new ThreadShouldThrow(InterruptedException.class) {
386            public void realRun() throws InterruptedException {
387                q.take();
388            }};
389
390        t.start();
391        Thread.sleep(SHORT_DELAY_MS);
392        t.interrupt();
393        t.join();
394    }
395
396    /**
437       * Take removes existing elements until empty, then blocks interruptibly
438       */
439      public void testBlockingTake() throws InterruptedException {
440 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
440 >        final ArrayBlockingQueue q = populatedQueue(SIZE);
441 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
442 >        Thread t = newStartedThread(new CheckedRunnable() {
443              public void realRun() throws InterruptedException {
444 <                ArrayBlockingQueue q = populatedQueue(SIZE);
403 <                for (int i = 0; i < SIZE; ++i) {
404 <                    threadAssertEquals(i, ((Integer)q.take()).intValue());
405 <                }
406 <                q.take();
407 <            }};
444 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
445  
446 <        t.start();
447 <            Thread.sleep(SHORT_DELAY_MS);
448 <            t.interrupt();
449 <            t.join();
450 <    }
446 >                Thread.currentThread().interrupt();
447 >                try {
448 >                    q.take();
449 >                    shouldThrow();
450 >                } catch (InterruptedException success) {}
451 >                assertFalse(Thread.interrupted());
452  
453 +                pleaseInterrupt.countDown();
454 +                try {
455 +                    q.take();
456 +                    shouldThrow();
457 +                } catch (InterruptedException success) {}
458 +                assertFalse(Thread.interrupted());
459 +            }});
460 +
461 +        await(pleaseInterrupt);
462 +        assertThreadBlocks(t, Thread.State.WAITING);
463 +        t.interrupt();
464 +        awaitTermination(t);
465 +    }
466  
467      /**
468       * poll succeeds unless empty
# Line 419 | Line 470 | public class ArrayBlockingQueueTest exte
470      public void testPoll() {
471          ArrayBlockingQueue q = populatedQueue(SIZE);
472          for (int i = 0; i < SIZE; ++i) {
473 <            assertEquals(i, ((Integer)q.poll()).intValue());
473 >            assertEquals(i, q.poll());
474          }
475          assertNull(q.poll());
476      }
477  
478      /**
479 <     * timed pool with zero timeout succeeds when non-empty, else times out
479 >     * timed poll with zero timeout succeeds when non-empty, else times out
480       */
481      public void testTimedPoll0() throws InterruptedException {
482          ArrayBlockingQueue q = populatedQueue(SIZE);
483          for (int i = 0; i < SIZE; ++i) {
484 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
484 >            assertEquals(i, q.poll(0, MILLISECONDS));
485          }
486          assertNull(q.poll(0, MILLISECONDS));
487 +        checkEmpty(q);
488      }
489  
490      /**
491 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
491 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
492       */
493      public void testTimedPoll() throws InterruptedException {
494          ArrayBlockingQueue q = populatedQueue(SIZE);
495          for (int i = 0; i < SIZE; ++i) {
496 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
497 <        }
498 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
496 >            long startTime = System.nanoTime();
497 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
498 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
499 >        }
500 >        long startTime = System.nanoTime();
501 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
502 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
503 >        checkEmpty(q);
504      }
505  
506      /**
# Line 451 | Line 508 | public class ArrayBlockingQueueTest exte
508       * returning timeout status
509       */
510      public void testInterruptedTimedPoll() throws InterruptedException {
511 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
511 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
512 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
513 >        Thread t = newStartedThread(new CheckedRunnable() {
514              public void realRun() throws InterruptedException {
515 <                ArrayBlockingQueue q = populatedQueue(SIZE);
516 <                for (int i = 0; i < SIZE; ++i) {
517 <                    threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
459 <                }
460 <                q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
461 <            }};
515 >                long startTime = System.nanoTime();
516 >                for (int i = 0; i < SIZE; i++)
517 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
518  
519 <        t.start();
520 <        Thread.sleep(SMALL_DELAY_MS);
521 <        t.interrupt();
522 <        t.join();
523 <    }
519 >                Thread.currentThread().interrupt();
520 >                try {
521 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
522 >                    shouldThrow();
523 >                } catch (InterruptedException success) {}
524 >                assertFalse(Thread.interrupted());
525  
526 <    /**
527 <     *  timed poll before a delayed offer fails; after offer succeeds;
528 <     *  on interruption throws
529 <     */
530 <    public void testTimedPollWithOffer() throws InterruptedException {
531 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
475 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
476 <            public void realRun() throws InterruptedException {
477 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
478 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
479 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
480 <            }};
526 >                pleaseInterrupt.countDown();
527 >                try {
528 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
529 >                    shouldThrow();
530 >                } catch (InterruptedException success) {}
531 >                assertFalse(Thread.interrupted());
532  
533 <        t.start();
534 <        Thread.sleep(SMALL_DELAY_MS);
535 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
533 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
534 >            }});
535 >
536 >        await(pleaseInterrupt);
537 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
538          t.interrupt();
539 <        t.join();
539 >        awaitTermination(t);
540 >        checkEmpty(q);
541      }
542  
489
543      /**
544       * peek returns next element, or null if empty
545       */
546      public void testPeek() {
547          ArrayBlockingQueue q = populatedQueue(SIZE);
548          for (int i = 0; i < SIZE; ++i) {
549 <            assertEquals(i, ((Integer)q.peek()).intValue());
550 <            q.poll();
549 >            assertEquals(i, q.peek());
550 >            assertEquals(i, q.poll());
551              assertTrue(q.peek() == null ||
552 <                       i != ((Integer)q.peek()).intValue());
552 >                       !q.peek().equals(i));
553          }
554          assertNull(q.peek());
555      }
# Line 507 | Line 560 | public class ArrayBlockingQueueTest exte
560      public void testElement() {
561          ArrayBlockingQueue q = populatedQueue(SIZE);
562          for (int i = 0; i < SIZE; ++i) {
563 <            assertEquals(i, ((Integer)q.element()).intValue());
564 <            q.poll();
563 >            assertEquals(i, q.element());
564 >            assertEquals(i, q.poll());
565          }
566          try {
567              q.element();
# Line 522 | Line 575 | public class ArrayBlockingQueueTest exte
575      public void testRemove() {
576          ArrayBlockingQueue q = populatedQueue(SIZE);
577          for (int i = 0; i < SIZE; ++i) {
578 <            assertEquals(i, ((Integer)q.remove()).intValue());
578 >            assertEquals(i, q.remove());
579          }
580          try {
581              q.remove();
# Line 531 | Line 584 | public class ArrayBlockingQueueTest exte
584      }
585  
586      /**
534     * remove(x) removes x and returns true if present
535     */
536    public void testRemoveElement() {
537        ArrayBlockingQueue q = populatedQueue(SIZE);
538        for (int i = 1; i < SIZE; i+=2) {
539            assertTrue(q.remove(new Integer(i)));
540        }
541        for (int i = 0; i < SIZE; i+=2) {
542            assertTrue(q.remove(new Integer(i)));
543            assertFalse(q.remove(new Integer(i+1)));
544        }
545        assertTrue(q.isEmpty());
546    }
547
548    /**
587       * contains(x) reports true when elements added but not yet removed
588       */
589      public void testContains() {
590 <        ArrayBlockingQueue q = populatedQueue(SIZE);
591 <        for (int i = 0; i < SIZE; ++i) {
590 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
591 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
592 >        assertFalse(q.contains(null));
593 >        for (int i = 0; i < size; ++i) {
594              assertTrue(q.contains(new Integer(i)));
595 <            q.poll();
595 >            assertEquals(i, q.poll());
596              assertFalse(q.contains(new Integer(i)));
597          }
598      }
# Line 561 | Line 601 | public class ArrayBlockingQueueTest exte
601       * clear removes all elements
602       */
603      public void testClear() {
604 <        ArrayBlockingQueue q = populatedQueue(SIZE);
604 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
605 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
606 >        int capacity = size + q.remainingCapacity();
607          q.clear();
608          assertTrue(q.isEmpty());
609          assertEquals(0, q.size());
610 <        assertEquals(SIZE, q.remainingCapacity());
610 >        assertEquals(capacity, q.remainingCapacity());
611          q.add(one);
612          assertFalse(q.isEmpty());
613          assertTrue(q.contains(one));
# Line 601 | Line 643 | public class ArrayBlockingQueueTest exte
643                  assertTrue(changed);
644  
645              assertTrue(q.containsAll(p));
646 <            assertEquals(SIZE-i, q.size());
646 >            assertEquals(SIZE - i, q.size());
647              p.remove();
648          }
649      }
# Line 614 | Line 656 | public class ArrayBlockingQueueTest exte
656              ArrayBlockingQueue q = populatedQueue(SIZE);
657              ArrayBlockingQueue p = populatedQueue(i);
658              assertTrue(q.removeAll(p));
659 <            assertEquals(SIZE-i, q.size());
659 >            assertEquals(SIZE - i, q.size());
660              for (int j = 0; j < i; ++j) {
661 <                Integer I = (Integer)(p.remove());
662 <                assertFalse(q.contains(I));
661 >                Integer x = (Integer)(p.remove());
662 >                assertFalse(q.contains(x));
663              }
664          }
665      }
666  
667 <    /**
668 <     *  toArray contains all elements
669 <     */
670 <    public void testToArray() throws InterruptedException {
671 <        ArrayBlockingQueue q = populatedQueue(SIZE);
672 <        Object[] o = q.toArray();
673 <        for (int i = 0; i < o.length; i++)
674 <            assertEquals(o[i], q.take());
667 >    void checkToArray(ArrayBlockingQueue<Integer> q) {
668 >        int size = q.size();
669 >        Object[] a1 = q.toArray();
670 >        assertEquals(size, a1.length);
671 >        Integer[] a2 = q.toArray(new Integer[0]);
672 >        assertEquals(size, a2.length);
673 >        Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
674 >        assertEquals(size, a3.length);
675 >        Integer[] a4 = new Integer[size];
676 >        assertSame(a4, q.toArray(a4));
677 >        Integer[] a5 = new Integer[size + 1];
678 >        Arrays.fill(a5, 42);
679 >        assertSame(a5, q.toArray(a5));
680 >        Integer[] a6 = new Integer[size + 2];
681 >        Arrays.fill(a6, 42);
682 >        assertSame(a6, q.toArray(a6));
683 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
684 >        for (Object[] a : as) {
685 >            if (a.length > size) assertNull(a[size]);
686 >            if (a.length > size + 1) assertEquals(42, a[size + 1]);
687 >        }
688 >        Iterator it = q.iterator();
689 >        Integer s = q.peek();
690 >        for (int i = 0; i < size; i++) {
691 >            Integer x = (Integer) it.next();
692 >            assertEquals(s + i, (int) x);
693 >            for (Object[] a : as)
694 >                assertSame(a1[i], x);
695 >        }
696      }
697  
698      /**
699 <     * toArray(a) contains all elements
699 >     * toArray() and toArray(a) contain all elements in FIFO order
700       */
701 <    public void testToArray2() throws InterruptedException {
702 <        ArrayBlockingQueue q = populatedQueue(SIZE);
703 <        Integer[] ints = new Integer[SIZE];
704 <        ints = (Integer[])q.toArray(ints);
705 <        for (int i = 0; i < ints.length; i++)
706 <            assertEquals(ints[i], q.take());
701 >    public void testToArray() {
702 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
703 >        final int size = rnd.nextInt(6);
704 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
705 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
706 >        for (int i = 0; i < size; i++) {
707 >            checkToArray(q);
708 >            q.add(i);
709 >        }
710 >        // Provoke wraparound
711 >        int added = size * 2;
712 >        for (int i = 0; i < added; i++) {
713 >            checkToArray(q);
714 >            assertEquals((Integer) i, q.poll());
715 >            q.add(size + i);
716 >        }
717 >        for (int i = 0; i < size; i++) {
718 >            checkToArray(q);
719 >            assertEquals((Integer) (added + i), q.poll());
720 >        }
721      }
722  
723      /**
724 <     * toArray(null) throws NPE
724 >     * toArray(incompatible array type) throws ArrayStoreException
725       */
726 <    public void testToArray_BadArg() {
726 >    public void testToArray_incompatibleArrayType() {
727 >        ArrayBlockingQueue q = populatedQueue(SIZE);
728          try {
729 <            ArrayBlockingQueue q = populatedQueue(SIZE);
652 <            Object o[] = q.toArray(null);
729 >            q.toArray(new String[10]);
730              shouldThrow();
731 <        } catch (NullPointerException success) {}
655 <    }
656 <
657 <    /**
658 <     * toArray with incompatible array type throws CCE
659 <     */
660 <    public void testToArray1_BadArg() {
731 >        } catch (ArrayStoreException success) {}
732          try {
733 <            ArrayBlockingQueue q = populatedQueue(SIZE);
663 <            Object o[] = q.toArray(new String[10] );
733 >            q.toArray(new String[0]);
734              shouldThrow();
735          } catch (ArrayStoreException success) {}
736      }
737  
668
738      /**
739       * iterator iterates through all elements
740       */
741      public void testIterator() throws InterruptedException {
742          ArrayBlockingQueue q = populatedQueue(SIZE);
743          Iterator it = q.iterator();
744 <        while (it.hasNext()) {
744 >        int i;
745 >        for (i = 0; it.hasNext(); i++)
746 >            assertTrue(q.contains(it.next()));
747 >        assertEquals(i, SIZE);
748 >        assertIteratorExhausted(it);
749 >
750 >        it = q.iterator();
751 >        for (i = 0; it.hasNext(); i++)
752              assertEquals(it.next(), q.take());
753 <        }
753 >        assertEquals(i, SIZE);
754 >        assertIteratorExhausted(it);
755 >    }
756 >
757 >    /**
758 >     * iterator of empty collection has no elements
759 >     */
760 >    public void testEmptyIterator() {
761 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
762      }
763  
764      /**
765       * iterator.remove removes current element
766       */
767 <    public void testIteratorRemove () {
767 >    public void testIteratorRemove() {
768          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
769          q.add(two);
770          q.add(one);
# Line 691 | Line 775 | public class ArrayBlockingQueueTest exte
775          it.remove();
776  
777          it = q.iterator();
778 <        assertEquals(it.next(), one);
779 <        assertEquals(it.next(), three);
778 >        assertSame(it.next(), one);
779 >        assertSame(it.next(), three);
780          assertFalse(it.hasNext());
781      }
782  
# Line 709 | Line 793 | public class ArrayBlockingQueueTest exte
793  
794          int k = 0;
795          for (Iterator it = q.iterator(); it.hasNext();) {
796 <            int i = ((Integer)(it.next())).intValue();
713 <            assertEquals(++k, i);
796 >            assertEquals(++k, it.next());
797          }
798          assertEquals(3, k);
799      }
# Line 718 | Line 801 | public class ArrayBlockingQueueTest exte
801      /**
802       * Modifications do not cause iterators to fail
803       */
804 <    public void testWeaklyConsistentIteration () {
804 >    public void testWeaklyConsistentIteration() {
805          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
806          q.add(one);
807          q.add(two);
# Line 730 | Line 813 | public class ArrayBlockingQueueTest exte
813          assertEquals(0, q.size());
814      }
815  
733
816      /**
817       * toString contains toStrings of elements
818       */
# Line 738 | Line 820 | public class ArrayBlockingQueueTest exte
820          ArrayBlockingQueue q = populatedQueue(SIZE);
821          String s = q.toString();
822          for (int i = 0; i < SIZE; ++i) {
823 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
823 >            assertTrue(s.contains(String.valueOf(i)));
824          }
825      }
826  
745
827      /**
828       * offer transfers elements across Executor tasks
829       */
# Line 750 | Line 831 | public class ArrayBlockingQueueTest exte
831          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
832          q.add(one);
833          q.add(two);
834 <        ExecutorService executor = Executors.newFixedThreadPool(2);
835 <        executor.execute(new CheckedRunnable() {
836 <            public void realRun() throws InterruptedException {
837 <                threadAssertFalse(q.offer(three));
838 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
839 <                threadAssertEquals(0, q.remainingCapacity());
840 <            }});
841 <
842 <        executor.execute(new CheckedRunnable() {
843 <            public void realRun() throws InterruptedException {
844 <                Thread.sleep(SMALL_DELAY_MS);
845 <                threadAssertEquals(one, q.take());
846 <            }});
847 <
848 <        joinPool(executor);
849 <
834 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
835 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
836 >        try (PoolCleaner cleaner = cleaner(executor)) {
837 >            executor.execute(new CheckedRunnable() {
838 >                public void realRun() throws InterruptedException {
839 >                    assertFalse(q.offer(three));
840 >                    threadsStarted.await();
841 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
842 >                    assertEquals(0, q.remainingCapacity());
843 >                }});
844 >
845 >            executor.execute(new CheckedRunnable() {
846 >                public void realRun() throws InterruptedException {
847 >                    threadsStarted.await();
848 >                    assertEquals(0, q.remainingCapacity());
849 >                    assertSame(one, q.take());
850 >                }});
851 >        }
852      }
853  
854      /**
855 <     * poll retrieves elements across Executor threads
855 >     * timed poll retrieves elements across Executor threads
856       */
857      public void testPollInExecutor() {
858          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
859 <        ExecutorService executor = Executors.newFixedThreadPool(2);
860 <        executor.execute(new CheckedRunnable() {
861 <            public void realRun() throws InterruptedException {
862 <                threadAssertNull(q.poll());
863 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
864 <                threadAssertTrue(q.isEmpty());
865 <            }});
866 <
867 <        executor.execute(new CheckedRunnable() {
868 <            public void realRun() throws InterruptedException {
869 <                Thread.sleep(SMALL_DELAY_MS);
870 <                q.put(one);
871 <            }});
872 <
873 <        joinPool(executor);
859 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
860 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
861 >        try (PoolCleaner cleaner = cleaner(executor)) {
862 >            executor.execute(new CheckedRunnable() {
863 >                public void realRun() throws InterruptedException {
864 >                    assertNull(q.poll());
865 >                    threadsStarted.await();
866 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
867 >                    checkEmpty(q);
868 >                }});
869 >
870 >            executor.execute(new CheckedRunnable() {
871 >                public void realRun() throws InterruptedException {
872 >                    threadsStarted.await();
873 >                    q.put(one);
874 >                }});
875 >        }
876      }
877  
878      /**
879       * A deserialized serialized queue has same elements in same order
880       */
881      public void testSerialization() throws Exception {
882 <        ArrayBlockingQueue q = populatedQueue(SIZE);
883 <
799 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
800 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
801 <        out.writeObject(q);
802 <        out.close();
803 <
804 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
805 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
806 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
807 <        assertEquals(q.size(), r.size());
808 <        while (!q.isEmpty())
809 <            assertEquals(q.remove(), r.remove());
810 <    }
811 <
812 <    /**
813 <     * drainTo(null) throws NPE
814 <     */
815 <    public void testDrainToNull() {
816 <        ArrayBlockingQueue q = populatedQueue(SIZE);
817 <        try {
818 <            q.drainTo(null);
819 <            shouldThrow();
820 <        } catch (NullPointerException success) {}
821 <    }
882 >        Queue x = populatedQueue(SIZE);
883 >        Queue y = serialClone(x);
884  
885 <    /**
886 <     * drainTo(this) throws IAE
887 <     */
888 <    public void testDrainToSelf() {
889 <        ArrayBlockingQueue q = populatedQueue(SIZE);
890 <        try {
891 <            q.drainTo(q);
892 <            shouldThrow();
893 <        } catch (IllegalArgumentException success) {}
885 >        assertNotSame(x, y);
886 >        assertEquals(x.size(), y.size());
887 >        assertEquals(x.toString(), y.toString());
888 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
889 >        while (!x.isEmpty()) {
890 >            assertFalse(y.isEmpty());
891 >            assertEquals(x.remove(), y.remove());
892 >        }
893 >        assertTrue(y.isEmpty());
894      }
895  
896      /**
# Line 838 | Line 900 | public class ArrayBlockingQueueTest exte
900          ArrayBlockingQueue q = populatedQueue(SIZE);
901          ArrayList l = new ArrayList();
902          q.drainTo(l);
903 <        assertEquals(q.size(), 0);
904 <        assertEquals(l.size(), SIZE);
903 >        assertEquals(0, q.size());
904 >        assertEquals(SIZE, l.size());
905          for (int i = 0; i < SIZE; ++i)
906              assertEquals(l.get(i), new Integer(i));
907          q.add(zero);
# Line 849 | Line 911 | public class ArrayBlockingQueueTest exte
911          assertTrue(q.contains(one));
912          l.clear();
913          q.drainTo(l);
914 <        assertEquals(q.size(), 0);
915 <        assertEquals(l.size(), 2);
914 >        assertEquals(0, q.size());
915 >        assertEquals(2, l.size());
916          for (int i = 0; i < 2; ++i)
917              assertEquals(l.get(i), new Integer(i));
918      }
# Line 862 | Line 924 | public class ArrayBlockingQueueTest exte
924          final ArrayBlockingQueue q = populatedQueue(SIZE);
925          Thread t = new Thread(new CheckedRunnable() {
926              public void realRun() throws InterruptedException {
927 <                q.put(new Integer(SIZE+1));
927 >                q.put(new Integer(SIZE + 1));
928              }});
929  
930          t.start();
# Line 876 | Line 938 | public class ArrayBlockingQueueTest exte
938      }
939  
940      /**
941 <     * drainTo(null, n) throws NPE
880 <     */
881 <    public void testDrainToNullN() {
882 <        ArrayBlockingQueue q = populatedQueue(SIZE);
883 <        try {
884 <            q.drainTo(null, 0);
885 <            shouldThrow();
886 <        } catch (NullPointerException success) {}
887 <    }
888 <
889 <    /**
890 <     * drainTo(this, n) throws IAE
891 <     */
892 <    public void testDrainToSelfN() {
893 <        ArrayBlockingQueue q = populatedQueue(SIZE);
894 <        try {
895 <            q.drainTo(q, 0);
896 <            shouldThrow();
897 <        } catch (IllegalArgumentException success) {}
898 <    }
899 <
900 <    /**
901 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
941 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
942       */
943      public void testDrainToN() {
944 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
944 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
945          for (int i = 0; i < SIZE + 2; ++i) {
946              for (int j = 0; j < SIZE; j++)
947                  assertTrue(q.offer(new Integer(j)));
948              ArrayList l = new ArrayList();
949              q.drainTo(l, i);
950 <            int k = (i < SIZE)? i : SIZE;
951 <            assertEquals(l.size(), k);
952 <            assertEquals(q.size(), SIZE-k);
950 >            int k = (i < SIZE) ? i : SIZE;
951 >            assertEquals(k, l.size());
952 >            assertEquals(SIZE - k, q.size());
953              for (int j = 0; j < k; ++j)
954                  assertEquals(l.get(j), new Integer(j));
955 <            while (q.poll() != null) ;
955 >            do {} while (q.poll() != null);
956          }
957      }
958  
959 +    /**
960 +     * remove(null), contains(null) always return false
961 +     */
962 +    public void testNeverContainsNull() {
963 +        Collection<?>[] qs = {
964 +            populatedQueue(0, 1, 10, false),
965 +            populatedQueue(2, 2, 10, true),
966 +        };
967 +
968 +        for (Collection<?> q : qs) {
969 +            assertFalse(q.contains(null));
970 +            assertFalse(q.remove(null));
971 +        }
972 +    }
973   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines