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.29 by jsr166, Wed Aug 25 00:07:02 2010 UTC vs.
Revision 1.95 by jsr166, Thu Sep 5 20:54:24 2019 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9
10 import junit.framework.*;
11 import java.util.*;
12 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
10 >
11 > import java.util.ArrayList;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.Collections;
15 > import java.util.Iterator;
16 > import java.util.NoSuchElementException;
17 > import java.util.Queue;
18 > import java.util.concurrent.ArrayBlockingQueue;
19 > import java.util.concurrent.BlockingQueue;
20 > import java.util.concurrent.CountDownLatch;
21 > import java.util.concurrent.Executors;
22 > import java.util.concurrent.ExecutorService;
23 > import java.util.concurrent.ThreadLocalRandom;
24 >
25 > import junit.framework.Test;
26  
27   public class ArrayBlockingQueueTest extends JSR166TestCase {
28 +
29      public static void main(String[] args) {
30 <        junit.textui.TestRunner.run(suite());
30 >        main(suite(), args);
31      }
32 +
33      public static Test suite() {
34 <        return new TestSuite(ArrayBlockingQueueTest.class);
34 >        class Implementation implements CollectionImplementation {
35 >            public Class<?> klazz() { return ArrayBlockingQueue.class; }
36 >            public Collection emptyCollection() {
37 >                boolean fair = randomBoolean();
38 >                return populatedQueue(0, SIZE, 2 * SIZE, fair);
39 >            }
40 >            public Object makeElement(int i) { return 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 44 | Line 103 | public class ArrayBlockingQueueTest exte
103      }
104  
105      /**
106 <     * Constructor throws IAE if capacity argument nonpositive
106 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
107       */
108 <    public void testConstructor2() {
109 <        try {
110 <            ArrayBlockingQueue q = new ArrayBlockingQueue(0);
111 <            shouldThrow();
112 <        } catch (IllegalArgumentException success) {}
108 >    public void testConstructor_nonPositiveCapacity() {
109 >        for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) {
110 >            try {
111 >                new ArrayBlockingQueue(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      }
157  
158      /**
159 <     * Initializing from too large collection throws IAE
159 >     * Initializing from too large collection throws IllegalArgumentException
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 176 | Line 227 | public class ArrayBlockingQueueTest exte
227      }
228  
229      /**
230 <     * add succeeds if not full; throws ISE if full
230 >     * add succeeds if not full; throws IllegalStateException 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      /**
243 <     *  addAll(null) throws NPE
195 <     */
196 <    public void testAddAll1() {
197 <        try {
198 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
199 <            q.addAll(null);
200 <            shouldThrow();
201 <        } catch (NullPointerException success) {}
202 <    }
203 <
204 <    /**
205 <     * addAll(this) throws IAE
243 >     * addAll(this) throws IllegalArgumentException
244       */
245      public void testAddAllSelf() {
246 +        ArrayBlockingQueue q = populatedQueue(SIZE);
247          try {
209            ArrayBlockingQueue q = populatedQueue(SIZE);
248              q.addAll(q);
249              shouldThrow();
250          } catch (IllegalArgumentException success) {}
251      }
252  
215
216    /**
217     *  addAll of a collection with null elements throws NPE
218     */
219    public void testAddAll2() {
220        try {
221            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
222            Integer[] ints = new Integer[SIZE];
223            q.addAll(Arrays.asList(ints));
224            shouldThrow();
225        } catch (NullPointerException success) {}
226    }
253      /**
254       * addAll of a collection with any null elements throws NPE after
255       * possibly adding some elements
256       */
257      public void testAddAll3() {
258 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259 +        Integer[] ints = new Integer[SIZE];
260 +        for (int i = 0; i < SIZE - 1; ++i)
261 +            ints[i] = new Integer(i);
262          try {
233            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
234            Integer[] ints = new Integer[SIZE];
235            for (int i = 0; i < SIZE-1; ++i)
236                ints[i] = new Integer(i);
263              q.addAll(Arrays.asList(ints));
264              shouldThrow();
265          } catch (NullPointerException success) {}
266      }
267 +
268      /**
269 <     * addAll throws ISE if not enough room
269 >     * addAll throws IllegalStateException 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];
248 <            for (int i = 0; i < SIZE; ++i)
249 <                ints[i] = new Integer(i);
250 <            q.addAll(Arrays.asList(ints));
280 >            q = populatedQueue(0, size, size, false);
281 >            q.addAll(Collections.nCopies(size + 1, 42));
282              shouldThrow();
283          } catch (IllegalStateException success) {}
284      }
285 +
286      /**
287       * Queue contains all elements, in traversal order, of successful addAll
288       */
# Line 267 | Line 299 | public class ArrayBlockingQueueTest exte
299      }
300  
301      /**
270     *  put(null) throws NPE
271     */
272    public void testPutNull() throws InterruptedException {
273        try {
274            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
275            q.put(null);
276            shouldThrow();
277        } catch (NullPointerException success) {}
278     }
279
280    /**
302       * all elements successfully put are contained
303       */
304      public void testPut() throws InterruptedException {
305          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
306          for (int i = 0; i < SIZE; ++i) {
307 <            Integer I = new Integer(i);
308 <            q.put(I);
309 <            assertTrue(q.contains(I));
307 >            Integer x = new Integer(i);
308 >            q.put(x);
309 >            assertTrue(q.contains(x));
310          }
311          assertEquals(0, q.remainingCapacity());
312      }
# Line 295 | Line 316 | public class ArrayBlockingQueueTest exte
316       */
317      public void testBlockingPut() throws InterruptedException {
318          final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
319 <        Thread t = new Thread(new CheckedRunnable() {
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 >        if (randomBoolean()) 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);
336 <        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 >        if (randomBoolean()) 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      /**
392       * timed offer times out if full and elements not taken
393       */
394 <    public void testTimedOffer() throws InterruptedException {
394 >    public void testTimedOffer() {
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 >
405 >                Thread.currentThread().interrupt();
406 >                try {
407 >                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
408 >                    shouldThrow();
409 >                } catch (InterruptedException success) {}
410 >                assertFalse(Thread.interrupted());
411 >
412 >                pleaseInterrupt.countDown();
413                  try {
414 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
414 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
415                      shouldThrow();
416                  } catch (InterruptedException success) {}
417 +                assertFalse(Thread.interrupted());
418              }});
419  
420 <        t.start();
421 <        Thread.sleep(SHORT_DELAY_MS);
420 >        await(pleaseInterrupt);
421 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
422          t.interrupt();
423 <        t.join();
423 >        awaitTermination(t);
424      }
425  
426      /**
# Line 374 | Line 434 | public class ArrayBlockingQueueTest exte
434      }
435  
436      /**
377     * take blocks interruptibly when empty
378     */
379    public void testTakeFromEmpty() throws InterruptedException {
380        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
381        Thread t = new ThreadShouldThrow(InterruptedException.class) {
382            public void realRun() throws InterruptedException {
383                q.take();
384            }};
385
386        t.start();
387        Thread.sleep(SHORT_DELAY_MS);
388        t.interrupt();
389        t.join();
390    }
391
392    /**
437       * Take removes existing elements until empty, then blocks interruptibly
438       */
439      public void testBlockingTake() throws InterruptedException {
440          final ArrayBlockingQueue q = populatedQueue(SIZE);
441 <        Thread t = new Thread(new CheckedRunnable() {
441 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
442 >        Thread t = newStartedThread(new CheckedRunnable() {
443              public void realRun() throws InterruptedException {
444 <                for (int i = 0; i < SIZE; ++i) {
445 <                    assertEquals(i, q.take());
446 <                }
444 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
445 >
446 >                Thread.currentThread().interrupt();
447                  try {
448                      q.take();
449                      shouldThrow();
450                  } catch (InterruptedException success) {}
451 +                assertFalse(Thread.interrupted());
452 +
453 +                pleaseInterrupt.countDown();
454 +                try {
455 +                    q.take();
456 +                    shouldThrow();
457 +                } catch (InterruptedException success) {}
458 +                assertFalse(Thread.interrupted());
459              }});
460  
461 <        t.start();
462 <        Thread.sleep(SHORT_DELAY_MS);
461 >        await(pleaseInterrupt);
462 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
463          t.interrupt();
464 <        t.join();
464 >        awaitTermination(t);
465      }
466  
414
467      /**
468       * poll succeeds unless empty
469       */
# Line 424 | Line 476 | public class ArrayBlockingQueueTest exte
476      }
477  
478      /**
479 <     * timed pool with zero timeout succeeds when non-empty, else times out
479 >     * timed poll with zero timeout succeeds when non-empty, else times out
480       */
481      public void testTimedPoll0() throws InterruptedException {
482          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 432 | Line 484 | public class ArrayBlockingQueueTest exte
484              assertEquals(i, q.poll(0, MILLISECONDS));
485          }
486          assertNull(q.poll(0, MILLISECONDS));
487 +        checkEmpty(q);
488      }
489  
490      /**
491 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
491 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
492       */
493      public void testTimedPoll() throws InterruptedException {
494          ArrayBlockingQueue q = populatedQueue(SIZE);
495          for (int i = 0; i < SIZE; ++i) {
496 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
497 <        }
498 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
496 >            long startTime = System.nanoTime();
497 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
498 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
499 >        }
500 >        long startTime = System.nanoTime();
501 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
502 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
503 >        checkEmpty(q);
504      }
505  
506      /**
# Line 450 | Line 508 | public class ArrayBlockingQueueTest exte
508       * returning timeout status
509       */
510      public void testInterruptedTimedPoll() throws InterruptedException {
511 <        Thread t = new Thread(new CheckedRunnable() {
512 <            public void realRun() throws InterruptedException {
513 <                ArrayBlockingQueue q = populatedQueue(SIZE);
514 <                for (int i = 0; i < SIZE; ++i) {
515 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));;
516 <                }
511 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
512 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
513 >        Thread t = newStartedThread(new CheckedRunnable() {
514 >            public void realRun() throws InterruptedException {
515 >                long startTime = System.nanoTime();
516 >                for (int i = 0; i < SIZE; i++)
517 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
518 >
519 >                Thread.currentThread().interrupt();
520                  try {
521 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
521 >                    q.poll(randomTimeout(), randomTimeUnit());
522                      shouldThrow();
523                  } catch (InterruptedException success) {}
524 <            }});
524 >                assertFalse(Thread.interrupted());
525  
526 <        t.start();
466 <        Thread.sleep(SHORT_DELAY_MS);
467 <        t.interrupt();
468 <        t.join();
469 <    }
470 <
471 <    /**
472 <     *  timed poll before a delayed offer fails; after offer succeeds;
473 <     *  on interruption throws
474 <     */
475 <    public void testTimedPollWithOffer() throws InterruptedException {
476 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
477 <        Thread t = new Thread(new CheckedRunnable() {
478 <            public void realRun() throws InterruptedException {
479 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
480 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
526 >                pleaseInterrupt.countDown();
527                  try {
528                      q.poll(LONG_DELAY_MS, MILLISECONDS);
529                      shouldThrow();
530                  } catch (InterruptedException success) {}
531 +                assertFalse(Thread.interrupted());
532 +
533 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
534              }});
535  
536 <        t.start();
537 <        Thread.sleep(SMALL_DELAY_MS);
489 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
536 >        await(pleaseInterrupt);
537 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
538          t.interrupt();
539 <        t.join();
539 >        awaitTermination(t);
540 >        checkEmpty(q);
541      }
542  
494
543      /**
544       * peek returns next element, or null if empty
545       */
# Line 536 | Line 584 | public class ArrayBlockingQueueTest exte
584      }
585  
586      /**
539     * remove(x) removes x and returns true if present
540     */
541    public void testRemoveElement() {
542        ArrayBlockingQueue q = populatedQueue(SIZE);
543        for (int i = 1; i < SIZE; i+=2) {
544            assertTrue(q.remove(new Integer(i)));
545        }
546        for (int i = 0; i < SIZE; i+=2) {
547            assertTrue(q.remove(new Integer(i)));
548            assertFalse(q.remove(new Integer(i+1)));
549        }
550        assertTrue(q.isEmpty());
551    }
552
553    /**
587       * contains(x) reports true when elements added but not yet removed
588       */
589      public void testContains() {
590 <        ArrayBlockingQueue q = populatedQueue(SIZE);
591 <        for (int i = 0; i < SIZE; ++i) {
590 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
591 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
592 >        assertFalse(q.contains(null));
593 >        for (int i = 0; i < size; ++i) {
594              assertTrue(q.contains(new Integer(i)));
595              assertEquals(i, q.poll());
596              assertFalse(q.contains(new Integer(i)));
# Line 566 | Line 601 | public class ArrayBlockingQueueTest exte
601       * clear removes all elements
602       */
603      public void testClear() {
604 <        ArrayBlockingQueue q = populatedQueue(SIZE);
604 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
605 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
606 >        int capacity = size + q.remainingCapacity();
607          q.clear();
608          assertTrue(q.isEmpty());
609          assertEquals(0, q.size());
610 <        assertEquals(SIZE, q.remainingCapacity());
610 >        assertEquals(capacity, q.remainingCapacity());
611          q.add(one);
612          assertFalse(q.isEmpty());
613          assertTrue(q.contains(one));
# Line 606 | Line 643 | public class ArrayBlockingQueueTest exte
643                  assertTrue(changed);
644  
645              assertTrue(q.containsAll(p));
646 <            assertEquals(SIZE-i, q.size());
646 >            assertEquals(SIZE - i, q.size());
647              p.remove();
648          }
649      }
# Line 619 | Line 656 | public class ArrayBlockingQueueTest exte
656              ArrayBlockingQueue q = populatedQueue(SIZE);
657              ArrayBlockingQueue p = populatedQueue(i);
658              assertTrue(q.removeAll(p));
659 <            assertEquals(SIZE-i, q.size());
659 >            assertEquals(SIZE - i, q.size());
660              for (int j = 0; j < i; ++j) {
661 <                Integer I = (Integer)(p.remove());
662 <                assertFalse(q.contains(I));
661 >                Integer x = (Integer)(p.remove());
662 >                assertFalse(q.contains(x));
663              }
664          }
665      }
666  
667 <    /**
668 <     *  toArray contains all elements
669 <     */
670 <    public void testToArray() throws InterruptedException {
671 <        ArrayBlockingQueue q = populatedQueue(SIZE);
672 <        Object[] o = q.toArray();
673 <        for (int i = 0; i < o.length; i++)
674 <            assertEquals(o[i], q.take());
667 >    void checkToArray(ArrayBlockingQueue<Integer> q) {
668 >        int size = q.size();
669 >        Object[] a1 = q.toArray();
670 >        assertEquals(size, a1.length);
671 >        Integer[] a2 = q.toArray(new Integer[0]);
672 >        assertEquals(size, a2.length);
673 >        Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
674 >        assertEquals(size, a3.length);
675 >        Integer[] a4 = new Integer[size];
676 >        assertSame(a4, q.toArray(a4));
677 >        Integer[] a5 = new Integer[size + 1];
678 >        Arrays.fill(a5, 42);
679 >        assertSame(a5, q.toArray(a5));
680 >        Integer[] a6 = new Integer[size + 2];
681 >        Arrays.fill(a6, 42);
682 >        assertSame(a6, q.toArray(a6));
683 >        Object[][] as = { a1, a2, a3, a4, a5, a6 };
684 >        for (Object[] a : as) {
685 >            if (a.length > size) assertNull(a[size]);
686 >            if (a.length > size + 1) assertEquals(42, a[size + 1]);
687 >        }
688 >        Iterator it = q.iterator();
689 >        Integer s = q.peek();
690 >        for (int i = 0; i < size; i++) {
691 >            Integer x = (Integer) it.next();
692 >            assertEquals(s + i, (int) x);
693 >            for (Object[] a : as)
694 >                assertSame(a1[i], x);
695 >        }
696      }
697  
698      /**
699 <     * toArray(a) contains all elements
699 >     * toArray() and toArray(a) contain all elements in FIFO order
700       */
701 <    public void testToArray2() throws InterruptedException {
702 <        ArrayBlockingQueue q = populatedQueue(SIZE);
703 <        Integer[] ints = new Integer[SIZE];
704 <        ints = (Integer[])q.toArray(ints);
705 <        for (int i = 0; i < ints.length; i++)
706 <            assertEquals(ints[i], q.take());
701 >    public void testToArray() {
702 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
703 >        final int size = rnd.nextInt(6);
704 >        final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
705 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
706 >        for (int i = 0; i < size; i++) {
707 >            checkToArray(q);
708 >            q.add(i);
709 >        }
710 >        // Provoke wraparound
711 >        int added = size * 2;
712 >        for (int i = 0; i < added; i++) {
713 >            checkToArray(q);
714 >            assertEquals((Integer) i, q.poll());
715 >            q.add(size + i);
716 >        }
717 >        for (int i = 0; i < size; i++) {
718 >            checkToArray(q);
719 >            assertEquals((Integer) (added + i), q.poll());
720 >        }
721      }
722  
723      /**
724 <     * toArray(null) throws NPE
724 >     * toArray(incompatible array type) throws ArrayStoreException
725       */
726 <    public void testToArray_BadArg() {
726 >    public void testToArray_incompatibleArrayType() {
727          ArrayBlockingQueue q = populatedQueue(SIZE);
728          try {
729 <            Object o[] = q.toArray(null);
729 >            q.toArray(new String[10]);
730              shouldThrow();
731 <        } catch (NullPointerException success) {}
660 <    }
661 <
662 <    /**
663 <     * toArray with incompatible array type throws CCE
664 <     */
665 <    public void testToArray1_BadArg() {
666 <        ArrayBlockingQueue q = populatedQueue(SIZE);
731 >        } catch (ArrayStoreException success) {}
732          try {
733 <            Object o[] = q.toArray(new String[10]);
733 >            q.toArray(new String[0]);
734              shouldThrow();
735          } catch (ArrayStoreException success) {}
736      }
737  
673
738      /**
739       * iterator iterates through all elements
740       */
741      public void testIterator() throws InterruptedException {
742          ArrayBlockingQueue q = populatedQueue(SIZE);
743          Iterator it = q.iterator();
744 <        while (it.hasNext()) {
744 >        int i;
745 >        for (i = 0; it.hasNext(); i++)
746 >            assertTrue(q.contains(it.next()));
747 >        assertEquals(i, SIZE);
748 >        assertIteratorExhausted(it);
749 >
750 >        it = q.iterator();
751 >        for (i = 0; it.hasNext(); i++)
752              assertEquals(it.next(), q.take());
753 <        }
753 >        assertEquals(i, SIZE);
754 >        assertIteratorExhausted(it);
755 >    }
756 >
757 >    /**
758 >     * iterator of empty collection has no elements
759 >     */
760 >    public void testEmptyIterator() {
761 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
762      }
763  
764      /**
# Line 734 | Line 813 | public class ArrayBlockingQueueTest exte
813          assertEquals(0, q.size());
814      }
815  
737
816      /**
817       * toString contains toStrings of elements
818       */
# Line 742 | Line 820 | public class ArrayBlockingQueueTest exte
820          ArrayBlockingQueue q = populatedQueue(SIZE);
821          String s = q.toString();
822          for (int i = 0; i < SIZE; ++i) {
823 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
823 >            assertTrue(s.contains(String.valueOf(i)));
824          }
825      }
826  
749
827      /**
828       * offer transfers elements across Executor tasks
829       */
# Line 754 | Line 831 | public class ArrayBlockingQueueTest exte
831          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
832          q.add(one);
833          q.add(two);
834 <        ExecutorService executor = Executors.newFixedThreadPool(2);
835 <        executor.execute(new CheckedRunnable() {
836 <            public void realRun() throws InterruptedException {
837 <                assertFalse(q.offer(three));
838 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
839 <                assertEquals(0, q.remainingCapacity());
840 <            }});
841 <
842 <        executor.execute(new CheckedRunnable() {
843 <            public void realRun() throws InterruptedException {
844 <                Thread.sleep(SMALL_DELAY_MS);
845 <                assertSame(one, q.take());
846 <            }});
847 <
848 <        joinPool(executor);
834 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
835 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
836 >        try (PoolCleaner cleaner = cleaner(executor)) {
837 >            executor.execute(new CheckedRunnable() {
838 >                public void realRun() throws InterruptedException {
839 >                    assertFalse(q.offer(three));
840 >                    threadsStarted.await();
841 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
842 >                    assertEquals(0, q.remainingCapacity());
843 >                }});
844 >
845 >            executor.execute(new CheckedRunnable() {
846 >                public void realRun() throws InterruptedException {
847 >                    threadsStarted.await();
848 >                    assertEquals(0, q.remainingCapacity());
849 >                    assertSame(one, q.take());
850 >                }});
851 >        }
852      }
853  
854      /**
855 <     * poll retrieves elements across Executor threads
855 >     * timed poll retrieves elements across Executor threads
856       */
857      public void testPollInExecutor() {
858          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
859 <        ExecutorService executor = Executors.newFixedThreadPool(2);
860 <        executor.execute(new CheckedRunnable() {
861 <            public void realRun() throws InterruptedException {
862 <                assertNull(q.poll());
863 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
864 <                assertTrue(q.isEmpty());
865 <            }});
866 <
867 <        executor.execute(new CheckedRunnable() {
868 <            public void realRun() throws InterruptedException {
869 <                Thread.sleep(SMALL_DELAY_MS);
870 <                q.put(one);
871 <            }});
872 <
873 <        joinPool(executor);
859 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
860 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
861 >        try (PoolCleaner cleaner = cleaner(executor)) {
862 >            executor.execute(new CheckedRunnable() {
863 >                public void realRun() throws InterruptedException {
864 >                    assertNull(q.poll());
865 >                    threadsStarted.await();
866 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
867 >                    checkEmpty(q);
868 >                }});
869 >
870 >            executor.execute(new CheckedRunnable() {
871 >                public void realRun() throws InterruptedException {
872 >                    threadsStarted.await();
873 >                    q.put(one);
874 >                }});
875 >        }
876      }
877  
878      /**
879 <     * A deserialized serialized queue has same elements in same order
879 >     * A deserialized/reserialized queue has same elements in same order
880       */
881      public void testSerialization() throws Exception {
882 <        ArrayBlockingQueue q = populatedQueue(SIZE);
883 <
802 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
803 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
804 <        out.writeObject(q);
805 <        out.close();
806 <
807 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
808 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
809 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
810 <        assertEquals(q.size(), r.size());
811 <        while (!q.isEmpty())
812 <            assertEquals(q.remove(), r.remove());
813 <    }
814 <
815 <    /**
816 <     * drainTo(null) throws NPE
817 <     */
818 <    public void testDrainToNull() {
819 <        ArrayBlockingQueue q = populatedQueue(SIZE);
820 <        try {
821 <            q.drainTo(null);
822 <            shouldThrow();
823 <        } catch (NullPointerException success) {}
824 <    }
882 >        Queue x = populatedQueue(SIZE);
883 >        Queue y = serialClone(x);
884  
885 <    /**
886 <     * drainTo(this) throws IAE
887 <     */
888 <    public void testDrainToSelf() {
889 <        ArrayBlockingQueue q = populatedQueue(SIZE);
890 <        try {
891 <            q.drainTo(q);
892 <            shouldThrow();
893 <        } catch (IllegalArgumentException success) {}
885 >        assertNotSame(x, y);
886 >        assertEquals(x.size(), y.size());
887 >        assertEquals(x.toString(), y.toString());
888 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
889 >        while (!x.isEmpty()) {
890 >            assertFalse(y.isEmpty());
891 >            assertEquals(x.remove(), y.remove());
892 >        }
893 >        assertTrue(y.isEmpty());
894      }
895  
896      /**
# Line 841 | Line 900 | public class ArrayBlockingQueueTest exte
900          ArrayBlockingQueue q = populatedQueue(SIZE);
901          ArrayList l = new ArrayList();
902          q.drainTo(l);
903 <        assertEquals(q.size(), 0);
904 <        assertEquals(l.size(), SIZE);
903 >        assertEquals(0, q.size());
904 >        assertEquals(SIZE, l.size());
905          for (int i = 0; i < SIZE; ++i)
906              assertEquals(l.get(i), new Integer(i));
907          q.add(zero);
# Line 852 | Line 911 | public class ArrayBlockingQueueTest exte
911          assertTrue(q.contains(one));
912          l.clear();
913          q.drainTo(l);
914 <        assertEquals(q.size(), 0);
915 <        assertEquals(l.size(), 2);
914 >        assertEquals(0, q.size());
915 >        assertEquals(2, l.size());
916          for (int i = 0; i < 2; ++i)
917              assertEquals(l.get(i), new Integer(i));
918      }
# Line 865 | Line 924 | public class ArrayBlockingQueueTest exte
924          final ArrayBlockingQueue q = populatedQueue(SIZE);
925          Thread t = new Thread(new CheckedRunnable() {
926              public void realRun() throws InterruptedException {
927 <                q.put(new Integer(SIZE+1));
927 >                q.put(new Integer(SIZE + 1));
928              }});
929  
930          t.start();
# Line 879 | Line 938 | public class ArrayBlockingQueueTest exte
938      }
939  
940      /**
941 <     * drainTo(null, n) throws NPE
883 <     */
884 <    public void testDrainToNullN() {
885 <        ArrayBlockingQueue q = populatedQueue(SIZE);
886 <        try {
887 <            q.drainTo(null, 0);
888 <            shouldThrow();
889 <        } catch (NullPointerException success) {}
890 <    }
891 <
892 <    /**
893 <     * drainTo(this, n) throws IAE
894 <     */
895 <    public void testDrainToSelfN() {
896 <        ArrayBlockingQueue q = populatedQueue(SIZE);
897 <        try {
898 <            q.drainTo(q, 0);
899 <            shouldThrow();
900 <        } catch (IllegalArgumentException success) {}
901 <    }
902 <
903 <    /**
904 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
941 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
942       */
943      public void testDrainToN() {
944 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
944 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
945          for (int i = 0; i < SIZE + 2; ++i) {
946              for (int j = 0; j < SIZE; j++)
947                  assertTrue(q.offer(new Integer(j)));
948              ArrayList l = new ArrayList();
949              q.drainTo(l, i);
950 <            int k = (i < SIZE)? i : SIZE;
951 <            assertEquals(l.size(), k);
952 <            assertEquals(q.size(), SIZE-k);
950 >            int k = (i < SIZE) ? i : SIZE;
951 >            assertEquals(k, l.size());
952 >            assertEquals(SIZE - k, q.size());
953              for (int j = 0; j < k; ++j)
954                  assertEquals(l.get(j), new Integer(j));
955 <            while (q.poll() != null) ;
955 >            do {} while (q.poll() != null);
956          }
957      }
958  
959 +    /**
960 +     * remove(null), contains(null) always return false
961 +     */
962 +    public void testNeverContainsNull() {
963 +        Collection<?>[] qs = {
964 +            populatedQueue(0, 1, 10, false),
965 +            populatedQueue(2, 2, 10, true),
966 +        };
967 +
968 +        for (Collection<?> q : qs) {
969 +            assertFalse(q.contains(null));
970 +            assertFalse(q.remove(null));
971 +        }
972 +    }
973   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines