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.22 by jsr166, Sat Nov 21 19:48:24 2009 UTC vs.
Revision 1.78 by jsr166, Sun Nov 6 03:49:39 2016 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(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 success) {
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 >        assertThreadStaysAlive(t);
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 success) {
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 >        assertThreadStaysAlive(t);
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 >            }});
403  
404 <        t.start();
405 <        Thread.sleep(SHORT_DELAY_MS);
404 >        await(pleaseInterrupt);
405 >        assertThreadStaysAlive(t);
406          t.interrupt();
407 <        t.join();
407 >        awaitTermination(t);
408      }
409  
410      /**
# Line 370 | Line 413 | public class ArrayBlockingQueueTest exte
413      public void testTake() throws InterruptedException {
414          ArrayBlockingQueue q = populatedQueue(SIZE);
415          for (int i = 0; i < SIZE; ++i) {
416 <            assertEquals(i, ((Integer)q.take()).intValue());
416 >            assertEquals(i, q.take());
417          }
418      }
419  
420      /**
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    /**
421       * Take removes existing elements until empty, then blocks interruptibly
422       */
423      public void testBlockingTake() throws InterruptedException {
424 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
424 >        final ArrayBlockingQueue q = populatedQueue(SIZE);
425 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
426 >        Thread t = newStartedThread(new CheckedRunnable() {
427              public void realRun() throws InterruptedException {
399                ArrayBlockingQueue q = populatedQueue(SIZE);
428                  for (int i = 0; i < SIZE; ++i) {
429 <                    threadAssertEquals(i, ((Integer)q.take()).intValue());
429 >                    assertEquals(i, q.take());
430                  }
403                q.take();
404            }};
431  
432 <        t.start();
433 <            Thread.sleep(SHORT_DELAY_MS);
434 <            t.interrupt();
435 <            t.join();
436 <    }
432 >                Thread.currentThread().interrupt();
433 >                try {
434 >                    q.take();
435 >                    shouldThrow();
436 >                } catch (InterruptedException success) {}
437 >                assertFalse(Thread.interrupted());
438 >
439 >                pleaseInterrupt.countDown();
440 >                try {
441 >                    q.take();
442 >                    shouldThrow();
443 >                } catch (InterruptedException success) {}
444 >                assertFalse(Thread.interrupted());
445 >            }});
446  
447 +        await(pleaseInterrupt);
448 +        assertThreadStaysAlive(t);
449 +        t.interrupt();
450 +        awaitTermination(t);
451 +    }
452  
453      /**
454       * poll succeeds unless empty
# Line 416 | Line 456 | public class ArrayBlockingQueueTest exte
456      public void testPoll() {
457          ArrayBlockingQueue q = populatedQueue(SIZE);
458          for (int i = 0; i < SIZE; ++i) {
459 <            assertEquals(i, ((Integer)q.poll()).intValue());
459 >            assertEquals(i, q.poll());
460          }
461          assertNull(q.poll());
462      }
463  
464      /**
465 <     * timed pool with zero timeout succeeds when non-empty, else times out
465 >     * timed poll with zero timeout succeeds when non-empty, else times out
466       */
467      public void testTimedPoll0() throws InterruptedException {
468          ArrayBlockingQueue q = populatedQueue(SIZE);
469          for (int i = 0; i < SIZE; ++i) {
470 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
470 >            assertEquals(i, q.poll(0, MILLISECONDS));
471          }
472          assertNull(q.poll(0, MILLISECONDS));
473 +        checkEmpty(q);
474      }
475  
476      /**
477 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
477 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
478       */
479      public void testTimedPoll() throws InterruptedException {
480          ArrayBlockingQueue q = populatedQueue(SIZE);
481          for (int i = 0; i < SIZE; ++i) {
482 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
483 <        }
484 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
482 >            long startTime = System.nanoTime();
483 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
484 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
485 >        }
486 >        long startTime = System.nanoTime();
487 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
488 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
489 >        checkEmpty(q);
490      }
491  
492      /**
# Line 448 | Line 494 | public class ArrayBlockingQueueTest exte
494       * returning timeout status
495       */
496      public void testInterruptedTimedPoll() throws InterruptedException {
497 <        Thread t = new Thread(new CheckedRunnable() {
497 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
498 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
499 >        Thread t = newStartedThread(new CheckedRunnable() {
500              public void realRun() throws InterruptedException {
501 <                ArrayBlockingQueue q = populatedQueue(SIZE);
501 >                long startTime = System.nanoTime();
502                  for (int i = 0; i < SIZE; ++i) {
503 <                    assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
503 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
504                  }
505 +                aboutToWait.countDown();
506                  try {
507 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
507 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
508                      shouldThrow();
509 <                } catch (InterruptedException success) {}
509 >                } catch (InterruptedException success) {
510 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
511 >                }
512              }});
513  
514 <        t.start();
515 <        Thread.sleep(SHORT_DELAY_MS);
465 <        t.interrupt();
466 <        t.join();
467 <    }
468 <
469 <    /**
470 <     *  timed poll before a delayed offer fails; after offer succeeds;
471 <     *  on interruption throws
472 <     */
473 <    public void testTimedPollWithOffer() throws InterruptedException {
474 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
475 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
476 <            public void realRun() throws InterruptedException {
477 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
478 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
479 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
480 <            }};
481 <
482 <        t.start();
483 <        Thread.sleep(SMALL_DELAY_MS);
484 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
514 >        await(aboutToWait);
515 >        waitForThreadToEnterWaitState(t);
516          t.interrupt();
517 <        t.join();
517 >        awaitTermination(t);
518 >        checkEmpty(q);
519      }
520  
489
521      /**
522       * peek returns next element, or null if empty
523       */
524      public void testPeek() {
525          ArrayBlockingQueue q = populatedQueue(SIZE);
526          for (int i = 0; i < SIZE; ++i) {
527 <            assertEquals(i, ((Integer)q.peek()).intValue());
528 <            q.poll();
527 >            assertEquals(i, q.peek());
528 >            assertEquals(i, q.poll());
529              assertTrue(q.peek() == null ||
530 <                       i != ((Integer)q.peek()).intValue());
530 >                       !q.peek().equals(i));
531          }
532          assertNull(q.peek());
533      }
# Line 507 | Line 538 | public class ArrayBlockingQueueTest exte
538      public void testElement() {
539          ArrayBlockingQueue q = populatedQueue(SIZE);
540          for (int i = 0; i < SIZE; ++i) {
541 <            assertEquals(i, ((Integer)q.element()).intValue());
542 <            q.poll();
541 >            assertEquals(i, q.element());
542 >            assertEquals(i, q.poll());
543          }
544          try {
545              q.element();
# Line 522 | Line 553 | public class ArrayBlockingQueueTest exte
553      public void testRemove() {
554          ArrayBlockingQueue q = populatedQueue(SIZE);
555          for (int i = 0; i < SIZE; ++i) {
556 <            assertEquals(i, ((Integer)q.remove()).intValue());
556 >            assertEquals(i, q.remove());
557          }
558          try {
559              q.remove();
# Line 531 | Line 562 | public class ArrayBlockingQueueTest exte
562      }
563  
564      /**
534     * remove(x) removes x and returns true if present
535     */
536    public void testRemoveElement() {
537        ArrayBlockingQueue q = populatedQueue(SIZE);
538        for (int i = 1; i < SIZE; i+=2) {
539            assertTrue(q.remove(new Integer(i)));
540        }
541        for (int i = 0; i < SIZE; i+=2) {
542            assertTrue(q.remove(new Integer(i)));
543            assertFalse(q.remove(new Integer(i+1)));
544        }
545        assertTrue(q.isEmpty());
546    }
547
548    /**
565       * contains(x) reports true when elements added but not yet removed
566       */
567      public void testContains() {
568          ArrayBlockingQueue q = populatedQueue(SIZE);
569          for (int i = 0; i < SIZE; ++i) {
570              assertTrue(q.contains(new Integer(i)));
571 <            q.poll();
571 >            assertEquals(i, q.poll());
572              assertFalse(q.contains(new Integer(i)));
573          }
574      }
# Line 601 | Line 617 | public class ArrayBlockingQueueTest exte
617                  assertTrue(changed);
618  
619              assertTrue(q.containsAll(p));
620 <            assertEquals(SIZE-i, q.size());
620 >            assertEquals(SIZE - i, q.size());
621              p.remove();
622          }
623      }
# Line 614 | Line 630 | public class ArrayBlockingQueueTest exte
630              ArrayBlockingQueue q = populatedQueue(SIZE);
631              ArrayBlockingQueue p = populatedQueue(i);
632              assertTrue(q.removeAll(p));
633 <            assertEquals(SIZE-i, q.size());
633 >            assertEquals(SIZE - i, q.size());
634              for (int j = 0; j < i; ++j) {
635 <                Integer I = (Integer)(p.remove());
636 <                assertFalse(q.contains(I));
635 >                Integer x = (Integer)(p.remove());
636 >                assertFalse(q.contains(x));
637              }
638          }
639      }
640  
641 <    /**
642 <     *  toArray contains all elements
643 <     */
644 <    public void testToArray() throws InterruptedException {
645 <        ArrayBlockingQueue q = populatedQueue(SIZE);
646 <        Object[] o = q.toArray();
647 <        for (int i = 0; i < o.length; i++)
648 <            assertEquals(o[i], q.take());
641 >    void checkToArray(ArrayBlockingQueue<Integer> q) {
642 >        int size = q.size();
643 >        Object[] a1 = q.toArray();
644 >        assertEquals(size, a1.length);
645 >        Integer[] a2 = q.toArray(new Integer[0]);
646 >        assertEquals(size, a2.length);
647 >        Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
648 >        assertEquals(size, a3.length);
649 >        Integer[] a4 = new Integer[size];
650 >        assertSame(a4, q.toArray(a4));
651 >        Integer[] a5 = new Integer[size + 1];
652 >        Arrays.fill(a5, 42);
653 >        assertSame(a5, q.toArray(a5));
654 >        Integer[] a6 = new Integer[size + 2];
655 >        Arrays.fill(a6, 42);
656 >        assertSame(a6, q.toArray(a6));
657 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
658 >        for (Object[] a : as) {
659 >            if (a.length > size) assertNull(a[size]);
660 >            if (a.length > size + 1) assertEquals(42, a[size + 1]);
661 >        }
662 >        Iterator it = q.iterator();
663 >        Integer s = q.peek();
664 >        for (int i = 0; i < size; i++) {
665 >            Integer x = (Integer) it.next();
666 >            assertEquals(s + i, (int) x);
667 >            for (Object[] a : as)
668 >                assertSame(a1[i], x);
669 >        }
670      }
671  
672      /**
673 <     * toArray(a) contains all elements
673 >     * toArray() and toArray(a) contain all elements in FIFO order
674       */
675 <    public void testToArray2() throws InterruptedException {
676 <        ArrayBlockingQueue q = populatedQueue(SIZE);
677 <        Integer[] ints = new Integer[SIZE];
678 <        ints = (Integer[])q.toArray(ints);
679 <        for (int i = 0; i < ints.length; i++)
680 <            assertEquals(ints[i], q.take());
675 >    public void testToArray() {
676 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
677 >        final int size = rnd.nextInt(6);
678 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
679 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
680 >        for (int i = 0; i < size; i++) {
681 >            checkToArray(q);
682 >            q.add(i);
683 >        }
684 >        // Provoke wraparound
685 >        int added = size * 2;
686 >        for (int i = 0; i < added; i++) {
687 >            checkToArray(q);
688 >            assertEquals((Integer) i, q.poll());
689 >            q.add(size + i);
690 >        }
691 >        for (int i = 0; i < size; i++) {
692 >            checkToArray(q);
693 >            assertEquals((Integer) (added + i), q.poll());
694 >        }
695      }
696  
697      /**
698 <     * toArray(null) throws NPE
698 >     * toArray(incompatible array type) throws ArrayStoreException
699       */
700 <    public void testToArray_BadArg() {
700 >    public void testToArray_incompatibleArrayType() {
701 >        ArrayBlockingQueue q = populatedQueue(SIZE);
702          try {
703 <            ArrayBlockingQueue q = populatedQueue(SIZE);
652 <            Object o[] = q.toArray(null);
703 >            q.toArray(new String[10]);
704              shouldThrow();
705 <        } catch (NullPointerException success) {}
655 <    }
656 <
657 <    /**
658 <     * toArray with incompatible array type throws CCE
659 <     */
660 <    public void testToArray1_BadArg() {
705 >        } catch (ArrayStoreException success) {}
706          try {
707 <            ArrayBlockingQueue q = populatedQueue(SIZE);
663 <            Object o[] = q.toArray(new String[10] );
707 >            q.toArray(new String[0]);
708              shouldThrow();
709          } catch (ArrayStoreException success) {}
710      }
711  
668
712      /**
713       * iterator iterates through all elements
714       */
715      public void testIterator() throws InterruptedException {
716          ArrayBlockingQueue q = populatedQueue(SIZE);
717          Iterator it = q.iterator();
718 <        while (it.hasNext()) {
718 >        int i;
719 >        for (i = 0; it.hasNext(); i++)
720 >            assertTrue(q.contains(it.next()));
721 >        assertEquals(i, SIZE);
722 >        assertIteratorExhausted(it);
723 >
724 >        it = q.iterator();
725 >        for (i = 0; it.hasNext(); i++)
726              assertEquals(it.next(), q.take());
727 <        }
727 >        assertEquals(i, SIZE);
728 >        assertIteratorExhausted(it);
729 >    }
730 >
731 >    /**
732 >     * iterator of empty collection has no elements
733 >     */
734 >    public void testEmptyIterator() {
735 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
736      }
737  
738      /**
739       * iterator.remove removes current element
740       */
741 <    public void testIteratorRemove () {
741 >    public void testIteratorRemove() {
742          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
743          q.add(two);
744          q.add(one);
# Line 691 | Line 749 | public class ArrayBlockingQueueTest exte
749          it.remove();
750  
751          it = q.iterator();
752 <        assertEquals(it.next(), one);
753 <        assertEquals(it.next(), three);
752 >        assertSame(it.next(), one);
753 >        assertSame(it.next(), three);
754          assertFalse(it.hasNext());
755      }
756  
# Line 709 | Line 767 | public class ArrayBlockingQueueTest exte
767  
768          int k = 0;
769          for (Iterator it = q.iterator(); it.hasNext();) {
770 <            int i = ((Integer)(it.next())).intValue();
713 <            assertEquals(++k, i);
770 >            assertEquals(++k, it.next());
771          }
772          assertEquals(3, k);
773      }
# Line 718 | Line 775 | public class ArrayBlockingQueueTest exte
775      /**
776       * Modifications do not cause iterators to fail
777       */
778 <    public void testWeaklyConsistentIteration () {
778 >    public void testWeaklyConsistentIteration() {
779          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
780          q.add(one);
781          q.add(two);
# Line 730 | Line 787 | public class ArrayBlockingQueueTest exte
787          assertEquals(0, q.size());
788      }
789  
733
790      /**
791       * toString contains toStrings of elements
792       */
# Line 738 | Line 794 | public class ArrayBlockingQueueTest exte
794          ArrayBlockingQueue q = populatedQueue(SIZE);
795          String s = q.toString();
796          for (int i = 0; i < SIZE; ++i) {
797 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
797 >            assertTrue(s.contains(String.valueOf(i)));
798          }
799      }
800  
745
801      /**
802       * offer transfers elements across Executor tasks
803       */
# Line 750 | Line 805 | public class ArrayBlockingQueueTest exte
805          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
806          q.add(one);
807          q.add(two);
808 <        ExecutorService executor = Executors.newFixedThreadPool(2);
809 <        executor.execute(new CheckedRunnable() {
810 <            public void realRun() throws InterruptedException {
811 <                threadAssertFalse(q.offer(three));
812 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
813 <                threadAssertEquals(0, q.remainingCapacity());
814 <            }});
815 <
816 <        executor.execute(new CheckedRunnable() {
817 <            public void realRun() throws InterruptedException {
818 <                Thread.sleep(SMALL_DELAY_MS);
819 <                threadAssertEquals(one, q.take());
820 <            }});
821 <
822 <        joinPool(executor);
823 <
808 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
809 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
810 >        try (PoolCleaner cleaner = cleaner(executor)) {
811 >            executor.execute(new CheckedRunnable() {
812 >                public void realRun() throws InterruptedException {
813 >                    assertFalse(q.offer(three));
814 >                    threadsStarted.await();
815 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
816 >                    assertEquals(0, q.remainingCapacity());
817 >                }});
818 >
819 >            executor.execute(new CheckedRunnable() {
820 >                public void realRun() throws InterruptedException {
821 >                    threadsStarted.await();
822 >                    assertEquals(0, q.remainingCapacity());
823 >                    assertSame(one, q.take());
824 >                }});
825 >        }
826      }
827  
828      /**
829 <     * poll retrieves elements across Executor threads
829 >     * timed poll retrieves elements across Executor threads
830       */
831      public void testPollInExecutor() {
832          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
833 <        ExecutorService executor = Executors.newFixedThreadPool(2);
834 <        executor.execute(new CheckedRunnable() {
835 <            public void realRun() throws InterruptedException {
836 <                threadAssertNull(q.poll());
837 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
838 <                threadAssertTrue(q.isEmpty());
839 <            }});
840 <
841 <        executor.execute(new CheckedRunnable() {
842 <            public void realRun() throws InterruptedException {
843 <                Thread.sleep(SMALL_DELAY_MS);
844 <                q.put(one);
845 <            }});
846 <
847 <        joinPool(executor);
833 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
834 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
835 >        try (PoolCleaner cleaner = cleaner(executor)) {
836 >            executor.execute(new CheckedRunnable() {
837 >                public void realRun() throws InterruptedException {
838 >                    assertNull(q.poll());
839 >                    threadsStarted.await();
840 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
841 >                    checkEmpty(q);
842 >                }});
843 >
844 >            executor.execute(new CheckedRunnable() {
845 >                public void realRun() throws InterruptedException {
846 >                    threadsStarted.await();
847 >                    q.put(one);
848 >                }});
849 >        }
850      }
851  
852      /**
853       * A deserialized serialized queue has same elements in same order
854       */
855      public void testSerialization() throws Exception {
856 <        ArrayBlockingQueue q = populatedQueue(SIZE);
857 <
799 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
800 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
801 <        out.writeObject(q);
802 <        out.close();
803 <
804 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
805 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
806 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
807 <        assertEquals(q.size(), r.size());
808 <        while (!q.isEmpty())
809 <            assertEquals(q.remove(), r.remove());
810 <    }
811 <
812 <    /**
813 <     * drainTo(null) throws NPE
814 <     */
815 <    public void testDrainToNull() {
816 <        ArrayBlockingQueue q = populatedQueue(SIZE);
817 <        try {
818 <            q.drainTo(null);
819 <            shouldThrow();
820 <        } catch (NullPointerException success) {}
821 <    }
856 >        Queue x = populatedQueue(SIZE);
857 >        Queue y = serialClone(x);
858  
859 <    /**
860 <     * drainTo(this) throws IAE
861 <     */
862 <    public void testDrainToSelf() {
863 <        ArrayBlockingQueue q = populatedQueue(SIZE);
864 <        try {
865 <            q.drainTo(q);
866 <            shouldThrow();
867 <        } catch (IllegalArgumentException success) {}
859 >        assertNotSame(x, y);
860 >        assertEquals(x.size(), y.size());
861 >        assertEquals(x.toString(), y.toString());
862 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
863 >        while (!x.isEmpty()) {
864 >            assertFalse(y.isEmpty());
865 >            assertEquals(x.remove(), y.remove());
866 >        }
867 >        assertTrue(y.isEmpty());
868      }
869  
870      /**
# Line 838 | Line 874 | public class ArrayBlockingQueueTest exte
874          ArrayBlockingQueue q = populatedQueue(SIZE);
875          ArrayList l = new ArrayList();
876          q.drainTo(l);
877 <        assertEquals(q.size(), 0);
878 <        assertEquals(l.size(), SIZE);
877 >        assertEquals(0, q.size());
878 >        assertEquals(SIZE, l.size());
879          for (int i = 0; i < SIZE; ++i)
880              assertEquals(l.get(i), new Integer(i));
881          q.add(zero);
# Line 849 | Line 885 | public class ArrayBlockingQueueTest exte
885          assertTrue(q.contains(one));
886          l.clear();
887          q.drainTo(l);
888 <        assertEquals(q.size(), 0);
889 <        assertEquals(l.size(), 2);
888 >        assertEquals(0, q.size());
889 >        assertEquals(2, l.size());
890          for (int i = 0; i < 2; ++i)
891              assertEquals(l.get(i), new Integer(i));
892      }
# Line 862 | Line 898 | public class ArrayBlockingQueueTest exte
898          final ArrayBlockingQueue q = populatedQueue(SIZE);
899          Thread t = new Thread(new CheckedRunnable() {
900              public void realRun() throws InterruptedException {
901 <                q.put(new Integer(SIZE+1));
901 >                q.put(new Integer(SIZE + 1));
902              }});
903  
904          t.start();
# Line 876 | Line 912 | public class ArrayBlockingQueueTest exte
912      }
913  
914      /**
915 <     * drainTo(null, n) throws NPE
880 <     */
881 <    public void testDrainToNullN() {
882 <        ArrayBlockingQueue q = populatedQueue(SIZE);
883 <        try {
884 <            q.drainTo(null, 0);
885 <            shouldThrow();
886 <        } catch (NullPointerException success) {}
887 <    }
888 <
889 <    /**
890 <     * drainTo(this, n) throws IAE
891 <     */
892 <    public void testDrainToSelfN() {
893 <        ArrayBlockingQueue q = populatedQueue(SIZE);
894 <        try {
895 <            q.drainTo(q, 0);
896 <            shouldThrow();
897 <        } catch (IllegalArgumentException success) {}
898 <    }
899 <
900 <    /**
901 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
915 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
916       */
917      public void testDrainToN() {
918 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
918 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
919          for (int i = 0; i < SIZE + 2; ++i) {
920              for (int j = 0; j < SIZE; j++)
921                  assertTrue(q.offer(new Integer(j)));
922              ArrayList l = new ArrayList();
923              q.drainTo(l, i);
924 <            int k = (i < SIZE)? i : SIZE;
925 <            assertEquals(l.size(), k);
926 <            assertEquals(q.size(), SIZE-k);
924 >            int k = (i < SIZE) ? i : SIZE;
925 >            assertEquals(k, l.size());
926 >            assertEquals(SIZE - k, q.size());
927              for (int j = 0; j < k; ++j)
928                  assertEquals(l.get(j), new Integer(j));
929 <            while (q.poll() != null) ;
929 >            do {} while (q.poll() != null);
930          }
931      }
932  
933 +    /**
934 +     * remove(null), contains(null) always return false
935 +     */
936 +    public void testNeverContainsNull() {
937 +        Collection<?>[] qs = {
938 +            new ArrayBlockingQueue<Object>(10),
939 +            populatedQueue(2),
940 +        };
941 +
942 +        for (Collection<?> q : qs) {
943 +            assertFalse(q.contains(null));
944 +            assertFalse(q.remove(null));
945 +        }
946 +    }
947   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines