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.20 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.100 by jsr166, Wed Jan 27 02:55:18 2021 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 = randomBoolean();
38 >                return populatedQueue(0, SIZE, 2 * SIZE, fair);
39 >            }
40 >            public Object makeElement(int i) { return JSR166TestCase.itemFor(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<Item> emptyCollection() {
54 >            return populatedQueue(0, SIZE, 2 * SIZE, true);
55 >        }
56 >    }
57 >
58 >    public static class NonFair extends BlockingQueueTest {
59 >        protected BlockingQueue<Item> 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 >     * Items 0 ... n - 1.
67       */
68 <    private ArrayBlockingQueue populatedQueue(int n) {
69 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
68 >    static ArrayBlockingQueue<Item> populatedQueue(int n) {
69 >        return populatedQueue(n, n, n, false);
70 >    }
71 >
72 >    /**
73 >     * Returns a new queue of given size containing consecutive
74 >     * Items 0 ... n - 1, with given capacity range and fairness.
75 >     */
76 >    static ArrayBlockingQueue<Item> 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<Item> 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(fortytwo);
86 >            for (int i = 0; i < n; i++) q.remove();
87 >        }
88 >        for (int i = 0; i < size; i++)
89 >            mustOffer(q, i);
90 >        mustEqual(size == 0, q.isEmpty());
91 >        mustEqual(capacity - size, q.remainingCapacity());
92 >        mustEqual(size, q.size());
93 >        if (size > 0)
94 >            mustEqual(0, q.peek());
95          return q;
96      }
97  
# Line 40 | Line 99 | public class ArrayBlockingQueueTest exte
99       * A new queue has the indicated capacity
100       */
101      public void testConstructor1() {
102 <        assertEquals(SIZE, new ArrayBlockingQueue(SIZE).remainingCapacity());
102 >        mustEqual(SIZE, new ArrayBlockingQueue<Item>(SIZE).remainingCapacity());
103      }
104  
105      /**
106 <     * Constructor throws IAE if capacity argument nonpositive
106 >     * Constructor throws IllegalArgumentException 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<Item>(i);
112 >                shouldThrow();
113 >            } catch (IllegalArgumentException success) {}
114 >            for (boolean fair : new boolean[] { true, false }) {
115 >                try {
116 >                    new ArrayBlockingQueue<Item>(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<Item>(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<Item> elements = Arrays.asList(new Item[SIZE]);
138          try {
139 <            Integer[] ints = new Integer[SIZE];
72 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
139 >            new ArrayBlockingQueue<Item>(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 +        Item[] items = new Item[2]; items[0] = zero;
149 +        Collection<Item> elements = Arrays.asList(items);
150          try {
151 <            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));
151 >            new ArrayBlockingQueue<Item>(SIZE, false, elements);
152              shouldThrow();
153          } catch (NullPointerException success) {}
154      }
155  
156      /**
157 <     * Initializing from too large collection throws IAE
157 >     * Initializing from too large collection throws IllegalArgumentException
158       */
159 <    public void testConstructor6() {
159 >    public void testConstructor_collectionTooLarge() {
160 >        // just barely fits - succeeds
161 >        new ArrayBlockingQueue<Object>(SIZE, false,
162 >                                       Collections.nCopies(SIZE, ""));
163          try {
164 <            Integer[] ints = new Integer[SIZE];
165 <            for (int i = 0; i < SIZE; ++i)
97 <                ints[i] = new Integer(i);
98 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
164 >            new ArrayBlockingQueue<Object>(SIZE - 1, false,
165 >                                   Collections.nCopies(SIZE, ""));
166              shouldThrow();
167          } catch (IllegalArgumentException success) {}
168      }
# Line 104 | Line 171 | public class ArrayBlockingQueueTest exte
171       * Queue contains all elements of collection used to initialize
172       */
173      public void testConstructor7() {
174 <        Integer[] ints = new Integer[SIZE];
175 <        for (int i = 0; i < SIZE; ++i)
176 <            ints[i] = new Integer(i);
110 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
174 >        Item[] items = defaultItems;
175 >        Collection<Item> elements = Arrays.asList(items);
176 >        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE, true, elements);
177          for (int i = 0; i < SIZE; ++i)
178 <            assertEquals(ints[i], q.poll());
178 >            mustEqual(items[i], q.poll());
179      }
180  
181      /**
182       * Queue transitions from empty to full when elements added
183       */
184      public void testEmptyFull() {
185 <        ArrayBlockingQueue q = new ArrayBlockingQueue(2);
185 >        BlockingQueue<Item> q = populatedQueue(0, 2, 2, false);
186          assertTrue(q.isEmpty());
187 <        assertEquals(2, q.remainingCapacity());
187 >        mustEqual(2, q.remainingCapacity());
188          q.add(one);
189          assertFalse(q.isEmpty());
190 <        q.add(two);
190 >        assertTrue(q.offer(two));
191          assertFalse(q.isEmpty());
192 <        assertEquals(0, q.remainingCapacity());
192 >        mustEqual(0, q.remainingCapacity());
193          assertFalse(q.offer(three));
194      }
195  
# Line 131 | Line 197 | public class ArrayBlockingQueueTest exte
197       * remainingCapacity decreases on add, increases on remove
198       */
199      public void testRemainingCapacity() {
200 <        ArrayBlockingQueue q = populatedQueue(SIZE);
201 <        for (int i = 0; i < SIZE; ++i) {
202 <            assertEquals(i, q.remainingCapacity());
203 <            assertEquals(SIZE-i, q.size());
204 <            q.remove();
200 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
201 >        BlockingQueue<Item> q = populatedQueue(size, size, 2 * size, false);
202 >        int spare = q.remainingCapacity();
203 >        int capacity = spare + size;
204 >        for (int i = 0; i < size; i++) {
205 >            mustEqual(spare + i, q.remainingCapacity());
206 >            mustEqual(capacity, q.size() + q.remainingCapacity());
207 >            mustEqual(i, q.remove());
208 >        }
209 >        for (int i = 0; i < size; i++) {
210 >            mustEqual(capacity - i, q.remainingCapacity());
211 >            mustEqual(capacity, q.size() + q.remainingCapacity());
212 >            mustAdd(q, i);
213          }
140        for (int i = 0; i < SIZE; ++i) {
141            assertEquals(SIZE-i, q.remainingCapacity());
142            assertEquals(i, q.size());
143            q.add(new Integer(i));
144        }
145    }
146
147    /**
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) {}
214      }
215  
216      /**
217       * Offer succeeds if not full; fails if full
218       */
219      public void testOffer() {
220 <        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
220 >        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(1);
221          assertTrue(q.offer(zero));
222          assertFalse(q.offer(one));
223      }
224  
225      /**
226 <     * add succeeds if not full; throws ISE if full
226 >     * add succeeds if not full; throws IllegalStateException if full
227       */
228      public void testAdd() {
229 +        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE);
230 +        for (int i = 0; i < SIZE; i++) assertTrue(q.add(itemFor(i)));
231 +        mustEqual(0, q.remainingCapacity());
232          try {
233 <            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));
233 >            q.add(itemFor(SIZE));
234              shouldThrow();
235          } catch (IllegalStateException success) {}
236      }
237  
238      /**
239 <     *  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 <    /**
205 <     * addAll(this) throws IAE
239 >     * addAll(this) throws IllegalArgumentException
240       */
241      public void testAddAllSelf() {
242 +        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
243          try {
209            ArrayBlockingQueue q = populatedQueue(SIZE);
244              q.addAll(q);
245              shouldThrow();
246          } catch (IllegalArgumentException success) {}
247      }
248  
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    }
249      /**
250       * addAll of a collection with any null elements throws NPE after
251       * possibly adding some elements
252       */
253      public void testAddAll3() {
254 +        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE);
255 +        Item[] items = new Item[2]; items[0] = zero;
256          try {
257 <            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);
237 <            q.addAll(Arrays.asList(ints));
257 >            q.addAll(Arrays.asList(items));
258              shouldThrow();
259          } catch (NullPointerException success) {}
260      }
261 +
262      /**
263 <     * addAll throws ISE if not enough room
263 >     * addAll throws IllegalStateException if not enough room
264       */
265 <    public void testAddAll4() {
265 >    public void testAddAll_insufficientSpace() {
266 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
267 >        ArrayBlockingQueue<Item> q = populatedQueue(0, size, size, false);
268 >        // Just fits:
269 >        q.addAll(populatedQueue(size, size, 2 * size, false));
270 >        mustEqual(0, q.remainingCapacity());
271 >        mustEqual(size, q.size());
272 >        mustEqual(0, q.peek());
273          try {
274 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
275 <            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));
274 >            q = populatedQueue(0, size, size, false);
275 >            q.addAll(Collections.nCopies(size + 1, fortytwo));
276              shouldThrow();
277          } catch (IllegalStateException success) {}
278      }
279 +
280      /**
281       * Queue contains all elements, in traversal order, of successful addAll
282       */
283      public void testAddAll5() {
284 <        Integer[] empty = new Integer[0];
285 <        Integer[] ints = new Integer[SIZE];
286 <        for (int i = 0; i < SIZE; ++i)
261 <            ints[i] = new Integer(i);
262 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
284 >        Item[] empty = new Item[0];
285 >        Item[] items = defaultItems;
286 >        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE);
287          assertFalse(q.addAll(Arrays.asList(empty)));
288 <        assertTrue(q.addAll(Arrays.asList(ints)));
288 >        assertTrue(q.addAll(Arrays.asList(items)));
289          for (int i = 0; i < SIZE; ++i)
290 <            assertEquals(ints[i], q.poll());
290 >            mustEqual(items[i], q.poll());
291      }
292  
293      /**
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    /**
294       * all elements successfully put are contained
295       */
296      public void testPut() throws InterruptedException {
297 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
297 >        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE);
298          for (int i = 0; i < SIZE; ++i) {
299 <            Integer I = new Integer(i);
300 <            q.put(I);
301 <            assertTrue(q.contains(I));
299 >            Item x = itemFor(i);
300 >            q.put(x);
301 >            mustContain(q, x);
302          }
303 <        assertEquals(0, q.remainingCapacity());
303 >        mustEqual(0, q.remainingCapacity());
304      }
305  
306      /**
307       * put blocks interruptibly if full
308       */
309      public void testBlockingPut() throws InterruptedException {
310 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
311 <        Thread t = new Thread(new CheckedRunnable() {
312 <            public void realRun() {
313 <                int added = 0;
310 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE);
311 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
312 >        Thread t = newStartedThread(new CheckedRunnable() {
313 >            public void realRun() throws InterruptedException {
314 >                for (int i = 0; i < SIZE; ++i)
315 >                    q.put(itemFor(i));
316 >                mustEqual(SIZE, q.size());
317 >                mustEqual(0, q.remainingCapacity());
318 >
319 >                Thread.currentThread().interrupt();
320                  try {
321 <                    for (int i = 0; i < SIZE; ++i) {
322 <                        q.put(new Integer(i));
323 <                        ++added;
324 <                    }
306 <                    q.put(new Integer(SIZE));
307 <                    threadShouldThrow();
308 <                } catch (InterruptedException success) {
309 <                    threadAssertEquals(added, SIZE);
310 <                }}});
321 >                    q.put(ninetynine);
322 >                    shouldThrow();
323 >                } catch (InterruptedException success) {}
324 >                assertFalse(Thread.interrupted());
325  
326 <        t.start();
327 <        Thread.sleep(MEDIUM_DELAY_MS);
326 >                pleaseInterrupt.countDown();
327 >                try {
328 >                    q.put(ninetynine);
329 >                    shouldThrow();
330 >                } catch (InterruptedException success) {}
331 >                assertFalse(Thread.interrupted());
332 >            }});
333 >
334 >        await(pleaseInterrupt);
335 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
336          t.interrupt();
337 <        t.join();
337 >        awaitTermination(t);
338 >        mustEqual(SIZE, q.size());
339 >        mustEqual(0, q.remainingCapacity());
340      }
341  
342      /**
343 <     * put blocks waiting for take when full
343 >     * put blocks interruptibly waiting for take when full
344       */
345      public void testPutWithTake() throws InterruptedException {
346 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
347 <        Thread t = new Thread(new CheckedRunnable() {
348 <            public void realRun() {
349 <                int added = 0;
346 >        final int capacity = 2;
347 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(capacity);
348 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
349 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
350 >        Thread t = newStartedThread(new CheckedRunnable() {
351 >            public void realRun() throws InterruptedException {
352 >                for (int i = 0; i < capacity; i++)
353 >                    q.put(itemFor(i));
354 >                pleaseTake.countDown();
355 >                q.put(eightysix);
356 >
357 >                Thread.currentThread().interrupt();
358 >                try {
359 >                    q.put(ninetynine);
360 >                    shouldThrow();
361 >                } catch (InterruptedException success) {}
362 >                assertFalse(Thread.interrupted());
363 >
364 >                pleaseInterrupt.countDown();
365                  try {
366 <                    q.put(new Object());
367 <                    ++added;
368 <                    q.put(new Object());
369 <                    ++added;
331 <                    q.put(new Object());
332 <                    ++added;
333 <                    q.put(new Object());
334 <                    ++added;
335 <                    threadShouldThrow();
336 <                } catch (InterruptedException success) {
337 <                    threadAssertTrue(added >= 2);
338 <                }
366 >                    q.put(ninetynine);
367 >                    shouldThrow();
368 >                } catch (InterruptedException success) {}
369 >                assertFalse(Thread.interrupted());
370              }});
371  
372 <        t.start();
373 <        Thread.sleep(SHORT_DELAY_MS);
374 <        q.take();
372 >        await(pleaseTake);
373 >        mustEqual(0, q.remainingCapacity());
374 >        mustEqual(0, q.take());
375 >
376 >        await(pleaseInterrupt);
377 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
378          t.interrupt();
379 <        t.join();
379 >        awaitTermination(t);
380 >        mustEqual(0, q.remainingCapacity());
381      }
382  
383      /**
384       * timed offer times out if full and elements not taken
385       */
386 <    public void testTimedOffer() throws InterruptedException {
387 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
388 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
386 >    public void testTimedOffer() {
387 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(2);
388 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
389 >        Thread t = newStartedThread(new CheckedRunnable() {
390              public void realRun() throws InterruptedException {
391 <                q.put(new Object());
392 <                q.put(new Object());
393 <                threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
394 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
395 <            }};
391 >                q.put(one);
392 >                q.put(two);
393 >                long startTime = System.nanoTime();
394 >                assertFalse(q.offer(zero, timeoutMillis(), MILLISECONDS));
395 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
396  
397 <        t.start();
398 <        Thread.sleep(SHORT_DELAY_MS);
397 >                Thread.currentThread().interrupt();
398 >                try {
399 >                    q.offer(three, randomTimeout(), randomTimeUnit());
400 >                    shouldThrow();
401 >                } catch (InterruptedException success) {}
402 >                assertFalse(Thread.interrupted());
403 >
404 >                pleaseInterrupt.countDown();
405 >                try {
406 >                    q.offer(four, LONGER_DELAY_MS, MILLISECONDS);
407 >                    shouldThrow();
408 >                } catch (InterruptedException success) {}
409 >                assertFalse(Thread.interrupted());
410 >            }});
411 >
412 >        await(pleaseInterrupt);
413 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
414          t.interrupt();
415 <        t.join();
415 >        awaitTermination(t);
416      }
417  
418      /**
419       * take retrieves elements in FIFO order
420       */
421      public void testTake() throws InterruptedException {
422 <        ArrayBlockingQueue q = populatedQueue(SIZE);
422 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
423          for (int i = 0; i < SIZE; ++i) {
424 <            assertEquals(i, ((Integer)q.take()).intValue());
424 >            mustEqual(i, q.take());
425          }
426      }
427  
428      /**
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    /**
429       * Take removes existing elements until empty, then blocks interruptibly
430       */
431      public void testBlockingTake() throws InterruptedException {
432 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
432 >        final ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
433 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
434 >        Thread t = newStartedThread(new CheckedRunnable() {
435              public void realRun() throws InterruptedException {
436 <                ArrayBlockingQueue q = populatedQueue(SIZE);
400 <                for (int i = 0; i < SIZE; ++i) {
401 <                    threadAssertEquals(i, ((Integer)q.take()).intValue());
402 <                }
403 <                q.take();
404 <            }};
436 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
437  
438 <        t.start();
439 <            Thread.sleep(SHORT_DELAY_MS);
440 <            t.interrupt();
441 <            t.join();
442 <    }
438 >                Thread.currentThread().interrupt();
439 >                try {
440 >                    q.take();
441 >                    shouldThrow();
442 >                } catch (InterruptedException success) {}
443 >                assertFalse(Thread.interrupted());
444  
445 +                pleaseInterrupt.countDown();
446 +                try {
447 +                    q.take();
448 +                    shouldThrow();
449 +                } catch (InterruptedException success) {}
450 +                assertFalse(Thread.interrupted());
451 +            }});
452 +
453 +        await(pleaseInterrupt);
454 +        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
455 +        t.interrupt();
456 +        awaitTermination(t);
457 +    }
458  
459      /**
460       * poll succeeds unless empty
461       */
462      public void testPoll() {
463 <        ArrayBlockingQueue q = populatedQueue(SIZE);
463 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
464          for (int i = 0; i < SIZE; ++i) {
465 <            assertEquals(i, ((Integer)q.poll()).intValue());
465 >            mustEqual(i, q.poll());
466          }
467          assertNull(q.poll());
468      }
469  
470      /**
471 <     * timed pool with zero timeout succeeds when non-empty, else times out
471 >     * timed poll with zero timeout succeeds when non-empty, else times out
472       */
473      public void testTimedPoll0() throws InterruptedException {
474 <        ArrayBlockingQueue q = populatedQueue(SIZE);
474 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
475          for (int i = 0; i < SIZE; ++i) {
476 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
476 >            mustEqual(i, q.poll(0, MILLISECONDS));
477          }
478          assertNull(q.poll(0, MILLISECONDS));
479 +        checkEmpty(q);
480      }
481  
482      /**
483 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
483 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
484       */
485      public void testTimedPoll() throws InterruptedException {
486 <        ArrayBlockingQueue q = populatedQueue(SIZE);
486 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
487          for (int i = 0; i < SIZE; ++i) {
488 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
489 <        }
490 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
488 >            long startTime = System.nanoTime();
489 >            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
490 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
491 >        }
492 >        long startTime = System.nanoTime();
493 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
494 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
495 >        checkEmpty(q);
496      }
497  
498      /**
# Line 448 | Line 500 | public class ArrayBlockingQueueTest exte
500       * returning timeout status
501       */
502      public void testInterruptedTimedPoll() throws InterruptedException {
503 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
503 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
504 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
505 >        Thread t = newStartedThread(new CheckedRunnable() {
506              public void realRun() throws InterruptedException {
507 <                ArrayBlockingQueue q = populatedQueue(SIZE);
508 <                for (int i = 0; i < SIZE; ++i) {
455 <                    threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
456 <                }
457 <                q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
458 <            }};
507 >                for (int i = 0; i < SIZE; i++)
508 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
509  
510 <        t.start();
511 <        Thread.sleep(SMALL_DELAY_MS);
512 <        t.interrupt();
513 <        t.join();
514 <    }
510 >                Thread.currentThread().interrupt();
511 >                try {
512 >                    q.poll(randomTimeout(), randomTimeUnit());
513 >                    shouldThrow();
514 >                } catch (InterruptedException success) {}
515 >                assertFalse(Thread.interrupted());
516  
517 <    /**
518 <     *  timed poll before a delayed offer fails; after offer succeeds;
519 <     *  on interruption throws
520 <     */
521 <    public void testTimedPollWithOffer() throws InterruptedException {
522 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
523 <        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 <            }};
517 >                pleaseInterrupt.countDown();
518 >                try {
519 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
520 >                    shouldThrow();
521 >                } catch (InterruptedException success) {}
522 >                assertFalse(Thread.interrupted());
523 >            }});
524  
525 <        t.start();
526 <        Thread.sleep(SMALL_DELAY_MS);
481 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
525 >        await(pleaseInterrupt);
526 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
527          t.interrupt();
528 <        t.join();
528 >        awaitTermination(t);
529 >        checkEmpty(q);
530      }
531  
486
532      /**
533       * peek returns next element, or null if empty
534       */
535      public void testPeek() {
536 <        ArrayBlockingQueue q = populatedQueue(SIZE);
536 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
537          for (int i = 0; i < SIZE; ++i) {
538 <            assertEquals(i, ((Integer)q.peek()).intValue());
539 <            q.poll();
538 >            mustEqual(i, q.peek());
539 >            mustEqual(i, q.poll());
540              assertTrue(q.peek() == null ||
541 <                       i != ((Integer)q.peek()).intValue());
541 >                       !q.peek().equals(i));
542          }
543          assertNull(q.peek());
544      }
# Line 502 | Line 547 | public class ArrayBlockingQueueTest exte
547       * element returns next element, or throws NSEE if empty
548       */
549      public void testElement() {
550 <        ArrayBlockingQueue q = populatedQueue(SIZE);
550 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
551          for (int i = 0; i < SIZE; ++i) {
552 <            assertEquals(i, ((Integer)q.element()).intValue());
553 <            q.poll();
552 >            mustEqual(i, q.element());
553 >            mustEqual(i, q.poll());
554          }
555          try {
556              q.element();
# Line 517 | Line 562 | public class ArrayBlockingQueueTest exte
562       * remove removes next element, or throws NSEE if empty
563       */
564      public void testRemove() {
565 <        ArrayBlockingQueue q = populatedQueue(SIZE);
565 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
566          for (int i = 0; i < SIZE; ++i) {
567 <            assertEquals(i, ((Integer)q.remove()).intValue());
567 >            mustEqual(i, q.remove());
568          }
569          try {
570              q.remove();
# Line 528 | Line 573 | public class ArrayBlockingQueueTest exte
573      }
574  
575      /**
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    /**
576       * contains(x) reports true when elements added but not yet removed
577       */
578      public void testContains() {
579 <        ArrayBlockingQueue q = populatedQueue(SIZE);
580 <        for (int i = 0; i < SIZE; ++i) {
581 <            assertTrue(q.contains(new Integer(i)));
582 <            q.poll();
583 <            assertFalse(q.contains(new Integer(i)));
579 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
580 >        ArrayBlockingQueue<Item> q = populatedQueue(size, size, 2 * size, false);
581 >        assertFalse(q.contains(null));
582 >        for (int i = 0; i < size; ++i) {
583 >            mustContain(q, i);
584 >            mustEqual(i, q.poll());
585 >            mustNotContain(q, i);
586          }
587      }
588  
# Line 558 | Line 590 | public class ArrayBlockingQueueTest exte
590       * clear removes all elements
591       */
592      public void testClear() {
593 <        ArrayBlockingQueue q = populatedQueue(SIZE);
593 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
594 >        ArrayBlockingQueue<Item> q = populatedQueue(size, size, 2 * size, false);
595 >        int capacity = size + q.remainingCapacity();
596          q.clear();
597          assertTrue(q.isEmpty());
598 <        assertEquals(0, q.size());
599 <        assertEquals(SIZE, q.remainingCapacity());
598 >        mustEqual(0, q.size());
599 >        mustEqual(capacity, q.remainingCapacity());
600          q.add(one);
601          assertFalse(q.isEmpty());
602 <        assertTrue(q.contains(one));
602 >        mustContain(q, one);
603          q.clear();
604          assertTrue(q.isEmpty());
605      }
# Line 574 | Line 608 | public class ArrayBlockingQueueTest exte
608       * containsAll(c) is true when c contains a subset of elements
609       */
610      public void testContainsAll() {
611 <        ArrayBlockingQueue q = populatedQueue(SIZE);
612 <        ArrayBlockingQueue p = new ArrayBlockingQueue(SIZE);
611 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
612 >        ArrayBlockingQueue<Item> p = new ArrayBlockingQueue<>(SIZE);
613          for (int i = 0; i < SIZE; ++i) {
614              assertTrue(q.containsAll(p));
615              assertFalse(p.containsAll(q));
616 <            p.add(new Integer(i));
616 >            mustAdd(p, i);
617          }
618          assertTrue(p.containsAll(q));
619      }
# Line 588 | Line 622 | public class ArrayBlockingQueueTest exte
622       * retainAll(c) retains only those elements of c and reports true if changed
623       */
624      public void testRetainAll() {
625 <        ArrayBlockingQueue q = populatedQueue(SIZE);
626 <        ArrayBlockingQueue p = populatedQueue(SIZE);
625 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
626 >        ArrayBlockingQueue<Item> p = populatedQueue(SIZE);
627          for (int i = 0; i < SIZE; ++i) {
628              boolean changed = q.retainAll(p);
629              if (i == 0)
# Line 598 | Line 632 | public class ArrayBlockingQueueTest exte
632                  assertTrue(changed);
633  
634              assertTrue(q.containsAll(p));
635 <            assertEquals(SIZE-i, q.size());
635 >            mustEqual(SIZE - i, q.size());
636              p.remove();
637          }
638      }
# Line 608 | Line 642 | public class ArrayBlockingQueueTest exte
642       */
643      public void testRemoveAll() {
644          for (int i = 1; i < SIZE; ++i) {
645 <            ArrayBlockingQueue q = populatedQueue(SIZE);
646 <            ArrayBlockingQueue p = populatedQueue(i);
645 >            ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
646 >            ArrayBlockingQueue<Item> p = populatedQueue(i);
647              assertTrue(q.removeAll(p));
648 <            assertEquals(SIZE-i, q.size());
648 >            mustEqual(SIZE - i, q.size());
649              for (int j = 0; j < i; ++j) {
650 <                Integer I = (Integer)(p.remove());
651 <                assertFalse(q.contains(I));
650 >                Item x = p.remove();
651 >                mustNotContain(q, x);
652              }
653          }
654      }
655  
656 <    /**
657 <     *  toArray contains all elements
658 <     */
659 <    public void testToArray() throws InterruptedException {
660 <        ArrayBlockingQueue q = populatedQueue(SIZE);
661 <        Object[] o = q.toArray();
662 <        for (int i = 0; i < o.length; i++)
663 <            assertEquals(o[i], q.take());
664 <    }
665 <
666 <    /**
667 <     * toArray(a) contains all elements
668 <     */
669 <    public void testToArray2() throws InterruptedException {
670 <        ArrayBlockingQueue q = populatedQueue(SIZE);
671 <        Integer[] ints = new Integer[SIZE];
672 <        ints = (Integer[])q.toArray(ints);
673 <        for (int i = 0; i < ints.length; i++)
674 <            assertEquals(ints[i], q.take());
675 <    }
676 <
677 <    /**
678 <     * toArray(null) throws NPE
679 <     */
680 <    public void testToArray_BadArg() {
656 >    void checkToArray(ArrayBlockingQueue<Item> q) {
657 >        int size = q.size();
658 >        Object[] a1 = q.toArray();
659 >        mustEqual(size, a1.length);
660 >        Item[] a2 = q.toArray(new Item[0]);
661 >        mustEqual(size, a2.length);
662 >        Item[] a3 = q.toArray(new Item[Math.max(0, size - 1)]);
663 >        mustEqual(size, a3.length);
664 >        Item[] a4 = new Item[size];
665 >        assertSame(a4, q.toArray(a4));
666 >        Item[] a5 = new Item[size + 1];
667 >        Arrays.fill(a5, fortytwo);
668 >        assertSame(a5, q.toArray(a5));
669 >        Item[] a6 = new Item[size + 2];
670 >        Arrays.fill(a6, fortytwo);
671 >        assertSame(a6, q.toArray(a6));
672 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
673 >        for (Object[] a : as) {
674 >            if (a.length > size) assertNull(a[size]);
675 >            if (a.length > size + 1) mustEqual(fortytwo, a[size + 1]);
676 >        }
677 >        Iterator<? extends Item> it = q.iterator();
678 >        Item s = q.peek();
679 >        for (int i = 0; i < size; i++) {
680 >            Item x = (Item) it.next();
681 >            mustEqual(s.value + i, x);
682 >            for (Object[] a : as)
683 >                mustEqual(a[i], x);
684 >        }
685 >    }
686 >
687 >    /**
688 >     * toArray() and toArray(a) contain all elements in FIFO order
689 >     */
690 >    public void testToArray() {
691 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
692 >        final int size = rnd.nextInt(6);
693 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
694 >        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(capacity);
695 >        for (int i = 0; i < size; i++) {
696 >            checkToArray(q);
697 >            mustAdd(q, i);
698 >        }
699 >        // Provoke wraparound
700 >        int added = size * 2;
701 >        for (int i = 0; i < added; i++) {
702 >            checkToArray(q);
703 >            mustEqual(i, q.poll());
704 >            q.add(new Item(size + i));
705 >        }
706 >        for (int i = 0; i < size; i++) {
707 >            checkToArray(q);
708 >            mustEqual((added + i), q.poll());
709 >        }
710 >    }
711 >
712 >    /**
713 >     * toArray(incompatible array type) throws ArrayStoreException
714 >     */
715 >    @SuppressWarnings("CollectionToArraySafeParameter")
716 >    public void testToArray_incompatibleArrayType() {
717 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
718          try {
719 <            ArrayBlockingQueue q = populatedQueue(SIZE);
649 <            Object o[] = q.toArray(null);
719 >            q.toArray(new String[10]);
720              shouldThrow();
721 <        } catch (NullPointerException success) {}
652 <    }
653 <
654 <    /**
655 <     * toArray with incompatible array type throws CCE
656 <     */
657 <    public void testToArray1_BadArg() {
721 >        } catch (ArrayStoreException success) {}
722          try {
723 <            ArrayBlockingQueue q = populatedQueue(SIZE);
660 <            Object o[] = q.toArray(new String[10] );
723 >            q.toArray(new String[0]);
724              shouldThrow();
725          } catch (ArrayStoreException success) {}
726      }
727  
665
728      /**
729       * iterator iterates through all elements
730       */
731      public void testIterator() throws InterruptedException {
732 <        ArrayBlockingQueue q = populatedQueue(SIZE);
733 <        Iterator it = q.iterator();
734 <        while (it.hasNext()) {
735 <            assertEquals(it.next(), q.take());
736 <        }
732 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
733 >        Iterator<? extends Item> it = q.iterator();
734 >        int i;
735 >        for (i = 0; it.hasNext(); i++)
736 >            mustContain(q, it.next());
737 >        mustEqual(i, SIZE);
738 >        assertIteratorExhausted(it);
739 >
740 >        it = q.iterator();
741 >        for (i = 0; it.hasNext(); i++)
742 >            mustEqual(it.next(), q.take());
743 >        mustEqual(i, SIZE);
744 >        assertIteratorExhausted(it);
745 >    }
746 >
747 >    /**
748 >     * iterator of empty collection has no elements
749 >     */
750 >    public void testEmptyIterator() {
751 >        assertIteratorExhausted(new ArrayBlockingQueue<>(SIZE).iterator());
752      }
753  
754      /**
755       * iterator.remove removes current element
756       */
757 <    public void testIteratorRemove () {
758 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
757 >    public void testIteratorRemove() {
758 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(3);
759          q.add(two);
760          q.add(one);
761          q.add(three);
762  
763 <        Iterator it = q.iterator();
763 >        Iterator<? extends Item> it = q.iterator();
764          it.next();
765          it.remove();
766  
767          it = q.iterator();
768 <        assertEquals(it.next(), one);
769 <        assertEquals(it.next(), three);
768 >        assertSame(it.next(), one);
769 >        assertSame(it.next(), three);
770          assertFalse(it.hasNext());
771      }
772  
# Line 697 | Line 774 | public class ArrayBlockingQueueTest exte
774       * iterator ordering is FIFO
775       */
776      public void testIteratorOrdering() {
777 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
777 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(3);
778          q.add(one);
779          q.add(two);
780          q.add(three);
# Line 705 | Line 782 | public class ArrayBlockingQueueTest exte
782          assertEquals("queue should be full", 0, q.remainingCapacity());
783  
784          int k = 0;
785 <        for (Iterator it = q.iterator(); it.hasNext();) {
786 <            int i = ((Integer)(it.next())).intValue();
710 <            assertEquals(++k, i);
785 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
786 >            mustEqual(++k, it.next());
787          }
788 <        assertEquals(3, k);
788 >        mustEqual(3, k);
789      }
790  
791      /**
792       * Modifications do not cause iterators to fail
793       */
794 <    public void testWeaklyConsistentIteration () {
795 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
794 >    public void testWeaklyConsistentIteration() {
795 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(3);
796          q.add(one);
797          q.add(two);
798          q.add(three);
799 <        for (Iterator it = q.iterator(); it.hasNext();) {
799 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
800              q.remove();
801              it.next();
802          }
803 <        assertEquals(0, q.size());
803 >        mustEqual(0, q.size());
804      }
805  
730
806      /**
807       * toString contains toStrings of elements
808       */
809      public void testToString() {
810 <        ArrayBlockingQueue q = populatedQueue(SIZE);
810 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
811          String s = q.toString();
812          for (int i = 0; i < SIZE; ++i) {
813 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
813 >            assertTrue(s.contains(String.valueOf(i)));
814          }
815      }
816  
742
817      /**
818       * offer transfers elements across Executor tasks
819       */
820      public void testOfferInExecutor() {
821 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
821 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(2);
822          q.add(one);
823          q.add(two);
824 <        ExecutorService executor = Executors.newFixedThreadPool(2);
825 <        executor.execute(new CheckedRunnable() {
826 <            public void realRun() throws InterruptedException {
827 <                threadAssertFalse(q.offer(three));
828 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
829 <                threadAssertEquals(0, q.remainingCapacity());
830 <            }});
831 <
832 <        executor.execute(new CheckedRunnable() {
833 <            public void realRun() throws InterruptedException {
834 <                Thread.sleep(SMALL_DELAY_MS);
835 <                threadAssertEquals(one, q.take());
836 <            }});
837 <
838 <        joinPool(executor);
839 <
824 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
825 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
826 >        try (PoolCleaner cleaner = cleaner(executor)) {
827 >            executor.execute(new CheckedRunnable() {
828 >                public void realRun() throws InterruptedException {
829 >                    assertFalse(q.offer(three));
830 >                    threadsStarted.await();
831 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
832 >                    mustEqual(0, q.remainingCapacity());
833 >                }});
834 >
835 >            executor.execute(new CheckedRunnable() {
836 >                public void realRun() throws InterruptedException {
837 >                    threadsStarted.await();
838 >                    mustEqual(0, q.remainingCapacity());
839 >                    assertSame(one, q.take());
840 >                }});
841 >        }
842      }
843  
844      /**
845 <     * poll retrieves elements across Executor threads
845 >     * timed poll retrieves elements across Executor threads
846       */
847      public void testPollInExecutor() {
848 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
849 <        ExecutorService executor = Executors.newFixedThreadPool(2);
850 <        executor.execute(new CheckedRunnable() {
851 <            public void realRun() throws InterruptedException {
852 <                threadAssertNull(q.poll());
853 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
854 <                threadAssertTrue(q.isEmpty());
855 <            }});
856 <
857 <        executor.execute(new CheckedRunnable() {
858 <            public void realRun() throws InterruptedException {
859 <                Thread.sleep(SMALL_DELAY_MS);
860 <                q.put(one);
861 <            }});
862 <
863 <        joinPool(executor);
848 >        final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(2);
849 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
850 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
851 >        try (PoolCleaner cleaner = cleaner(executor)) {
852 >            executor.execute(new CheckedRunnable() {
853 >                public void realRun() throws InterruptedException {
854 >                    assertNull(q.poll());
855 >                    threadsStarted.await();
856 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
857 >                    checkEmpty(q);
858 >                }});
859 >
860 >            executor.execute(new CheckedRunnable() {
861 >                public void realRun() throws InterruptedException {
862 >                    threadsStarted.await();
863 >                    q.put(one);
864 >                }});
865 >        }
866      }
867  
868      /**
869 <     * A deserialized serialized queue has same elements in same order
869 >     * A deserialized/reserialized queue has same elements in same order
870       */
871      public void testSerialization() throws Exception {
872 <        ArrayBlockingQueue q = populatedQueue(SIZE);
873 <
796 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
797 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
798 <        out.writeObject(q);
799 <        out.close();
800 <
801 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
802 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
803 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
804 <        assertEquals(q.size(), r.size());
805 <        while (!q.isEmpty())
806 <            assertEquals(q.remove(), r.remove());
807 <    }
808 <
809 <    /**
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 <    }
872 >        Queue<Item> x = populatedQueue(SIZE);
873 >        Queue<Item> y = serialClone(x);
874  
875 <    /**
876 <     * drainTo(this) throws IAE
877 <     */
878 <    public void testDrainToSelf() {
879 <        ArrayBlockingQueue q = populatedQueue(SIZE);
880 <        try {
881 <            q.drainTo(q);
882 <            shouldThrow();
883 <        } catch (IllegalArgumentException success) {}
875 >        assertNotSame(x, y);
876 >        mustEqual(x.size(), y.size());
877 >        mustEqual(x.toString(), y.toString());
878 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
879 >        while (!x.isEmpty()) {
880 >            assertFalse(y.isEmpty());
881 >            mustEqual(x.remove(), y.remove());
882 >        }
883 >        assertTrue(y.isEmpty());
884      }
885  
886      /**
887       * drainTo(c) empties queue into another collection c
888       */
889      public void testDrainTo() {
890 <        ArrayBlockingQueue q = populatedQueue(SIZE);
891 <        ArrayList l = new ArrayList();
890 >        ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
891 >        ArrayList<Item> l = new ArrayList<>();
892          q.drainTo(l);
893 <        assertEquals(q.size(), 0);
894 <        assertEquals(l.size(), SIZE);
893 >        mustEqual(0, q.size());
894 >        mustEqual(SIZE, l.size());
895          for (int i = 0; i < SIZE; ++i)
896 <            assertEquals(l.get(i), new Integer(i));
896 >            mustEqual(l.get(i), i);
897          q.add(zero);
898          q.add(one);
899          assertFalse(q.isEmpty());
900 <        assertTrue(q.contains(zero));
901 <        assertTrue(q.contains(one));
900 >        mustContain(q, zero);
901 >        mustContain(q, one);
902          l.clear();
903          q.drainTo(l);
904 <        assertEquals(q.size(), 0);
905 <        assertEquals(l.size(), 2);
904 >        mustEqual(0, q.size());
905 >        mustEqual(2, l.size());
906          for (int i = 0; i < 2; ++i)
907 <            assertEquals(l.get(i), new Integer(i));
907 >            mustEqual(l.get(i), i);
908      }
909  
910      /**
911       * drainTo empties full queue, unblocking a waiting put.
912       */
913      public void testDrainToWithActivePut() throws InterruptedException {
914 <        final ArrayBlockingQueue q = populatedQueue(SIZE);
914 >        final ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
915          Thread t = new Thread(new CheckedRunnable() {
916              public void realRun() throws InterruptedException {
917 <                q.put(new Integer(SIZE+1));
917 >                q.put(new Item(SIZE + 1));
918              }});
919  
920          t.start();
921 <        ArrayList l = new ArrayList();
921 >        ArrayList<Item> l = new ArrayList<>();
922          q.drainTo(l);
923          assertTrue(l.size() >= SIZE);
924          for (int i = 0; i < SIZE; ++i)
925 <            assertEquals(l.get(i), new Integer(i));
925 >            mustEqual(l.get(i), i);
926          t.join();
927          assertTrue(q.size() + l.size() >= SIZE);
928      }
929  
930      /**
931 <     * 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
931 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
932       */
933      public void testDrainToN() {
934 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
934 >        ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(SIZE * 2);
935          for (int i = 0; i < SIZE + 2; ++i) {
936              for (int j = 0; j < SIZE; j++)
937 <                assertTrue(q.offer(new Integer(j)));
938 <            ArrayList l = new ArrayList();
937 >                mustOffer(q, j);
938 >            ArrayList<Item> l = new ArrayList<>();
939              q.drainTo(l, i);
940 <            int k = (i < SIZE)? i : SIZE;
941 <            assertEquals(l.size(), k);
942 <            assertEquals(q.size(), SIZE-k);
940 >            int k = (i < SIZE) ? i : SIZE;
941 >            mustEqual(k, l.size());
942 >            mustEqual(SIZE - k, q.size());
943              for (int j = 0; j < k; ++j)
944 <                assertEquals(l.get(j), new Integer(j));
945 <            while (q.poll() != null) ;
944 >                mustEqual(l.get(j), j);
945 >            do {} while (q.poll() != null);
946          }
947      }
948  
949 +    /**
950 +     * remove(null), contains(null) always return false
951 +     */
952 +    public void testNeverContainsNull() {
953 +        Collection<?>[] qs = {
954 +            populatedQueue(0, 1, 10, false),
955 +            populatedQueue(2, 2, 10, true),
956 +        };
957 +
958 +        for (Collection<?> q : qs) {
959 +            assertFalse(q.contains(null));
960 +            assertFalse(q.remove(null));
961 +        }
962 +    }
963   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines