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.31 by dl, Wed Sep 29 12:33:48 2010 UTC vs.
Revision 1.88 by jsr166, Sun May 14 01:30:34 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines