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.19 by jsr166, Sat Nov 21 10:29:49 2009 UTC vs.
Revision 1.87 by jsr166, Sun May 14 00:56:43 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 >     * Returns a new queue of given size containing consecutive
66 >     * Integers 0 ... n - 1.
67 >     */
68 >    static ArrayBlockingQueue<Integer> populatedQueue(int n) {
69 >        return populatedQueue(n, n, n, false);
70      }
71  
72      /**
73 <     * Create a queue of given size containing consecutive
74 <     * Integers 0 ... n.
73 >     * Returns a new queue of given size containing consecutive
74 >     * Integers 0 ... n - 1, with given capacity range and fairness.
75       */
76 <    private ArrayBlockingQueue populatedQueue(int n) {
77 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
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 106 | Line 175 | public class ArrayBlockingQueueTest exte
175      public void testConstructor7() {
176          Integer[] ints = new Integer[SIZE];
177          for (int i = 0; i < SIZE; ++i)
178 <            ints[i] = new Integer(i);
179 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
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      }
# Line 116 | Line 186 | public class ArrayBlockingQueueTest exte
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 131 | 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      /**
148     *  offer(null) throws NPE
149     */
150    public void testOfferNull() {
151        try {
152            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
153            q.offer(null);
154            shouldThrow();
155        } catch (NullPointerException success) {}
156    }
157
158    /**
159     *  add(null) throws NPE
160     */
161    public void testAddNull() {
162        try {
163            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
164            q.add(null);
165            shouldThrow();
166        } catch (NullPointerException success) {}
167    }
168
169    /**
221       * Offer succeeds if not full; fails if full
222       */
223      public void testOffer() {
# Line 179 | 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);
184 <            for (int i = 0; i < SIZE; ++i) {
185 <                assertTrue(q.add(new Integer(i)));
186 <            }
187 <            assertEquals(0, q.remainingCapacity());
188 <            q.add(new Integer(SIZE));
237 >            q.add((Integer) SIZE);
238              shouldThrow();
239          } catch (IllegalStateException success) {}
240      }
241  
242      /**
194     *  addAll(null) throws NPE
195     */
196    public void testAddAll1() {
197        try {
198            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
199            q.addAll(null);
200            shouldThrow();
201        } catch (NullPointerException success) {}
202    }
203
204    /**
243       * addAll(this) throws IAE
244       */
245      public void testAddAllSelf() {
246 +        ArrayBlockingQueue q = populatedQueue(SIZE);
247          try {
209            ArrayBlockingQueue q = populatedQueue(SIZE);
248              q.addAll(q);
249              shouldThrow();
250          } catch (IllegalArgumentException success) {}
251      }
252  
215
216    /**
217     *  addAll of a collection with null elements throws NPE
218     */
219    public void testAddAll2() {
220        try {
221            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
222            Integer[] ints = new Integer[SIZE];
223            q.addAll(Arrays.asList(ints));
224            shouldThrow();
225        } catch (NullPointerException success) {}
226    }
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 {
233            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
234            Integer[] ints = new Integer[SIZE];
235            for (int i = 0; i < SIZE-1; ++i)
236                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];
248 <            for (int i = 0; i < SIZE; ++i)
249 <                ints[i] = new Integer(i);
250 <            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 267 | Line 299 | public class ArrayBlockingQueueTest exte
299      }
300  
301      /**
270     *  put(null) throws NPE
271     */
272    public void testPutNull() throws InterruptedException {
273        try {
274            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
275            q.put(null);
276            shouldThrow();
277        } catch (NullPointerException success) {}
278     }
279
280    /**
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 295 | 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 <                    }
306 <                    q.put(new Integer(SIZE));
307 <                    threadShouldThrow();
308 <                } catch (InterruptedException ie) {
309 <                    threadAssertEquals(added, SIZE);
310 <                }}});
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 >                pleaseInterrupt.countDown();
366                  try {
367 <                    q.put(new Object());
368 <                    ++added;
369 <                    q.put(new Object());
370 <                    ++added;
331 <                    q.put(new Object());
332 <                    ++added;
333 <                    q.put(new Object());
334 <                    ++added;
335 <                    threadShouldThrow();
336 <                } catch (InterruptedException e) {
337 <                    threadAssertTrue(added >= 2);
338 <                }
367 >                    q.put(99);
368 >                    shouldThrow();
369 >                } catch (InterruptedException success) {}
370 >                assertFalse(Thread.interrupted());
371              }});
372  
373 <        t.start();
374 <        Thread.sleep(SHORT_DELAY_MS);
375 <        q.take();
373 >        await(pleaseTake);
374 >        assertEquals(0, q.remainingCapacity());
375 >        assertEquals(0, q.take());
376 >
377 >        await(pleaseInterrupt);
378 >        assertThreadBlocks(t, Thread.State.WAITING);
379          t.interrupt();
380 <        t.join();
380 >        awaitTermination(t);
381 >        assertEquals(0, q.remainingCapacity());
382      }
383  
384      /**
# Line 350 | Line 386 | public class ArrayBlockingQueueTest exte
386       */
387      public void testTimedOffer() throws InterruptedException {
388          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
389 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
389 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
390 >        Thread t = newStartedThread(new CheckedRunnable() {
391              public void realRun() throws InterruptedException {
392                  q.put(new Object());
393                  q.put(new Object());
394 <                threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
395 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
396 <            }};
394 >                long startTime = System.nanoTime();
395 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
396 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
397 >                pleaseInterrupt.countDown();
398 >                try {
399 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
400 >                    shouldThrow();
401 >                } catch (InterruptedException success) {}
402 >                assertFalse(Thread.interrupted());
403 >            }});
404  
405 <        t.start();
406 <        Thread.sleep(SHORT_DELAY_MS);
405 >        await(pleaseInterrupt);
406 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
407          t.interrupt();
408 <        t.join();
408 >        awaitTermination(t);
409      }
410  
411      /**
# Line 370 | Line 414 | public class ArrayBlockingQueueTest exte
414      public void testTake() throws InterruptedException {
415          ArrayBlockingQueue q = populatedQueue(SIZE);
416          for (int i = 0; i < SIZE; ++i) {
417 <            assertEquals(i, ((Integer)q.take()).intValue());
417 >            assertEquals(i, q.take());
418          }
419      }
420  
421      /**
378     * take blocks interruptibly when empty
379     */
380    public void testTakeFromEmpty() throws InterruptedException {
381        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
382        Thread t = new ThreadShouldThrow(InterruptedException.class) {
383            public void realRun() throws InterruptedException {
384                q.take();
385            }};
386
387        t.start();
388        Thread.sleep(SHORT_DELAY_MS);
389        t.interrupt();
390        t.join();
391    }
392
393    /**
422       * Take removes existing elements until empty, then blocks interruptibly
423       */
424      public void testBlockingTake() throws InterruptedException {
425 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
425 >        final ArrayBlockingQueue q = populatedQueue(SIZE);
426 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
427 >        Thread t = newStartedThread(new CheckedRunnable() {
428              public void realRun() throws InterruptedException {
429 <                ArrayBlockingQueue q = populatedQueue(SIZE);
400 <                for (int i = 0; i < SIZE; ++i) {
401 <                    threadAssertEquals(i, ((Integer)q.take()).intValue());
402 <                }
403 <                q.take();
404 <            }};
429 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
430  
431 <        t.start();
432 <            Thread.sleep(SHORT_DELAY_MS);
433 <            t.interrupt();
434 <            t.join();
435 <    }
431 >                Thread.currentThread().interrupt();
432 >                try {
433 >                    q.take();
434 >                    shouldThrow();
435 >                } catch (InterruptedException success) {}
436 >                assertFalse(Thread.interrupted());
437 >
438 >                pleaseInterrupt.countDown();
439 >                try {
440 >                    q.take();
441 >                    shouldThrow();
442 >                } catch (InterruptedException success) {}
443 >                assertFalse(Thread.interrupted());
444 >            }});
445  
446 +        await(pleaseInterrupt);
447 +        assertThreadBlocks(t, Thread.State.WAITING);
448 +        t.interrupt();
449 +        awaitTermination(t);
450 +    }
451  
452      /**
453       * poll succeeds unless empty
# Line 416 | Line 455 | public class ArrayBlockingQueueTest exte
455      public void testPoll() {
456          ArrayBlockingQueue q = populatedQueue(SIZE);
457          for (int i = 0; i < SIZE; ++i) {
458 <            assertEquals(i, ((Integer)q.poll()).intValue());
458 >            assertEquals(i, q.poll());
459          }
460          assertNull(q.poll());
461      }
462  
463      /**
464 <     * timed pool with zero timeout succeeds when non-empty, else times out
464 >     * timed poll with zero timeout succeeds when non-empty, else times out
465       */
466      public void testTimedPoll0() throws InterruptedException {
467          ArrayBlockingQueue q = populatedQueue(SIZE);
468          for (int i = 0; i < SIZE; ++i) {
469 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
469 >            assertEquals(i, q.poll(0, MILLISECONDS));
470          }
471          assertNull(q.poll(0, MILLISECONDS));
472 +        checkEmpty(q);
473      }
474  
475      /**
476 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
476 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
477       */
478      public void testTimedPoll() throws InterruptedException {
479          ArrayBlockingQueue q = populatedQueue(SIZE);
480          for (int i = 0; i < SIZE; ++i) {
481 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
482 <        }
483 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
481 >            long startTime = System.nanoTime();
482 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
483 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
484 >        }
485 >        long startTime = System.nanoTime();
486 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
487 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
488 >        checkEmpty(q);
489      }
490  
491      /**
# Line 448 | Line 493 | public class ArrayBlockingQueueTest exte
493       * returning timeout status
494       */
495      public void testInterruptedTimedPoll() throws InterruptedException {
496 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
496 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
497 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
498 >        Thread t = newStartedThread(new CheckedRunnable() {
499              public void realRun() throws InterruptedException {
500 <                ArrayBlockingQueue q = populatedQueue(SIZE);
500 >                long startTime = System.nanoTime();
501                  for (int i = 0; i < SIZE; ++i) {
502 <                    threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
502 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
503                  }
457                q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
458            }};
504  
505 <        t.start();
506 <        Thread.sleep(SMALL_DELAY_MS);
507 <        t.interrupt();
508 <        t.join();
509 <    }
505 >                pleaseInterrupt.countDown();
506 >                try {
507 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
508 >                    shouldThrow();
509 >                } catch (InterruptedException success) {}
510 >                assertFalse(Thread.interrupted());
511  
512 <    /**
513 <     *  timed poll before a delayed offer fails; after offer succeeds;
468 <     *  on interruption throws
469 <     */
470 <    public void testTimedPollWithOffer() throws InterruptedException {
471 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
472 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
473 <            public void realRun() throws InterruptedException {
474 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
475 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
476 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
477 <            }};
512 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
513 >            }});
514  
515 <        t.start();
516 <        Thread.sleep(SMALL_DELAY_MS);
481 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
515 >        await(pleaseInterrupt);
516 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
517          t.interrupt();
518 <        t.join();
518 >        awaitTermination(t);
519 >        checkEmpty(q);
520      }
521  
486
522      /**
523       * peek returns next element, or null if empty
524       */
525      public void testPeek() {
526          ArrayBlockingQueue q = populatedQueue(SIZE);
527          for (int i = 0; i < SIZE; ++i) {
528 <            assertEquals(i, ((Integer)q.peek()).intValue());
529 <            q.poll();
528 >            assertEquals(i, q.peek());
529 >            assertEquals(i, q.poll());
530              assertTrue(q.peek() == null ||
531 <                       i != ((Integer)q.peek()).intValue());
531 >                       !q.peek().equals(i));
532          }
533          assertNull(q.peek());
534      }
# Line 504 | Line 539 | public class ArrayBlockingQueueTest exte
539      public void testElement() {
540          ArrayBlockingQueue q = populatedQueue(SIZE);
541          for (int i = 0; i < SIZE; ++i) {
542 <            assertEquals(i, ((Integer)q.element()).intValue());
543 <            q.poll();
542 >            assertEquals(i, q.element());
543 >            assertEquals(i, q.poll());
544          }
545          try {
546              q.element();
# Line 519 | Line 554 | public class ArrayBlockingQueueTest exte
554      public void testRemove() {
555          ArrayBlockingQueue q = populatedQueue(SIZE);
556          for (int i = 0; i < SIZE; ++i) {
557 <            assertEquals(i, ((Integer)q.remove()).intValue());
557 >            assertEquals(i, q.remove());
558          }
559          try {
560              q.remove();
# Line 528 | Line 563 | public class ArrayBlockingQueueTest exte
563      }
564  
565      /**
531     * remove(x) removes x and returns true if present
532     */
533    public void testRemoveElement() {
534        ArrayBlockingQueue q = populatedQueue(SIZE);
535        for (int i = 1; i < SIZE; i+=2) {
536            assertTrue(q.remove(new Integer(i)));
537        }
538        for (int i = 0; i < SIZE; i+=2) {
539            assertTrue(q.remove(new Integer(i)));
540            assertFalse(q.remove(new Integer(i+1)));
541        }
542        assertTrue(q.isEmpty());
543    }
544
545    /**
566       * contains(x) reports true when elements added but not yet removed
567       */
568      public void testContains() {
569 <        ArrayBlockingQueue q = populatedQueue(SIZE);
570 <        for (int i = 0; i < SIZE; ++i) {
569 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
570 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
571 >        assertFalse(q.contains(null));
572 >        for (int i = 0; i < size; ++i) {
573              assertTrue(q.contains(new Integer(i)));
574 <            q.poll();
574 >            assertEquals(i, q.poll());
575              assertFalse(q.contains(new Integer(i)));
576          }
577      }
# Line 558 | Line 580 | public class ArrayBlockingQueueTest exte
580       * clear removes all elements
581       */
582      public void testClear() {
583 <        ArrayBlockingQueue q = populatedQueue(SIZE);
583 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
584 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
585 >        int capacity = size + q.remainingCapacity();
586          q.clear();
587          assertTrue(q.isEmpty());
588          assertEquals(0, q.size());
589 <        assertEquals(SIZE, q.remainingCapacity());
589 >        assertEquals(capacity, q.remainingCapacity());
590          q.add(one);
591          assertFalse(q.isEmpty());
592          assertTrue(q.contains(one));
# Line 598 | Line 622 | public class ArrayBlockingQueueTest exte
622                  assertTrue(changed);
623  
624              assertTrue(q.containsAll(p));
625 <            assertEquals(SIZE-i, q.size());
625 >            assertEquals(SIZE - i, q.size());
626              p.remove();
627          }
628      }
# Line 611 | Line 635 | public class ArrayBlockingQueueTest exte
635              ArrayBlockingQueue q = populatedQueue(SIZE);
636              ArrayBlockingQueue p = populatedQueue(i);
637              assertTrue(q.removeAll(p));
638 <            assertEquals(SIZE-i, q.size());
638 >            assertEquals(SIZE - i, q.size());
639              for (int j = 0; j < i; ++j) {
640 <                Integer I = (Integer)(p.remove());
641 <                assertFalse(q.contains(I));
640 >                Integer x = (Integer)(p.remove());
641 >                assertFalse(q.contains(x));
642              }
643          }
644      }
645  
646 <    /**
647 <     *  toArray contains all elements
648 <     */
649 <    public void testToArray() throws InterruptedException {
650 <        ArrayBlockingQueue q = populatedQueue(SIZE);
651 <        Object[] o = q.toArray();
652 <        for (int i = 0; i < o.length; i++)
653 <            assertEquals(o[i], q.take());
646 >    void checkToArray(ArrayBlockingQueue<Integer> q) {
647 >        int size = q.size();
648 >        Object[] a1 = q.toArray();
649 >        assertEquals(size, a1.length);
650 >        Integer[] a2 = q.toArray(new Integer[0]);
651 >        assertEquals(size, a2.length);
652 >        Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
653 >        assertEquals(size, a3.length);
654 >        Integer[] a4 = new Integer[size];
655 >        assertSame(a4, q.toArray(a4));
656 >        Integer[] a5 = new Integer[size + 1];
657 >        Arrays.fill(a5, 42);
658 >        assertSame(a5, q.toArray(a5));
659 >        Integer[] a6 = new Integer[size + 2];
660 >        Arrays.fill(a6, 42);
661 >        assertSame(a6, q.toArray(a6));
662 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
663 >        for (Object[] a : as) {
664 >            if (a.length > size) assertNull(a[size]);
665 >            if (a.length > size + 1) assertEquals(42, a[size + 1]);
666 >        }
667 >        Iterator it = q.iterator();
668 >        Integer s = q.peek();
669 >        for (int i = 0; i < size; i++) {
670 >            Integer x = (Integer) it.next();
671 >            assertEquals(s + i, (int) x);
672 >            for (Object[] a : as)
673 >                assertSame(a1[i], x);
674 >        }
675      }
676  
677      /**
678 <     * toArray(a) contains all elements
678 >     * toArray() and toArray(a) contain all elements in FIFO order
679       */
680 <    public void testToArray2() throws InterruptedException {
681 <        ArrayBlockingQueue q = populatedQueue(SIZE);
682 <        Integer[] ints = new Integer[SIZE];
683 <        ints = (Integer[])q.toArray(ints);
684 <        for (int i = 0; i < ints.length; i++)
685 <            assertEquals(ints[i], q.take());
680 >    public void testToArray() {
681 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
682 >        final int size = rnd.nextInt(6);
683 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
684 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
685 >        for (int i = 0; i < size; i++) {
686 >            checkToArray(q);
687 >            q.add(i);
688 >        }
689 >        // Provoke wraparound
690 >        int added = size * 2;
691 >        for (int i = 0; i < added; i++) {
692 >            checkToArray(q);
693 >            assertEquals((Integer) i, q.poll());
694 >            q.add(size + i);
695 >        }
696 >        for (int i = 0; i < size; i++) {
697 >            checkToArray(q);
698 >            assertEquals((Integer) (added + i), q.poll());
699 >        }
700      }
701  
702      /**
703 <     * toArray(null) throws NPE
703 >     * toArray(incompatible array type) throws ArrayStoreException
704       */
705 <    public void testToArray_BadArg() {
705 >    public void testToArray_incompatibleArrayType() {
706 >        ArrayBlockingQueue q = populatedQueue(SIZE);
707          try {
708 <            ArrayBlockingQueue q = populatedQueue(SIZE);
649 <            Object o[] = q.toArray(null);
708 >            q.toArray(new String[10]);
709              shouldThrow();
710 <        } catch (NullPointerException success) {}
652 <    }
653 <
654 <    /**
655 <     * toArray with incompatible array type throws CCE
656 <     */
657 <    public void testToArray1_BadArg() {
710 >        } catch (ArrayStoreException success) {}
711          try {
712 <            ArrayBlockingQueue q = populatedQueue(SIZE);
660 <            Object o[] = q.toArray(new String[10] );
712 >            q.toArray(new String[0]);
713              shouldThrow();
714          } catch (ArrayStoreException success) {}
715      }
716  
665
717      /**
718       * iterator iterates through all elements
719       */
720      public void testIterator() throws InterruptedException {
721          ArrayBlockingQueue q = populatedQueue(SIZE);
722          Iterator it = q.iterator();
723 <        while (it.hasNext()) {
723 >        int i;
724 >        for (i = 0; it.hasNext(); i++)
725 >            assertTrue(q.contains(it.next()));
726 >        assertEquals(i, SIZE);
727 >        assertIteratorExhausted(it);
728 >
729 >        it = q.iterator();
730 >        for (i = 0; it.hasNext(); i++)
731              assertEquals(it.next(), q.take());
732 <        }
732 >        assertEquals(i, SIZE);
733 >        assertIteratorExhausted(it);
734 >    }
735 >
736 >    /**
737 >     * iterator of empty collection has no elements
738 >     */
739 >    public void testEmptyIterator() {
740 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
741      }
742  
743      /**
744       * iterator.remove removes current element
745       */
746 <    public void testIteratorRemove () {
746 >    public void testIteratorRemove() {
747          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
748          q.add(two);
749          q.add(one);
# Line 688 | Line 754 | public class ArrayBlockingQueueTest exte
754          it.remove();
755  
756          it = q.iterator();
757 <        assertEquals(it.next(), one);
758 <        assertEquals(it.next(), three);
757 >        assertSame(it.next(), one);
758 >        assertSame(it.next(), three);
759          assertFalse(it.hasNext());
760      }
761  
# Line 706 | Line 772 | public class ArrayBlockingQueueTest exte
772  
773          int k = 0;
774          for (Iterator it = q.iterator(); it.hasNext();) {
775 <            int i = ((Integer)(it.next())).intValue();
710 <            assertEquals(++k, i);
775 >            assertEquals(++k, it.next());
776          }
777          assertEquals(3, k);
778      }
# Line 715 | Line 780 | public class ArrayBlockingQueueTest exte
780      /**
781       * Modifications do not cause iterators to fail
782       */
783 <    public void testWeaklyConsistentIteration () {
783 >    public void testWeaklyConsistentIteration() {
784          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
785          q.add(one);
786          q.add(two);
# Line 727 | Line 792 | public class ArrayBlockingQueueTest exte
792          assertEquals(0, q.size());
793      }
794  
730
795      /**
796       * toString contains toStrings of elements
797       */
# Line 735 | Line 799 | public class ArrayBlockingQueueTest exte
799          ArrayBlockingQueue q = populatedQueue(SIZE);
800          String s = q.toString();
801          for (int i = 0; i < SIZE; ++i) {
802 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
802 >            assertTrue(s.contains(String.valueOf(i)));
803          }
804      }
805  
742
806      /**
807       * offer transfers elements across Executor tasks
808       */
# Line 747 | Line 810 | public class ArrayBlockingQueueTest exte
810          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
811          q.add(one);
812          q.add(two);
813 <        ExecutorService executor = Executors.newFixedThreadPool(2);
814 <        executor.execute(new CheckedRunnable() {
815 <            public void realRun() throws InterruptedException {
816 <                threadAssertFalse(q.offer(three));
817 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
818 <                threadAssertEquals(0, q.remainingCapacity());
819 <            }});
820 <
821 <        executor.execute(new CheckedRunnable() {
822 <            public void realRun() throws InterruptedException {
823 <                Thread.sleep(SMALL_DELAY_MS);
824 <                threadAssertEquals(one, q.take());
825 <            }});
826 <
827 <        joinPool(executor);
828 <
813 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
814 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
815 >        try (PoolCleaner cleaner = cleaner(executor)) {
816 >            executor.execute(new CheckedRunnable() {
817 >                public void realRun() throws InterruptedException {
818 >                    assertFalse(q.offer(three));
819 >                    threadsStarted.await();
820 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
821 >                    assertEquals(0, q.remainingCapacity());
822 >                }});
823 >
824 >            executor.execute(new CheckedRunnable() {
825 >                public void realRun() throws InterruptedException {
826 >                    threadsStarted.await();
827 >                    assertEquals(0, q.remainingCapacity());
828 >                    assertSame(one, q.take());
829 >                }});
830 >        }
831      }
832  
833      /**
834 <     * poll retrieves elements across Executor threads
834 >     * timed poll retrieves elements across Executor threads
835       */
836      public void testPollInExecutor() {
837          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
838 <        ExecutorService executor = Executors.newFixedThreadPool(2);
839 <        executor.execute(new CheckedRunnable() {
840 <            public void realRun() throws InterruptedException {
841 <                threadAssertNull(q.poll());
842 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
843 <                threadAssertTrue(q.isEmpty());
844 <            }});
845 <
846 <        executor.execute(new CheckedRunnable() {
847 <            public void realRun() throws InterruptedException {
848 <                Thread.sleep(SMALL_DELAY_MS);
849 <                q.put(one);
850 <            }});
851 <
852 <        joinPool(executor);
838 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
839 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
840 >        try (PoolCleaner cleaner = cleaner(executor)) {
841 >            executor.execute(new CheckedRunnable() {
842 >                public void realRun() throws InterruptedException {
843 >                    assertNull(q.poll());
844 >                    threadsStarted.await();
845 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
846 >                    checkEmpty(q);
847 >                }});
848 >
849 >            executor.execute(new CheckedRunnable() {
850 >                public void realRun() throws InterruptedException {
851 >                    threadsStarted.await();
852 >                    q.put(one);
853 >                }});
854 >        }
855      }
856  
857      /**
858       * A deserialized serialized queue has same elements in same order
859       */
860      public void testSerialization() throws Exception {
861 <        ArrayBlockingQueue q = populatedQueue(SIZE);
862 <
796 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
797 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
798 <        out.writeObject(q);
799 <        out.close();
861 >        Queue x = populatedQueue(SIZE);
862 >        Queue y = serialClone(x);
863  
864 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
865 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
866 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
867 <        assertEquals(q.size(), r.size());
868 <        while (!q.isEmpty())
869 <            assertEquals(q.remove(), r.remove());
870 <    }
871 <
872 <    /**
810 <     * drainTo(null) throws NPE
811 <     */
812 <    public void testDrainToNull() {
813 <        ArrayBlockingQueue q = populatedQueue(SIZE);
814 <        try {
815 <            q.drainTo(null);
816 <            shouldThrow();
817 <        } catch (NullPointerException success) {}
818 <    }
819 <
820 <    /**
821 <     * drainTo(this) throws IAE
822 <     */
823 <    public void testDrainToSelf() {
824 <        ArrayBlockingQueue q = populatedQueue(SIZE);
825 <        try {
826 <            q.drainTo(q);
827 <            shouldThrow();
828 <        } catch (IllegalArgumentException success) {}
864 >        assertNotSame(x, y);
865 >        assertEquals(x.size(), y.size());
866 >        assertEquals(x.toString(), y.toString());
867 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
868 >        while (!x.isEmpty()) {
869 >            assertFalse(y.isEmpty());
870 >            assertEquals(x.remove(), y.remove());
871 >        }
872 >        assertTrue(y.isEmpty());
873      }
874  
875      /**
# Line 835 | Line 879 | public class ArrayBlockingQueueTest exte
879          ArrayBlockingQueue q = populatedQueue(SIZE);
880          ArrayList l = new ArrayList();
881          q.drainTo(l);
882 <        assertEquals(q.size(), 0);
883 <        assertEquals(l.size(), SIZE);
882 >        assertEquals(0, q.size());
883 >        assertEquals(SIZE, l.size());
884          for (int i = 0; i < SIZE; ++i)
885              assertEquals(l.get(i), new Integer(i));
886          q.add(zero);
# Line 846 | Line 890 | public class ArrayBlockingQueueTest exte
890          assertTrue(q.contains(one));
891          l.clear();
892          q.drainTo(l);
893 <        assertEquals(q.size(), 0);
894 <        assertEquals(l.size(), 2);
893 >        assertEquals(0, q.size());
894 >        assertEquals(2, l.size());
895          for (int i = 0; i < 2; ++i)
896              assertEquals(l.get(i), new Integer(i));
897      }
# Line 859 | Line 903 | public class ArrayBlockingQueueTest exte
903          final ArrayBlockingQueue q = populatedQueue(SIZE);
904          Thread t = new Thread(new CheckedRunnable() {
905              public void realRun() throws InterruptedException {
906 <                q.put(new Integer(SIZE+1));
906 >                q.put(new Integer(SIZE + 1));
907              }});
908  
909          t.start();
# Line 873 | Line 917 | public class ArrayBlockingQueueTest exte
917      }
918  
919      /**
920 <     * drainTo(null, n) throws NPE
877 <     */
878 <    public void testDrainToNullN() {
879 <        ArrayBlockingQueue q = populatedQueue(SIZE);
880 <        try {
881 <            q.drainTo(null, 0);
882 <            shouldThrow();
883 <        } catch (NullPointerException success) {}
884 <    }
885 <
886 <    /**
887 <     * drainTo(this, n) throws IAE
888 <     */
889 <    public void testDrainToSelfN() {
890 <        ArrayBlockingQueue q = populatedQueue(SIZE);
891 <        try {
892 <            q.drainTo(q, 0);
893 <            shouldThrow();
894 <        } catch (IllegalArgumentException success) {}
895 <    }
896 <
897 <    /**
898 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
920 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
921       */
922      public void testDrainToN() {
923 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
923 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
924          for (int i = 0; i < SIZE + 2; ++i) {
925              for (int j = 0; j < SIZE; j++)
926                  assertTrue(q.offer(new Integer(j)));
927              ArrayList l = new ArrayList();
928              q.drainTo(l, i);
929 <            int k = (i < SIZE)? i : SIZE;
930 <            assertEquals(l.size(), k);
931 <            assertEquals(q.size(), SIZE-k);
929 >            int k = (i < SIZE) ? i : SIZE;
930 >            assertEquals(k, l.size());
931 >            assertEquals(SIZE - k, q.size());
932              for (int j = 0; j < k; ++j)
933                  assertEquals(l.get(j), new Integer(j));
934 <            while (q.poll() != null) ;
934 >            do {} while (q.poll() != null);
935          }
936      }
937  
938 +    /**
939 +     * remove(null), contains(null) always return false
940 +     */
941 +    public void testNeverContainsNull() {
942 +        Collection<?>[] qs = {
943 +            populatedQueue(0, 1, 10, false),
944 +            populatedQueue(2, 2, 10, true),
945 +        };
946 +
947 +        for (Collection<?> q : qs) {
948 +            assertFalse(q.contains(null));
949 +            assertFalse(q.remove(null));
950 +        }
951 +    }
952   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines