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.89 by jsr166, Sun May 14 04:02:06 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 <     * Create a queue of given size containing consecutive
66 <     * Integers 0 ... n.
65 >     * Returns a new queue of given size containing consecutive
66 >     * Integers 0 ... n - 1.
67       */
68 <    private ArrayBlockingQueue populatedQueue(int n) {
69 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
68 >    static ArrayBlockingQueue<Integer> populatedQueue(int n) {
69 >        return populatedQueue(n, n, n, false);
70 >    }
71 >
72 >    /**
73 >     * Returns a new queue of given size containing consecutive
74 >     * Integers 0 ... n - 1, with given capacity range and fairness.
75 >     */
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 +                Thread.currentThread().interrupt();
366 +                try {
367 +                    q.put(99);
368 +                    shouldThrow();
369 +                } catch (InterruptedException success) {}
370 +                assertFalse(Thread.interrupted());
371 +
372 +                pleaseInterrupt.countDown();
373                  try {
374                      q.put(99);
375                      shouldThrow();
376                  } catch (InterruptedException success) {}
377 +                assertFalse(Thread.interrupted());
378              }});
379  
380 <        t.start();
381 <        Thread.sleep(SHORT_DELAY_MS);
339 <        assertEquals(q.remainingCapacity(), 0);
380 >        await(pleaseTake);
381 >        assertEquals(0, q.remainingCapacity());
382          assertEquals(0, q.take());
383 <        Thread.sleep(SHORT_DELAY_MS);
383 >
384 >        await(pleaseInterrupt);
385 >        assertThreadBlocks(t, Thread.State.WAITING);
386          t.interrupt();
387 <        t.join();
388 <        assertEquals(q.remainingCapacity(), 0);
387 >        awaitTermination(t);
388 >        assertEquals(0, q.remainingCapacity());
389      }
390  
391      /**
# Line 349 | Line 393 | public class ArrayBlockingQueueTest exte
393       */
394      public void testTimedOffer() throws InterruptedException {
395          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
396 <        Thread t = new Thread(new CheckedRunnable() {
396 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
397 >        Thread t = newStartedThread(new CheckedRunnable() {
398              public void realRun() throws InterruptedException {
399                  q.put(new Object());
400                  q.put(new Object());
401 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
401 >                long startTime = System.nanoTime();
402 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
403 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
404 >                pleaseInterrupt.countDown();
405                  try {
406 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
406 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
407                      shouldThrow();
408                  } catch (InterruptedException success) {}
409 +                assertFalse(Thread.interrupted());
410              }});
411  
412 <        t.start();
413 <        Thread.sleep(SHORT_DELAY_MS);
412 >        await(pleaseInterrupt);
413 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
414          t.interrupt();
415 <        t.join();
415 >        awaitTermination(t);
416      }
417  
418      /**
# Line 377 | Line 426 | public class ArrayBlockingQueueTest exte
426      }
427  
428      /**
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    /**
429       * Take removes existing elements until empty, then blocks interruptibly
430       */
431      public void testBlockingTake() throws InterruptedException {
432          final ArrayBlockingQueue q = populatedQueue(SIZE);
433 <        Thread t = new Thread(new CheckedRunnable() {
433 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
434 >        Thread t = newStartedThread(new CheckedRunnable() {
435              public void realRun() throws InterruptedException {
436 <                for (int i = 0; i < SIZE; ++i) {
437 <                    assertEquals(i, q.take());
438 <                }
436 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
437 >
438 >                Thread.currentThread().interrupt();
439                  try {
440                      q.take();
441                      shouldThrow();
442                  } catch (InterruptedException success) {}
443 +                assertFalse(Thread.interrupted());
444 +
445 +                pleaseInterrupt.countDown();
446 +                try {
447 +                    q.take();
448 +                    shouldThrow();
449 +                } catch (InterruptedException success) {}
450 +                assertFalse(Thread.interrupted());
451              }});
452  
453 <        t.start();
454 <        Thread.sleep(SHORT_DELAY_MS);
453 >        await(pleaseInterrupt);
454 >        assertThreadBlocks(t, Thread.State.WAITING);
455          t.interrupt();
456 <        t.join();
456 >        awaitTermination(t);
457      }
458  
417
459      /**
460       * poll succeeds unless empty
461       */
# Line 427 | Line 468 | public class ArrayBlockingQueueTest exte
468      }
469  
470      /**
471 <     * timed pool with zero timeout succeeds when non-empty, else times out
471 >     * timed poll with zero timeout succeeds when non-empty, else times out
472       */
473      public void testTimedPoll0() throws InterruptedException {
474          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 435 | Line 476 | public class ArrayBlockingQueueTest exte
476              assertEquals(i, q.poll(0, MILLISECONDS));
477          }
478          assertNull(q.poll(0, MILLISECONDS));
479 +        checkEmpty(q);
480      }
481  
482      /**
483 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
483 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
484       */
485      public void testTimedPoll() throws InterruptedException {
486          ArrayBlockingQueue q = populatedQueue(SIZE);
487          for (int i = 0; i < SIZE; ++i) {
488 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
489 <        }
490 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
488 >            long startTime = System.nanoTime();
489 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
490 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
491 >        }
492 >        long startTime = System.nanoTime();
493 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
494 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
495 >        checkEmpty(q);
496      }
497  
498      /**
# Line 453 | Line 500 | public class ArrayBlockingQueueTest exte
500       * returning timeout status
501       */
502      public void testInterruptedTimedPoll() throws InterruptedException {
503 <        Thread t = new Thread(new CheckedRunnable() {
504 <            public void realRun() throws InterruptedException {
505 <                ArrayBlockingQueue q = populatedQueue(SIZE);
506 <                for (int i = 0; i < SIZE; ++i) {
507 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));;
508 <                }
503 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
504 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
505 >        Thread t = newStartedThread(new CheckedRunnable() {
506 >            public void realRun() throws InterruptedException {
507 >                long startTime = System.nanoTime();
508 >                for (int i = 0; i < SIZE; i++)
509 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
510 >
511 >                Thread.currentThread().interrupt();
512                  try {
513 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
513 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
514                      shouldThrow();
515                  } catch (InterruptedException success) {}
516 <            }});
467 <
468 <        t.start();
469 <        Thread.sleep(SHORT_DELAY_MS);
470 <        t.interrupt();
471 <        t.join();
472 <    }
516 >                assertFalse(Thread.interrupted());
517  
518 <    /**
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 {
518 >                pleaseInterrupt.countDown();
519                  try {
483                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
484                    assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
520                      q.poll(LONG_DELAY_MS, MILLISECONDS);
521                      shouldThrow();
522                  } catch (InterruptedException success) {}
523 +                assertFalse(Thread.interrupted());
524 +
525 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
526              }});
527  
528 <        t.start();
529 <        Thread.sleep(SMALL_DELAY_MS);
492 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
528 >        await(pleaseInterrupt);
529 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
530          t.interrupt();
531 <        t.join();
531 >        awaitTermination(t);
532 >        checkEmpty(q);
533      }
534  
497
535      /**
536       * peek returns next element, or null if empty
537       */
# Line 539 | Line 576 | public class ArrayBlockingQueueTest exte
576      }
577  
578      /**
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    /**
579       * contains(x) reports true when elements added but not yet removed
580       */
581      public void testContains() {
582 <        ArrayBlockingQueue q = populatedQueue(SIZE);
583 <        for (int i = 0; i < SIZE; ++i) {
582 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
583 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
584 >        assertFalse(q.contains(null));
585 >        for (int i = 0; i < size; ++i) {
586              assertTrue(q.contains(new Integer(i)));
587              assertEquals(i, q.poll());
588              assertFalse(q.contains(new Integer(i)));
# Line 569 | Line 593 | public class ArrayBlockingQueueTest exte
593       * clear removes all elements
594       */
595      public void testClear() {
596 <        ArrayBlockingQueue q = populatedQueue(SIZE);
596 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
597 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
598 >        int capacity = size + q.remainingCapacity();
599          q.clear();
600          assertTrue(q.isEmpty());
601          assertEquals(0, q.size());
602 <        assertEquals(SIZE, q.remainingCapacity());
602 >        assertEquals(capacity, q.remainingCapacity());
603          q.add(one);
604          assertFalse(q.isEmpty());
605          assertTrue(q.contains(one));
# Line 609 | Line 635 | public class ArrayBlockingQueueTest exte
635                  assertTrue(changed);
636  
637              assertTrue(q.containsAll(p));
638 <            assertEquals(SIZE-i, q.size());
638 >            assertEquals(SIZE - i, q.size());
639              p.remove();
640          }
641      }
# Line 622 | Line 648 | public class ArrayBlockingQueueTest exte
648              ArrayBlockingQueue q = populatedQueue(SIZE);
649              ArrayBlockingQueue p = populatedQueue(i);
650              assertTrue(q.removeAll(p));
651 <            assertEquals(SIZE-i, q.size());
651 >            assertEquals(SIZE - i, q.size());
652              for (int j = 0; j < i; ++j) {
653 <                Integer I = (Integer)(p.remove());
654 <                assertFalse(q.contains(I));
653 >                Integer x = (Integer)(p.remove());
654 >                assertFalse(q.contains(x));
655              }
656          }
657      }
658  
659 <    /**
660 <     *  toArray contains all elements
661 <     */
662 <    public void testToArray() throws InterruptedException {
663 <        ArrayBlockingQueue q = populatedQueue(SIZE);
664 <        Object[] o = q.toArray();
665 <        for (int i = 0; i < o.length; i++)
666 <            assertEquals(o[i], q.take());
659 >    void checkToArray(ArrayBlockingQueue<Integer> q) {
660 >        int size = q.size();
661 >        Object[] a1 = q.toArray();
662 >        assertEquals(size, a1.length);
663 >        Integer[] a2 = q.toArray(new Integer[0]);
664 >        assertEquals(size, a2.length);
665 >        Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
666 >        assertEquals(size, a3.length);
667 >        Integer[] a4 = new Integer[size];
668 >        assertSame(a4, q.toArray(a4));
669 >        Integer[] a5 = new Integer[size + 1];
670 >        Arrays.fill(a5, 42);
671 >        assertSame(a5, q.toArray(a5));
672 >        Integer[] a6 = new Integer[size + 2];
673 >        Arrays.fill(a6, 42);
674 >        assertSame(a6, q.toArray(a6));
675 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
676 >        for (Object[] a : as) {
677 >            if (a.length > size) assertNull(a[size]);
678 >            if (a.length > size + 1) assertEquals(42, a[size + 1]);
679 >        }
680 >        Iterator it = q.iterator();
681 >        Integer s = q.peek();
682 >        for (int i = 0; i < size; i++) {
683 >            Integer x = (Integer) it.next();
684 >            assertEquals(s + i, (int) x);
685 >            for (Object[] a : as)
686 >                assertSame(a1[i], x);
687 >        }
688      }
689  
690      /**
691 <     * toArray(a) contains all elements
691 >     * toArray() and toArray(a) contain all elements in FIFO order
692       */
693 <    public void testToArray2() throws InterruptedException {
694 <        ArrayBlockingQueue q = populatedQueue(SIZE);
695 <        Integer[] ints = new Integer[SIZE];
696 <        ints = (Integer[])q.toArray(ints);
697 <        for (int i = 0; i < ints.length; i++)
698 <            assertEquals(ints[i], q.take());
693 >    public void testToArray() {
694 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
695 >        final int size = rnd.nextInt(6);
696 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
697 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
698 >        for (int i = 0; i < size; i++) {
699 >            checkToArray(q);
700 >            q.add(i);
701 >        }
702 >        // Provoke wraparound
703 >        int added = size * 2;
704 >        for (int i = 0; i < added; i++) {
705 >            checkToArray(q);
706 >            assertEquals((Integer) i, q.poll());
707 >            q.add(size + i);
708 >        }
709 >        for (int i = 0; i < size; i++) {
710 >            checkToArray(q);
711 >            assertEquals((Integer) (added + i), q.poll());
712 >        }
713      }
714  
715      /**
716 <     * toArray(null) throws NPE
716 >     * toArray(incompatible array type) throws ArrayStoreException
717       */
718 <    public void testToArray_BadArg() {
718 >    public void testToArray_incompatibleArrayType() {
719          ArrayBlockingQueue q = populatedQueue(SIZE);
720          try {
721 <            Object o[] = q.toArray(null);
721 >            q.toArray(new String[10]);
722              shouldThrow();
723 <        } 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);
723 >        } catch (ArrayStoreException success) {}
724          try {
725 <            Object o[] = q.toArray(new String[10]);
725 >            q.toArray(new String[0]);
726              shouldThrow();
727          } catch (ArrayStoreException success) {}
728      }
729  
676
730      /**
731       * iterator iterates through all elements
732       */
733      public void testIterator() throws InterruptedException {
734          ArrayBlockingQueue q = populatedQueue(SIZE);
735          Iterator it = q.iterator();
736 <        while (it.hasNext()) {
736 >        int i;
737 >        for (i = 0; it.hasNext(); i++)
738 >            assertTrue(q.contains(it.next()));
739 >        assertEquals(i, SIZE);
740 >        assertIteratorExhausted(it);
741 >
742 >        it = q.iterator();
743 >        for (i = 0; it.hasNext(); i++)
744              assertEquals(it.next(), q.take());
745 <        }
745 >        assertEquals(i, SIZE);
746 >        assertIteratorExhausted(it);
747 >    }
748 >
749 >    /**
750 >     * iterator of empty collection has no elements
751 >     */
752 >    public void testEmptyIterator() {
753 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
754      }
755  
756      /**
# Line 737 | Line 805 | public class ArrayBlockingQueueTest exte
805          assertEquals(0, q.size());
806      }
807  
740
808      /**
809       * toString contains toStrings of elements
810       */
# Line 745 | Line 812 | public class ArrayBlockingQueueTest exte
812          ArrayBlockingQueue q = populatedQueue(SIZE);
813          String s = q.toString();
814          for (int i = 0; i < SIZE; ++i) {
815 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
815 >            assertTrue(s.contains(String.valueOf(i)));
816          }
817      }
818  
752
819      /**
820       * offer transfers elements across Executor tasks
821       */
# Line 757 | Line 823 | public class ArrayBlockingQueueTest exte
823          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
824          q.add(one);
825          q.add(two);
826 <        ExecutorService executor = Executors.newFixedThreadPool(2);
827 <        executor.execute(new CheckedRunnable() {
828 <            public void realRun() throws InterruptedException {
829 <                assertFalse(q.offer(three));
830 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
831 <                assertEquals(0, q.remainingCapacity());
832 <            }});
833 <
834 <        executor.execute(new CheckedRunnable() {
835 <            public void realRun() throws InterruptedException {
836 <                Thread.sleep(SMALL_DELAY_MS);
837 <                assertSame(one, q.take());
838 <            }});
839 <
840 <        joinPool(executor);
826 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
827 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
828 >        try (PoolCleaner cleaner = cleaner(executor)) {
829 >            executor.execute(new CheckedRunnable() {
830 >                public void realRun() throws InterruptedException {
831 >                    assertFalse(q.offer(three));
832 >                    threadsStarted.await();
833 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
834 >                    assertEquals(0, q.remainingCapacity());
835 >                }});
836 >
837 >            executor.execute(new CheckedRunnable() {
838 >                public void realRun() throws InterruptedException {
839 >                    threadsStarted.await();
840 >                    assertEquals(0, q.remainingCapacity());
841 >                    assertSame(one, q.take());
842 >                }});
843 >        }
844      }
845  
846      /**
847 <     * poll retrieves elements across Executor threads
847 >     * timed poll retrieves elements across Executor threads
848       */
849      public void testPollInExecutor() {
850          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
851 <        ExecutorService executor = Executors.newFixedThreadPool(2);
852 <        executor.execute(new CheckedRunnable() {
853 <            public void realRun() throws InterruptedException {
854 <                assertNull(q.poll());
855 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
856 <                assertTrue(q.isEmpty());
857 <            }});
858 <
859 <        executor.execute(new CheckedRunnable() {
860 <            public void realRun() throws InterruptedException {
861 <                Thread.sleep(SMALL_DELAY_MS);
862 <                q.put(one);
863 <            }});
864 <
865 <        joinPool(executor);
851 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
852 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
853 >        try (PoolCleaner cleaner = cleaner(executor)) {
854 >            executor.execute(new CheckedRunnable() {
855 >                public void realRun() throws InterruptedException {
856 >                    assertNull(q.poll());
857 >                    threadsStarted.await();
858 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
859 >                    checkEmpty(q);
860 >                }});
861 >
862 >            executor.execute(new CheckedRunnable() {
863 >                public void realRun() throws InterruptedException {
864 >                    threadsStarted.await();
865 >                    q.put(one);
866 >                }});
867 >        }
868      }
869  
870      /**
871       * A deserialized serialized queue has same elements in same order
872       */
873      public void testSerialization() throws Exception {
874 <        ArrayBlockingQueue q = populatedQueue(SIZE);
875 <
805 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
806 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
807 <        out.writeObject(q);
808 <        out.close();
809 <
810 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
811 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
812 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
813 <        assertEquals(q.size(), r.size());
814 <        while (!q.isEmpty())
815 <            assertEquals(q.remove(), r.remove());
816 <    }
817 <
818 <    /**
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 <    }
874 >        Queue x = populatedQueue(SIZE);
875 >        Queue y = serialClone(x);
876  
877 <    /**
878 <     * drainTo(this) throws IAE
879 <     */
880 <    public void testDrainToSelf() {
881 <        ArrayBlockingQueue q = populatedQueue(SIZE);
882 <        try {
883 <            q.drainTo(q);
884 <            shouldThrow();
885 <        } catch (IllegalArgumentException success) {}
877 >        assertNotSame(x, y);
878 >        assertEquals(x.size(), y.size());
879 >        assertEquals(x.toString(), y.toString());
880 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
881 >        while (!x.isEmpty()) {
882 >            assertFalse(y.isEmpty());
883 >            assertEquals(x.remove(), y.remove());
884 >        }
885 >        assertTrue(y.isEmpty());
886      }
887  
888      /**
# Line 844 | Line 892 | public class ArrayBlockingQueueTest exte
892          ArrayBlockingQueue q = populatedQueue(SIZE);
893          ArrayList l = new ArrayList();
894          q.drainTo(l);
895 <        assertEquals(q.size(), 0);
896 <        assertEquals(l.size(), SIZE);
895 >        assertEquals(0, q.size());
896 >        assertEquals(SIZE, l.size());
897          for (int i = 0; i < SIZE; ++i)
898              assertEquals(l.get(i), new Integer(i));
899          q.add(zero);
# Line 855 | Line 903 | public class ArrayBlockingQueueTest exte
903          assertTrue(q.contains(one));
904          l.clear();
905          q.drainTo(l);
906 <        assertEquals(q.size(), 0);
907 <        assertEquals(l.size(), 2);
906 >        assertEquals(0, q.size());
907 >        assertEquals(2, l.size());
908          for (int i = 0; i < 2; ++i)
909              assertEquals(l.get(i), new Integer(i));
910      }
# Line 868 | Line 916 | public class ArrayBlockingQueueTest exte
916          final ArrayBlockingQueue q = populatedQueue(SIZE);
917          Thread t = new Thread(new CheckedRunnable() {
918              public void realRun() throws InterruptedException {
919 <                q.put(new Integer(SIZE+1));
919 >                q.put(new Integer(SIZE + 1));
920              }});
921  
922          t.start();
# Line 882 | Line 930 | public class ArrayBlockingQueueTest exte
930      }
931  
932      /**
933 <     * 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
933 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
934       */
935      public void testDrainToN() {
936 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
936 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
937          for (int i = 0; i < SIZE + 2; ++i) {
938              for (int j = 0; j < SIZE; j++)
939                  assertTrue(q.offer(new Integer(j)));
940              ArrayList l = new ArrayList();
941              q.drainTo(l, i);
942 <            int k = (i < SIZE)? i : SIZE;
943 <            assertEquals(l.size(), k);
944 <            assertEquals(q.size(), SIZE-k);
942 >            int k = (i < SIZE) ? i : SIZE;
943 >            assertEquals(k, l.size());
944 >            assertEquals(SIZE - k, q.size());
945              for (int j = 0; j < k; ++j)
946                  assertEquals(l.get(j), new Integer(j));
947 <            while (q.poll() != null) ;
947 >            do {} while (q.poll() != null);
948          }
949      }
950  
951 +    /**
952 +     * remove(null), contains(null) always return false
953 +     */
954 +    public void testNeverContainsNull() {
955 +        Collection<?>[] qs = {
956 +            populatedQueue(0, 1, 10, false),
957 +            populatedQueue(2, 2, 10, true),
958 +        };
959 +
960 +        for (Collection<?> q : qs) {
961 +            assertFalse(q.contains(null));
962 +            assertFalse(q.remove(null));
963 +        }
964 +    }
965   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines