ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ArrayBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.20 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.75 by jsr166, Sat Nov 5 23:38:21 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines