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.76 by jsr166, Sun Nov 6 02:40:38 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.Iterator;
15 > import java.util.NoSuchElementException;
16 > import java.util.Queue;
17 > import java.util.concurrent.ArrayBlockingQueue;
18 > import java.util.concurrent.BlockingQueue;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.ThreadLocalRandom;
23 >
24 > import junit.framework.Test;
25  
26   public class ArrayBlockingQueueTest extends JSR166TestCase {
27 +
28      public static void main(String[] args) {
29 <        junit.textui.TestRunner.run (suite());
29 >        main(suite(), args);
30      }
31 +
32      public static Test suite() {
33 <        return new TestSuite(ArrayBlockingQueueTest.class);
33 >        class Implementation implements CollectionImplementation {
34 >            public Class<?> klazz() { return ArrayBlockingQueue.class; }
35 >            public Collection emptyCollection() {
36 >                boolean fair = ThreadLocalRandom.current().nextBoolean();
37 >                return populatedQueue(0, SIZE, 2 * SIZE, fair);
38 >            }
39 >            public Object makeElement(int i) { return i; }
40 >            public boolean isConcurrent() { return true; }
41 >            public boolean permitsNulls() { return false; }
42 >        }
43 >
44 >        return newTestSuite(
45 >            ArrayBlockingQueueTest.class,
46 >            new Fair().testSuite(),
47 >            new NonFair().testSuite(),
48 >            CollectionTest.testSuite(new Implementation()));
49 >    }
50 >
51 >    public static class Fair extends BlockingQueueTest {
52 >        protected BlockingQueue emptyCollection() {
53 >            return populatedQueue(0, SIZE, 2 * SIZE, true);
54 >        }
55 >    }
56 >
57 >    public static class NonFair extends BlockingQueueTest {
58 >        protected BlockingQueue emptyCollection() {
59 >            return populatedQueue(0, SIZE, 2 * SIZE, false);
60 >        }
61 >    }
62 >
63 >    /**
64 >     * Returns a new queue of given size containing consecutive
65 >     * Integers 0 ... n - 1.
66 >     */
67 >    static ArrayBlockingQueue<Integer> populatedQueue(int n) {
68 >        return populatedQueue(n, n, n, false);
69      }
70  
71      /**
72 <     * Create a queue of given size containing consecutive
73 <     * Integers 0 ... n.
72 >     * Returns a new queue of given size containing consecutive
73 >     * Integers 0 ... n - 1, with given capacity range and fairness.
74       */
75 <    private ArrayBlockingQueue populatedQueue(int n) {
76 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
75 >    static ArrayBlockingQueue<Integer> populatedQueue(
76 >        int size, int minCapacity, int maxCapacity, boolean fair) {
77 >        ThreadLocalRandom rnd = ThreadLocalRandom.current();
78 >        int capacity = rnd.nextInt(minCapacity, maxCapacity + 1);
79 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
80          assertTrue(q.isEmpty());
81 <        for (int i = 0; i < n; i++)
82 <            assertTrue(q.offer(new Integer(i)));
83 <        assertFalse(q.isEmpty());
84 <        assertEquals(0, q.remainingCapacity());
85 <        assertEquals(n, q.size());
81 >        // shuffle circular array elements so they wrap
82 >        {
83 >            int n = rnd.nextInt(capacity);
84 >            for (int i = 0; i < n; i++) q.add(42);
85 >            for (int i = 0; i < n; i++) q.remove();
86 >        }
87 >        for (int i = 0; i < size; i++)
88 >            assertTrue(q.offer((Integer) i));
89 >        assertEquals(size == 0, q.isEmpty());
90 >        assertEquals(capacity - size, q.remainingCapacity());
91 >        assertEquals(size, q.size());
92 >        if (size > 0)
93 >            assertEquals((Integer) 0, q.peek());
94          return q;
95      }
96  
# Line 48 | Line 106 | public class ArrayBlockingQueueTest exte
106       */
107      public void testConstructor2() {
108          try {
109 <            ArrayBlockingQueue q = new ArrayBlockingQueue(0);
109 >            new ArrayBlockingQueue(0);
110              shouldThrow();
111          } catch (IllegalArgumentException success) {}
112      }
# Line 58 | Line 116 | public class ArrayBlockingQueueTest exte
116       */
117      public void testConstructor3() {
118          try {
119 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
119 >            new ArrayBlockingQueue(1, true, null);
120              shouldThrow();
121          } catch (NullPointerException success) {}
122      }
# Line 67 | Line 125 | public class ArrayBlockingQueueTest exte
125       * Initializing from Collection of null elements throws NPE
126       */
127      public void testConstructor4() {
128 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
129          try {
130 <            Integer[] ints = new Integer[SIZE];
72 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
130 >            new ArrayBlockingQueue(SIZE, false, elements);
131              shouldThrow();
132          } catch (NullPointerException success) {}
133      }
# Line 78 | Line 136 | public class ArrayBlockingQueueTest exte
136       * Initializing from Collection with some null elements throws NPE
137       */
138      public void testConstructor5() {
139 +        Integer[] ints = new Integer[SIZE];
140 +        for (int i = 0; i < SIZE - 1; ++i)
141 +            ints[i] = i;
142 +        Collection<Integer> elements = Arrays.asList(ints);
143          try {
144 <            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));
144 >            new ArrayBlockingQueue(SIZE, false, elements);
145              shouldThrow();
146          } catch (NullPointerException success) {}
147      }
# Line 91 | Line 150 | public class ArrayBlockingQueueTest exte
150       * Initializing from too large collection throws IAE
151       */
152      public void testConstructor6() {
153 +        Integer[] ints = new Integer[SIZE];
154 +        for (int i = 0; i < SIZE; ++i)
155 +            ints[i] = i;
156 +        Collection<Integer> elements = Arrays.asList(ints);
157          try {
158 <            Integer[] ints = new Integer[SIZE];
96 <            for (int i = 0; i < SIZE; ++i)
97 <                ints[i] = new Integer(i);
98 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
158 >            new ArrayBlockingQueue(SIZE - 1, false, elements);
159              shouldThrow();
160          } catch (IllegalArgumentException success) {}
161      }
# Line 106 | Line 166 | public class ArrayBlockingQueueTest exte
166      public void testConstructor7() {
167          Integer[] ints = new Integer[SIZE];
168          for (int i = 0; i < SIZE; ++i)
169 <            ints[i] = new Integer(i);
170 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
169 >            ints[i] = i;
170 >        Collection<Integer> elements = Arrays.asList(ints);
171 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
172          for (int i = 0; i < SIZE; ++i)
173              assertEquals(ints[i], q.poll());
174      }
# Line 131 | Line 192 | public class ArrayBlockingQueueTest exte
192       * remainingCapacity decreases on add, increases on remove
193       */
194      public void testRemainingCapacity() {
195 <        ArrayBlockingQueue q = populatedQueue(SIZE);
195 >        BlockingQueue q = populatedQueue(SIZE);
196          for (int i = 0; i < SIZE; ++i) {
197              assertEquals(i, q.remainingCapacity());
198 <            assertEquals(SIZE-i, q.size());
199 <            q.remove();
198 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
199 >            assertEquals(i, q.remove());
200          }
201          for (int i = 0; i < SIZE; ++i) {
202 <            assertEquals(SIZE-i, q.remainingCapacity());
203 <            assertEquals(i, q.size());
204 <            q.add(new Integer(i));
202 >            assertEquals(SIZE - i, q.remainingCapacity());
203 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
204 >            assertTrue(q.add(i));
205          }
206      }
207  
208      /**
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    /**
209       * Offer succeeds if not full; fails if full
210       */
211      public void testOffer() {
# Line 179 | Line 218 | public class ArrayBlockingQueueTest exte
218       * add succeeds if not full; throws ISE if full
219       */
220      public void testAdd() {
221 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
222 +        for (int i = 0; i < SIZE; ++i) {
223 +            assertTrue(q.add(new Integer(i)));
224 +        }
225 +        assertEquals(0, q.remainingCapacity());
226          try {
183            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());
227              q.add(new Integer(SIZE));
228              shouldThrow();
229          } catch (IllegalStateException success) {}
230      }
231  
232      /**
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    /**
233       * addAll(this) throws IAE
234       */
235      public void testAddAllSelf() {
236 +        ArrayBlockingQueue q = populatedQueue(SIZE);
237          try {
209            ArrayBlockingQueue q = populatedQueue(SIZE);
238              q.addAll(q);
239              shouldThrow();
240          } catch (IllegalArgumentException success) {}
241      }
242  
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    }
243      /**
244       * addAll of a collection with any null elements throws NPE after
245       * possibly adding some elements
246       */
247      public void testAddAll3() {
248 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
249 +        Integer[] ints = new Integer[SIZE];
250 +        for (int i = 0; i < SIZE - 1; ++i)
251 +            ints[i] = new Integer(i);
252          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);
253              q.addAll(Arrays.asList(ints));
254              shouldThrow();
255          } catch (NullPointerException success) {}
256      }
257 +
258      /**
259       * addAll throws ISE if not enough room
260       */
261      public void testAddAll4() {
262 +        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
263 +        Integer[] ints = new Integer[SIZE];
264 +        for (int i = 0; i < SIZE; ++i)
265 +            ints[i] = new Integer(i);
266          try {
246            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
247            Integer[] ints = new Integer[SIZE];
248            for (int i = 0; i < SIZE; ++i)
249                ints[i] = new Integer(i);
267              q.addAll(Arrays.asList(ints));
268              shouldThrow();
269          } catch (IllegalStateException success) {}
270      }
271 +
272      /**
273       * Queue contains all elements, in traversal order, of successful addAll
274       */
# Line 267 | Line 285 | public class ArrayBlockingQueueTest exte
285      }
286  
287      /**
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    /**
288       * all elements successfully put are contained
289       */
290      public void testPut() throws InterruptedException {
291          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
292          for (int i = 0; i < SIZE; ++i) {
293 <            Integer I = new Integer(i);
294 <            q.put(I);
295 <            assertTrue(q.contains(I));
293 >            Integer x = new Integer(i);
294 >            q.put(x);
295 >            assertTrue(q.contains(x));
296          }
297          assertEquals(0, q.remainingCapacity());
298      }
# Line 295 | Line 302 | public class ArrayBlockingQueueTest exte
302       */
303      public void testBlockingPut() throws InterruptedException {
304          final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
305 <        Thread t = new Thread(new CheckedRunnable() {
306 <            public void realRun() {
307 <                int added = 0;
305 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
306 >        Thread t = newStartedThread(new CheckedRunnable() {
307 >            public void realRun() throws InterruptedException {
308 >                for (int i = 0; i < SIZE; ++i)
309 >                    q.put(i);
310 >                assertEquals(SIZE, q.size());
311 >                assertEquals(0, q.remainingCapacity());
312 >
313 >                Thread.currentThread().interrupt();
314                  try {
315 <                    for (int i = 0; i < SIZE; ++i) {
316 <                        q.put(new Integer(i));
317 <                        ++added;
318 <                    }
306 <                    q.put(new Integer(SIZE));
307 <                    threadShouldThrow();
308 <                } catch (InterruptedException success) {
309 <                    threadAssertEquals(added, SIZE);
310 <                }}});
315 >                    q.put(99);
316 >                    shouldThrow();
317 >                } catch (InterruptedException success) {}
318 >                assertFalse(Thread.interrupted());
319  
320 <        t.start();
321 <        Thread.sleep(MEDIUM_DELAY_MS);
320 >                pleaseInterrupt.countDown();
321 >                try {
322 >                    q.put(99);
323 >                    shouldThrow();
324 >                } catch (InterruptedException success) {}
325 >                assertFalse(Thread.interrupted());
326 >            }});
327 >
328 >        await(pleaseInterrupt);
329 >        assertThreadStaysAlive(t);
330          t.interrupt();
331 <        t.join();
331 >        awaitTermination(t);
332 >        assertEquals(SIZE, q.size());
333 >        assertEquals(0, q.remainingCapacity());
334      }
335  
336      /**
337 <     * put blocks waiting for take when full
337 >     * put blocks interruptibly waiting for take when full
338       */
339      public void testPutWithTake() throws InterruptedException {
340 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
341 <        Thread t = new Thread(new CheckedRunnable() {
342 <            public void realRun() {
343 <                int added = 0;
340 >        final int capacity = 2;
341 >        final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
342 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
343 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344 >        Thread t = newStartedThread(new CheckedRunnable() {
345 >            public void realRun() throws InterruptedException {
346 >                for (int i = 0; i < capacity; i++)
347 >                    q.put(i);
348 >                pleaseTake.countDown();
349 >                q.put(86);
350 >
351 >                pleaseInterrupt.countDown();
352                  try {
353 <                    q.put(new Object());
354 <                    ++added;
355 <                    q.put(new Object());
356 <                    ++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 <                }
353 >                    q.put(99);
354 >                    shouldThrow();
355 >                } catch (InterruptedException success) {}
356 >                assertFalse(Thread.interrupted());
357              }});
358  
359 <        t.start();
360 <        Thread.sleep(SHORT_DELAY_MS);
361 <        q.take();
359 >        await(pleaseTake);
360 >        assertEquals(0, q.remainingCapacity());
361 >        assertEquals(0, q.take());
362 >
363 >        await(pleaseInterrupt);
364 >        assertThreadStaysAlive(t);
365          t.interrupt();
366 <        t.join();
366 >        awaitTermination(t);
367 >        assertEquals(0, q.remainingCapacity());
368      }
369  
370      /**
# Line 350 | Line 372 | public class ArrayBlockingQueueTest exte
372       */
373      public void testTimedOffer() throws InterruptedException {
374          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
375 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
375 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
376 >        Thread t = newStartedThread(new CheckedRunnable() {
377              public void realRun() throws InterruptedException {
378                  q.put(new Object());
379                  q.put(new Object());
380 <                threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
381 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
382 <            }};
380 >                long startTime = System.nanoTime();
381 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
382 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
383 >                pleaseInterrupt.countDown();
384 >                try {
385 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
386 >                    shouldThrow();
387 >                } catch (InterruptedException success) {}
388 >            }});
389  
390 <        t.start();
391 <        Thread.sleep(SHORT_DELAY_MS);
390 >        await(pleaseInterrupt);
391 >        assertThreadStaysAlive(t);
392          t.interrupt();
393 <        t.join();
393 >        awaitTermination(t);
394      }
395  
396      /**
# Line 370 | Line 399 | public class ArrayBlockingQueueTest exte
399      public void testTake() throws InterruptedException {
400          ArrayBlockingQueue q = populatedQueue(SIZE);
401          for (int i = 0; i < SIZE; ++i) {
402 <            assertEquals(i, ((Integer)q.take()).intValue());
402 >            assertEquals(i, q.take());
403          }
404      }
405  
406      /**
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    /**
407       * Take removes existing elements until empty, then blocks interruptibly
408       */
409      public void testBlockingTake() throws InterruptedException {
410 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
410 >        final ArrayBlockingQueue q = populatedQueue(SIZE);
411 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
412 >        Thread t = newStartedThread(new CheckedRunnable() {
413              public void realRun() throws InterruptedException {
399                ArrayBlockingQueue q = populatedQueue(SIZE);
414                  for (int i = 0; i < SIZE; ++i) {
415 <                    threadAssertEquals(i, ((Integer)q.take()).intValue());
415 >                    assertEquals(i, q.take());
416                  }
403                q.take();
404            }};
417  
418 <        t.start();
419 <            Thread.sleep(SHORT_DELAY_MS);
420 <            t.interrupt();
421 <            t.join();
422 <    }
418 >                Thread.currentThread().interrupt();
419 >                try {
420 >                    q.take();
421 >                    shouldThrow();
422 >                } catch (InterruptedException success) {}
423 >                assertFalse(Thread.interrupted());
424 >
425 >                pleaseInterrupt.countDown();
426 >                try {
427 >                    q.take();
428 >                    shouldThrow();
429 >                } catch (InterruptedException success) {}
430 >                assertFalse(Thread.interrupted());
431 >            }});
432  
433 +        await(pleaseInterrupt);
434 +        assertThreadStaysAlive(t);
435 +        t.interrupt();
436 +        awaitTermination(t);
437 +    }
438  
439      /**
440       * poll succeeds unless empty
# Line 416 | Line 442 | public class ArrayBlockingQueueTest exte
442      public void testPoll() {
443          ArrayBlockingQueue q = populatedQueue(SIZE);
444          for (int i = 0; i < SIZE; ++i) {
445 <            assertEquals(i, ((Integer)q.poll()).intValue());
445 >            assertEquals(i, q.poll());
446          }
447          assertNull(q.poll());
448      }
449  
450      /**
451 <     * timed pool with zero timeout succeeds when non-empty, else times out
451 >     * timed poll with zero timeout succeeds when non-empty, else times out
452       */
453      public void testTimedPoll0() throws InterruptedException {
454          ArrayBlockingQueue q = populatedQueue(SIZE);
455          for (int i = 0; i < SIZE; ++i) {
456 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
456 >            assertEquals(i, q.poll(0, MILLISECONDS));
457          }
458          assertNull(q.poll(0, MILLISECONDS));
459 +        checkEmpty(q);
460      }
461  
462      /**
463 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
463 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
464       */
465      public void testTimedPoll() throws InterruptedException {
466          ArrayBlockingQueue q = populatedQueue(SIZE);
467          for (int i = 0; i < SIZE; ++i) {
468 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
469 <        }
470 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
468 >            long startTime = System.nanoTime();
469 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
470 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
471 >        }
472 >        long startTime = System.nanoTime();
473 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
474 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
475 >        checkEmpty(q);
476      }
477  
478      /**
# Line 448 | Line 480 | public class ArrayBlockingQueueTest exte
480       * returning timeout status
481       */
482      public void testInterruptedTimedPoll() throws InterruptedException {
483 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
483 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
484 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
485 >        Thread t = newStartedThread(new CheckedRunnable() {
486              public void realRun() throws InterruptedException {
487 <                ArrayBlockingQueue q = populatedQueue(SIZE);
487 >                long startTime = System.nanoTime();
488                  for (int i = 0; i < SIZE; ++i) {
489 <                    threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
489 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
490                  }
491 <                q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
492 <            }};
493 <
494 <        t.start();
495 <        Thread.sleep(SMALL_DELAY_MS);
496 <        t.interrupt();
497 <        t.join();
498 <    }
465 <
466 <    /**
467 <     *  timed poll before a delayed offer fails; after offer succeeds;
468 <     *  on interruption throws
469 <     */
470 <    public void testTimedPollWithOffer() throws InterruptedException {
471 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
472 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
473 <            public void realRun() throws InterruptedException {
474 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
475 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
476 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
477 <            }};
491 >                aboutToWait.countDown();
492 >                try {
493 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
494 >                    shouldThrow();
495 >                } catch (InterruptedException success) {
496 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
497 >                }
498 >            }});
499  
500 <        t.start();
501 <        Thread.sleep(SMALL_DELAY_MS);
481 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
500 >        await(aboutToWait);
501 >        waitForThreadToEnterWaitState(t);
502          t.interrupt();
503 <        t.join();
503 >        awaitTermination(t);
504 >        checkEmpty(q);
505      }
506  
486
507      /**
508       * peek returns next element, or null if empty
509       */
510      public void testPeek() {
511          ArrayBlockingQueue q = populatedQueue(SIZE);
512          for (int i = 0; i < SIZE; ++i) {
513 <            assertEquals(i, ((Integer)q.peek()).intValue());
514 <            q.poll();
513 >            assertEquals(i, q.peek());
514 >            assertEquals(i, q.poll());
515              assertTrue(q.peek() == null ||
516 <                       i != ((Integer)q.peek()).intValue());
516 >                       !q.peek().equals(i));
517          }
518          assertNull(q.peek());
519      }
# Line 504 | Line 524 | public class ArrayBlockingQueueTest exte
524      public void testElement() {
525          ArrayBlockingQueue q = populatedQueue(SIZE);
526          for (int i = 0; i < SIZE; ++i) {
527 <            assertEquals(i, ((Integer)q.element()).intValue());
528 <            q.poll();
527 >            assertEquals(i, q.element());
528 >            assertEquals(i, q.poll());
529          }
530          try {
531              q.element();
# Line 519 | Line 539 | public class ArrayBlockingQueueTest exte
539      public void testRemove() {
540          ArrayBlockingQueue q = populatedQueue(SIZE);
541          for (int i = 0; i < SIZE; ++i) {
542 <            assertEquals(i, ((Integer)q.remove()).intValue());
542 >            assertEquals(i, q.remove());
543          }
544          try {
545              q.remove();
# Line 528 | Line 548 | public class ArrayBlockingQueueTest exte
548      }
549  
550      /**
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    /**
551       * contains(x) reports true when elements added but not yet removed
552       */
553      public void testContains() {
554          ArrayBlockingQueue q = populatedQueue(SIZE);
555          for (int i = 0; i < SIZE; ++i) {
556              assertTrue(q.contains(new Integer(i)));
557 <            q.poll();
557 >            assertEquals(i, q.poll());
558              assertFalse(q.contains(new Integer(i)));
559          }
560      }
# Line 598 | Line 603 | public class ArrayBlockingQueueTest exte
603                  assertTrue(changed);
604  
605              assertTrue(q.containsAll(p));
606 <            assertEquals(SIZE-i, q.size());
606 >            assertEquals(SIZE - i, q.size());
607              p.remove();
608          }
609      }
# Line 611 | Line 616 | public class ArrayBlockingQueueTest exte
616              ArrayBlockingQueue q = populatedQueue(SIZE);
617              ArrayBlockingQueue p = populatedQueue(i);
618              assertTrue(q.removeAll(p));
619 <            assertEquals(SIZE-i, q.size());
619 >            assertEquals(SIZE - i, q.size());
620              for (int j = 0; j < i; ++j) {
621 <                Integer I = (Integer)(p.remove());
622 <                assertFalse(q.contains(I));
621 >                Integer x = (Integer)(p.remove());
622 >                assertFalse(q.contains(x));
623              }
624          }
625      }
626  
627 <    /**
628 <     *  toArray contains all elements
629 <     */
630 <    public void testToArray() throws InterruptedException {
631 <        ArrayBlockingQueue q = populatedQueue(SIZE);
632 <        Object[] o = q.toArray();
633 <        for (int i = 0; i < o.length; i++)
634 <            assertEquals(o[i], q.take());
627 >    void checkToArray(ArrayBlockingQueue<Integer> q) {
628 >        int size = q.size();
629 >        Object[] a1 = q.toArray();
630 >        assertEquals(size, a1.length);
631 >        Integer[] a2 = q.toArray(new Integer[0]);
632 >        assertEquals(size, a2.length);
633 >        Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
634 >        assertEquals(size, a3.length);
635 >        Integer[] a4 = new Integer[size];
636 >        assertSame(a4, q.toArray(a4));
637 >        Integer[] a5 = new Integer[size + 1];
638 >        Arrays.fill(a5, 42);
639 >        assertSame(a5, q.toArray(a5));
640 >        Integer[] a6 = new Integer[size + 2];
641 >        Arrays.fill(a6, 42);
642 >        assertSame(a6, q.toArray(a6));
643 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
644 >        for (Object[] a : as) {
645 >            if (a.length > size) assertNull(a[size]);
646 >            if (a.length > size + 1) assertEquals(42, a[size + 1]);
647 >        }
648 >        Iterator it = q.iterator();
649 >        Integer s = q.peek();
650 >        for (int i = 0; i < size; i++) {
651 >            Integer x = (Integer) it.next();
652 >            assertEquals(s + i, (int) x);
653 >            for (Object[] a : as)
654 >                assertSame(a1[i], x);
655 >        }
656      }
657  
658      /**
659 <     * toArray(a) contains all elements
659 >     * toArray() and toArray(a) contain all elements in FIFO order
660       */
661 <    public void testToArray2() throws InterruptedException {
662 <        ArrayBlockingQueue q = populatedQueue(SIZE);
663 <        Integer[] ints = new Integer[SIZE];
664 <        ints = (Integer[])q.toArray(ints);
665 <        for (int i = 0; i < ints.length; i++)
666 <            assertEquals(ints[i], q.take());
661 >    public void testToArray() {
662 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
663 >        final int size = rnd.nextInt(6);
664 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
665 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
666 >        for (int i = 0; i < size; i++) {
667 >            checkToArray(q);
668 >            q.add(i);
669 >        }
670 >        // Provoke wraparound
671 >        int added = size * 2;
672 >        for (int i = 0; i < added; i++) {
673 >            checkToArray(q);
674 >            assertEquals((Integer) i, q.poll());
675 >            q.add(size + i);
676 >        }
677 >        for (int i = 0; i < size; i++) {
678 >            checkToArray(q);
679 >            assertEquals((Integer) (added + i), q.poll());
680 >        }
681      }
682  
683      /**
684 <     * toArray(null) throws NPE
684 >     * toArray(incompatible array type) throws ArrayStoreException
685       */
686 <    public void testToArray_BadArg() {
686 >    public void testToArray_incompatibleArrayType() {
687 >        ArrayBlockingQueue q = populatedQueue(SIZE);
688          try {
689 <            ArrayBlockingQueue q = populatedQueue(SIZE);
649 <            Object o[] = q.toArray(null);
689 >            q.toArray(new String[10]);
690              shouldThrow();
691 <        } catch (NullPointerException success) {}
652 <    }
653 <
654 <    /**
655 <     * toArray with incompatible array type throws CCE
656 <     */
657 <    public void testToArray1_BadArg() {
691 >        } catch (ArrayStoreException success) {}
692          try {
693 <            ArrayBlockingQueue q = populatedQueue(SIZE);
660 <            Object o[] = q.toArray(new String[10] );
693 >            q.toArray(new String[0]);
694              shouldThrow();
695          } catch (ArrayStoreException success) {}
696      }
697  
665
698      /**
699       * iterator iterates through all elements
700       */
701      public void testIterator() throws InterruptedException {
702          ArrayBlockingQueue q = populatedQueue(SIZE);
703          Iterator it = q.iterator();
704 <        while (it.hasNext()) {
704 >        int i;
705 >        for (i = 0; it.hasNext(); i++)
706 >            assertTrue(q.contains(it.next()));
707 >        assertEquals(i, SIZE);
708 >        assertIteratorExhausted(it);
709 >
710 >        it = q.iterator();
711 >        for (i = 0; it.hasNext(); i++)
712              assertEquals(it.next(), q.take());
713 <        }
713 >        assertEquals(i, SIZE);
714 >        assertIteratorExhausted(it);
715 >    }
716 >
717 >    /**
718 >     * iterator of empty collection has no elements
719 >     */
720 >    public void testEmptyIterator() {
721 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
722      }
723  
724      /**
725       * iterator.remove removes current element
726       */
727 <    public void testIteratorRemove () {
727 >    public void testIteratorRemove() {
728          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
729          q.add(two);
730          q.add(one);
# Line 688 | Line 735 | public class ArrayBlockingQueueTest exte
735          it.remove();
736  
737          it = q.iterator();
738 <        assertEquals(it.next(), one);
739 <        assertEquals(it.next(), three);
738 >        assertSame(it.next(), one);
739 >        assertSame(it.next(), three);
740          assertFalse(it.hasNext());
741      }
742  
# Line 706 | Line 753 | public class ArrayBlockingQueueTest exte
753  
754          int k = 0;
755          for (Iterator it = q.iterator(); it.hasNext();) {
756 <            int i = ((Integer)(it.next())).intValue();
710 <            assertEquals(++k, i);
756 >            assertEquals(++k, it.next());
757          }
758          assertEquals(3, k);
759      }
# Line 715 | Line 761 | public class ArrayBlockingQueueTest exte
761      /**
762       * Modifications do not cause iterators to fail
763       */
764 <    public void testWeaklyConsistentIteration () {
764 >    public void testWeaklyConsistentIteration() {
765          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
766          q.add(one);
767          q.add(two);
# Line 727 | Line 773 | public class ArrayBlockingQueueTest exte
773          assertEquals(0, q.size());
774      }
775  
730
776      /**
777       * toString contains toStrings of elements
778       */
# Line 735 | Line 780 | public class ArrayBlockingQueueTest exte
780          ArrayBlockingQueue q = populatedQueue(SIZE);
781          String s = q.toString();
782          for (int i = 0; i < SIZE; ++i) {
783 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
783 >            assertTrue(s.contains(String.valueOf(i)));
784          }
785      }
786  
742
787      /**
788       * offer transfers elements across Executor tasks
789       */
# Line 747 | Line 791 | public class ArrayBlockingQueueTest exte
791          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
792          q.add(one);
793          q.add(two);
794 <        ExecutorService executor = Executors.newFixedThreadPool(2);
795 <        executor.execute(new CheckedRunnable() {
796 <            public void realRun() throws InterruptedException {
797 <                threadAssertFalse(q.offer(three));
798 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
799 <                threadAssertEquals(0, q.remainingCapacity());
800 <            }});
801 <
802 <        executor.execute(new CheckedRunnable() {
803 <            public void realRun() throws InterruptedException {
804 <                Thread.sleep(SMALL_DELAY_MS);
805 <                threadAssertEquals(one, q.take());
806 <            }});
807 <
808 <        joinPool(executor);
809 <
794 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
795 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
796 >        try (PoolCleaner cleaner = cleaner(executor)) {
797 >            executor.execute(new CheckedRunnable() {
798 >                public void realRun() throws InterruptedException {
799 >                    assertFalse(q.offer(three));
800 >                    threadsStarted.await();
801 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
802 >                    assertEquals(0, q.remainingCapacity());
803 >                }});
804 >
805 >            executor.execute(new CheckedRunnable() {
806 >                public void realRun() throws InterruptedException {
807 >                    threadsStarted.await();
808 >                    assertEquals(0, q.remainingCapacity());
809 >                    assertSame(one, q.take());
810 >                }});
811 >        }
812      }
813  
814      /**
815 <     * poll retrieves elements across Executor threads
815 >     * timed poll retrieves elements across Executor threads
816       */
817      public void testPollInExecutor() {
818          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
819 <        ExecutorService executor = Executors.newFixedThreadPool(2);
820 <        executor.execute(new CheckedRunnable() {
821 <            public void realRun() throws InterruptedException {
822 <                threadAssertNull(q.poll());
823 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
824 <                threadAssertTrue(q.isEmpty());
825 <            }});
826 <
827 <        executor.execute(new CheckedRunnable() {
828 <            public void realRun() throws InterruptedException {
829 <                Thread.sleep(SMALL_DELAY_MS);
830 <                q.put(one);
831 <            }});
832 <
833 <        joinPool(executor);
819 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
820 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
821 >        try (PoolCleaner cleaner = cleaner(executor)) {
822 >            executor.execute(new CheckedRunnable() {
823 >                public void realRun() throws InterruptedException {
824 >                    assertNull(q.poll());
825 >                    threadsStarted.await();
826 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
827 >                    checkEmpty(q);
828 >                }});
829 >
830 >            executor.execute(new CheckedRunnable() {
831 >                public void realRun() throws InterruptedException {
832 >                    threadsStarted.await();
833 >                    q.put(one);
834 >                }});
835 >        }
836      }
837  
838      /**
839       * A deserialized serialized queue has same elements in same order
840       */
841      public void testSerialization() throws Exception {
842 <        ArrayBlockingQueue q = populatedQueue(SIZE);
843 <
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 <    }
842 >        Queue x = populatedQueue(SIZE);
843 >        Queue y = serialClone(x);
844  
845 <    /**
846 <     * drainTo(this) throws IAE
847 <     */
848 <    public void testDrainToSelf() {
849 <        ArrayBlockingQueue q = populatedQueue(SIZE);
850 <        try {
851 <            q.drainTo(q);
852 <            shouldThrow();
853 <        } catch (IllegalArgumentException success) {}
845 >        assertNotSame(x, y);
846 >        assertEquals(x.size(), y.size());
847 >        assertEquals(x.toString(), y.toString());
848 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
849 >        while (!x.isEmpty()) {
850 >            assertFalse(y.isEmpty());
851 >            assertEquals(x.remove(), y.remove());
852 >        }
853 >        assertTrue(y.isEmpty());
854      }
855  
856      /**
# Line 835 | Line 860 | public class ArrayBlockingQueueTest exte
860          ArrayBlockingQueue q = populatedQueue(SIZE);
861          ArrayList l = new ArrayList();
862          q.drainTo(l);
863 <        assertEquals(q.size(), 0);
864 <        assertEquals(l.size(), SIZE);
863 >        assertEquals(0, q.size());
864 >        assertEquals(SIZE, l.size());
865          for (int i = 0; i < SIZE; ++i)
866              assertEquals(l.get(i), new Integer(i));
867          q.add(zero);
# Line 846 | Line 871 | public class ArrayBlockingQueueTest exte
871          assertTrue(q.contains(one));
872          l.clear();
873          q.drainTo(l);
874 <        assertEquals(q.size(), 0);
875 <        assertEquals(l.size(), 2);
874 >        assertEquals(0, q.size());
875 >        assertEquals(2, l.size());
876          for (int i = 0; i < 2; ++i)
877              assertEquals(l.get(i), new Integer(i));
878      }
# Line 859 | Line 884 | public class ArrayBlockingQueueTest exte
884          final ArrayBlockingQueue q = populatedQueue(SIZE);
885          Thread t = new Thread(new CheckedRunnable() {
886              public void realRun() throws InterruptedException {
887 <                q.put(new Integer(SIZE+1));
887 >                q.put(new Integer(SIZE + 1));
888              }});
889  
890          t.start();
# Line 873 | Line 898 | public class ArrayBlockingQueueTest exte
898      }
899  
900      /**
901 <     * 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
901 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
902       */
903      public void testDrainToN() {
904 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
904 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
905          for (int i = 0; i < SIZE + 2; ++i) {
906              for (int j = 0; j < SIZE; j++)
907                  assertTrue(q.offer(new Integer(j)));
908              ArrayList l = new ArrayList();
909              q.drainTo(l, i);
910 <            int k = (i < SIZE)? i : SIZE;
911 <            assertEquals(l.size(), k);
912 <            assertEquals(q.size(), SIZE-k);
910 >            int k = (i < SIZE) ? i : SIZE;
911 >            assertEquals(k, l.size());
912 >            assertEquals(SIZE - k, q.size());
913              for (int j = 0; j < k; ++j)
914                  assertEquals(l.get(j), new Integer(j));
915 <            while (q.poll() != null) ;
915 >            do {} while (q.poll() != null);
916          }
917      }
918  
919 +    /**
920 +     * remove(null), contains(null) always return false
921 +     */
922 +    public void testNeverContainsNull() {
923 +        Collection<?>[] qs = {
924 +            new ArrayBlockingQueue<Object>(10),
925 +            populatedQueue(2),
926 +        };
927 +
928 +        for (Collection<?> q : qs) {
929 +            assertFalse(q.contains(null));
930 +            assertFalse(q.remove(null));
931 +        }
932 +    }
933   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines