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.34 by jsr166, Tue Oct 19 00:41:14 2010 UTC vs.
Revision 1.72 by jsr166, Sun Oct 16 20:44:18 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 >
23 > import junit.framework.Test;
24  
25   public class ArrayBlockingQueueTest extends JSR166TestCase {
26  
27      public static class Fair extends BlockingQueueTest {
28          protected BlockingQueue emptyCollection() {
29 <            return new ArrayBlockingQueue(20, true);
29 >            return new ArrayBlockingQueue(SIZE, true);
30          }
31      }
32  
33      public static class NonFair extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new ArrayBlockingQueue(20, false);
35 >            return new ArrayBlockingQueue(SIZE, false);
36          }
37      }
38  
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run(suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
# Line 38 | Line 47 | public class ArrayBlockingQueueTest exte
47      }
48  
49      /**
50 <     * Create a queue of given size containing consecutive
51 <     * Integers 0 ... n.
50 >     * Returns a new queue of given size containing consecutive
51 >     * Integers 0 ... n - 1.
52       */
53 <    private ArrayBlockingQueue populatedQueue(int n) {
54 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
53 >    private ArrayBlockingQueue<Integer> populatedQueue(int n) {
54 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
55          assertTrue(q.isEmpty());
56          for (int i = 0; i < n; i++)
57              assertTrue(q.offer(new Integer(i)));
58          assertFalse(q.isEmpty());
59          assertEquals(0, q.remainingCapacity());
60          assertEquals(n, q.size());
61 +        assertEquals((Integer) 0, q.peek());
62          return q;
63      }
64  
# Line 64 | Line 74 | public class ArrayBlockingQueueTest exte
74       */
75      public void testConstructor2() {
76          try {
77 <            ArrayBlockingQueue q = new ArrayBlockingQueue(0);
77 >            new ArrayBlockingQueue(0);
78              shouldThrow();
79          } catch (IllegalArgumentException success) {}
80      }
# Line 74 | Line 84 | public class ArrayBlockingQueueTest exte
84       */
85      public void testConstructor3() {
86          try {
87 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
87 >            new ArrayBlockingQueue(1, true, null);
88              shouldThrow();
89          } catch (NullPointerException success) {}
90      }
# Line 83 | Line 93 | public class ArrayBlockingQueueTest exte
93       * Initializing from Collection of null elements throws NPE
94       */
95      public void testConstructor4() {
96 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
97          try {
98 <            Integer[] ints = new Integer[SIZE];
88 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
98 >            new ArrayBlockingQueue(SIZE, false, elements);
99              shouldThrow();
100          } catch (NullPointerException success) {}
101      }
# Line 94 | Line 104 | public class ArrayBlockingQueueTest exte
104       * Initializing from Collection with some null elements throws NPE
105       */
106      public void testConstructor5() {
107 +        Integer[] ints = new Integer[SIZE];
108 +        for (int i = 0; i < SIZE - 1; ++i)
109 +            ints[i] = i;
110 +        Collection<Integer> elements = Arrays.asList(ints);
111          try {
112 <            Integer[] ints = new Integer[SIZE];
99 <            for (int i = 0; i < SIZE-1; ++i)
100 <                ints[i] = new Integer(i);
101 <            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
112 >            new ArrayBlockingQueue(SIZE, false, elements);
113              shouldThrow();
114          } catch (NullPointerException success) {}
115      }
# Line 107 | Line 118 | public class ArrayBlockingQueueTest exte
118       * Initializing from too large collection throws IAE
119       */
120      public void testConstructor6() {
121 +        Integer[] ints = new Integer[SIZE];
122 +        for (int i = 0; i < SIZE; ++i)
123 +            ints[i] = i;
124 +        Collection<Integer> elements = Arrays.asList(ints);
125          try {
126 <            Integer[] ints = new Integer[SIZE];
112 <            for (int i = 0; i < SIZE; ++i)
113 <                ints[i] = new Integer(i);
114 <            ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
126 >            new ArrayBlockingQueue(SIZE - 1, false, elements);
127              shouldThrow();
128          } catch (IllegalArgumentException success) {}
129      }
# Line 122 | Line 134 | public class ArrayBlockingQueueTest exte
134      public void testConstructor7() {
135          Integer[] ints = new Integer[SIZE];
136          for (int i = 0; i < SIZE; ++i)
137 <            ints[i] = new Integer(i);
138 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
137 >            ints[i] = i;
138 >        Collection<Integer> elements = Arrays.asList(ints);
139 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
140          for (int i = 0; i < SIZE; ++i)
141              assertEquals(ints[i], q.poll());
142      }
# Line 147 | Line 160 | public class ArrayBlockingQueueTest exte
160       * remainingCapacity decreases on add, increases on remove
161       */
162      public void testRemainingCapacity() {
163 <        ArrayBlockingQueue q = populatedQueue(SIZE);
163 >        BlockingQueue q = populatedQueue(SIZE);
164          for (int i = 0; i < SIZE; ++i) {
165              assertEquals(i, q.remainingCapacity());
166 <            assertEquals(SIZE-i, q.size());
167 <            q.remove();
166 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
167 >            assertEquals(i, q.remove());
168          }
169          for (int i = 0; i < SIZE; ++i) {
170 <            assertEquals(SIZE-i, q.remainingCapacity());
171 <            assertEquals(i, q.size());
172 <            q.add(new Integer(i));
170 >            assertEquals(SIZE - i, q.remainingCapacity());
171 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
172 >            assertTrue(q.add(i));
173          }
174      }
175  
176      /**
164     * offer(null) throws NPE
165     */
166    public void testOfferNull() {
167        try {
168            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
169            q.offer(null);
170            shouldThrow();
171        } catch (NullPointerException success) {}
172    }
173
174    /**
175     * add(null) throws NPE
176     */
177    public void testAddNull() {
178        try {
179            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
180            q.add(null);
181            shouldThrow();
182        } catch (NullPointerException success) {}
183    }
184
185    /**
177       * Offer succeeds if not full; fails if full
178       */
179      public void testOffer() {
# Line 195 | Line 186 | public class ArrayBlockingQueueTest exte
186       * add succeeds if not full; throws ISE if full
187       */
188      public void testAdd() {
189 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
190 +        for (int i = 0; i < SIZE; ++i) {
191 +            assertTrue(q.add(new Integer(i)));
192 +        }
193 +        assertEquals(0, q.remainingCapacity());
194          try {
199            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
200            for (int i = 0; i < SIZE; ++i) {
201                assertTrue(q.add(new Integer(i)));
202            }
203            assertEquals(0, q.remainingCapacity());
195              q.add(new Integer(SIZE));
196              shouldThrow();
197          } catch (IllegalStateException success) {}
198      }
199  
200      /**
210     * addAll(null) throws NPE
211     */
212    public void testAddAll1() {
213        try {
214            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
215            q.addAll(null);
216            shouldThrow();
217        } catch (NullPointerException success) {}
218    }
219
220    /**
201       * addAll(this) throws IAE
202       */
203      public void testAddAllSelf() {
204 +        ArrayBlockingQueue q = populatedQueue(SIZE);
205          try {
225            ArrayBlockingQueue q = populatedQueue(SIZE);
206              q.addAll(q);
207              shouldThrow();
208          } catch (IllegalArgumentException success) {}
209      }
210  
231
232    /**
233     * addAll of a collection with null elements throws NPE
234     */
235    public void testAddAll2() {
236        try {
237            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
238            Integer[] ints = new Integer[SIZE];
239            q.addAll(Arrays.asList(ints));
240            shouldThrow();
241        } catch (NullPointerException success) {}
242    }
243
211      /**
212       * addAll of a collection with any null elements throws NPE after
213       * possibly adding some elements
214       */
215      public void testAddAll3() {
216 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
217 +        Integer[] ints = new Integer[SIZE];
218 +        for (int i = 0; i < SIZE - 1; ++i)
219 +            ints[i] = new Integer(i);
220          try {
250            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
251            Integer[] ints = new Integer[SIZE];
252            for (int i = 0; i < SIZE-1; ++i)
253                ints[i] = new Integer(i);
221              q.addAll(Arrays.asList(ints));
222              shouldThrow();
223          } catch (NullPointerException success) {}
# Line 260 | Line 227 | public class ArrayBlockingQueueTest exte
227       * addAll throws ISE if not enough room
228       */
229      public void testAddAll4() {
230 +        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
231 +        Integer[] ints = new Integer[SIZE];
232 +        for (int i = 0; i < SIZE; ++i)
233 +            ints[i] = new Integer(i);
234          try {
264            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
265            Integer[] ints = new Integer[SIZE];
266            for (int i = 0; i < SIZE; ++i)
267                ints[i] = new Integer(i);
235              q.addAll(Arrays.asList(ints));
236              shouldThrow();
237          } catch (IllegalStateException success) {}
# Line 286 | Line 253 | public class ArrayBlockingQueueTest exte
253      }
254  
255      /**
289     * put(null) throws NPE
290     */
291    public void testPutNull() throws InterruptedException {
292        try {
293            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
294            q.put(null);
295            shouldThrow();
296        } catch (NullPointerException success) {}
297     }
298
299    /**
256       * all elements successfully put are contained
257       */
258      public void testPut() throws InterruptedException {
259          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
260          for (int i = 0; i < SIZE; ++i) {
261 <            Integer I = new Integer(i);
262 <            q.put(I);
263 <            assertTrue(q.contains(I));
261 >            Integer x = new Integer(i);
262 >            q.put(x);
263 >            assertTrue(q.contains(x));
264          }
265          assertEquals(0, q.remainingCapacity());
266      }
# Line 314 | Line 270 | public class ArrayBlockingQueueTest exte
270       */
271      public void testBlockingPut() throws InterruptedException {
272          final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
273 <        Thread t = new Thread(new CheckedRunnable() {
273 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
274 >        Thread t = newStartedThread(new CheckedRunnable() {
275              public void realRun() throws InterruptedException {
276                  for (int i = 0; i < SIZE; ++i)
277                      q.put(i);
278                  assertEquals(SIZE, q.size());
279                  assertEquals(0, q.remainingCapacity());
280 +
281 +                Thread.currentThread().interrupt();
282 +                try {
283 +                    q.put(99);
284 +                    shouldThrow();
285 +                } catch (InterruptedException success) {}
286 +                assertFalse(Thread.interrupted());
287 +
288 +                pleaseInterrupt.countDown();
289                  try {
290                      q.put(99);
291                      shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertFalse(Thread.interrupted());
294              }});
295  
296 <        t.start();
297 <        Thread.sleep(SHORT_DELAY_MS);
296 >        await(pleaseInterrupt);
297 >        assertThreadStaysAlive(t);
298          t.interrupt();
299 <        t.join();
299 >        awaitTermination(t);
300          assertEquals(SIZE, q.size());
301          assertEquals(0, q.remainingCapacity());
302      }
303  
304      /**
305 <     * put blocks waiting for take when full
305 >     * put blocks interruptibly waiting for take when full
306       */
307      public void testPutWithTake() throws InterruptedException {
308          final int capacity = 2;
309          final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
310 <        Thread t = new Thread(new CheckedRunnable() {
310 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
311 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
312 >        Thread t = newStartedThread(new CheckedRunnable() {
313              public void realRun() throws InterruptedException {
314 <                for (int i = 0; i < capacity + 1; i++)
314 >                for (int i = 0; i < capacity; i++)
315                      q.put(i);
316 +                pleaseTake.countDown();
317 +                q.put(86);
318 +
319 +                pleaseInterrupt.countDown();
320                  try {
321                      q.put(99);
322                      shouldThrow();
323                  } catch (InterruptedException success) {}
324 +                assertFalse(Thread.interrupted());
325              }});
326  
327 <        t.start();
328 <        Thread.sleep(SHORT_DELAY_MS);
355 <        assertEquals(q.remainingCapacity(), 0);
327 >        await(pleaseTake);
328 >        assertEquals(0, q.remainingCapacity());
329          assertEquals(0, q.take());
330 <        Thread.sleep(SHORT_DELAY_MS);
330 >
331 >        await(pleaseInterrupt);
332 >        assertThreadStaysAlive(t);
333          t.interrupt();
334 <        t.join();
335 <        assertEquals(q.remainingCapacity(), 0);
334 >        awaitTermination(t);
335 >        assertEquals(0, q.remainingCapacity());
336      }
337  
338      /**
# Line 365 | Line 340 | public class ArrayBlockingQueueTest exte
340       */
341      public void testTimedOffer() throws InterruptedException {
342          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
343 <        Thread t = new Thread(new CheckedRunnable() {
343 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344 >        Thread t = newStartedThread(new CheckedRunnable() {
345              public void realRun() throws InterruptedException {
346                  q.put(new Object());
347                  q.put(new Object());
348 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
348 >                long startTime = System.nanoTime();
349 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
350 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
351 >                pleaseInterrupt.countDown();
352                  try {
353 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
353 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
354                      shouldThrow();
355                  } catch (InterruptedException success) {}
356              }});
357  
358 <        t.start();
359 <        Thread.sleep(SHORT_DELAY_MS);
358 >        await(pleaseInterrupt);
359 >        assertThreadStaysAlive(t);
360          t.interrupt();
361 <        t.join();
361 >        awaitTermination(t);
362      }
363  
364      /**
# Line 393 | Line 372 | public class ArrayBlockingQueueTest exte
372      }
373  
374      /**
396     * take blocks interruptibly when empty
397     */
398    public void testTakeFromEmpty() throws InterruptedException {
399        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
400        Thread t = new ThreadShouldThrow(InterruptedException.class) {
401            public void realRun() throws InterruptedException {
402                q.take();
403            }};
404
405        t.start();
406        Thread.sleep(SHORT_DELAY_MS);
407        t.interrupt();
408        t.join();
409    }
410
411    /**
375       * Take removes existing elements until empty, then blocks interruptibly
376       */
377      public void testBlockingTake() throws InterruptedException {
378          final ArrayBlockingQueue q = populatedQueue(SIZE);
379 <        Thread t = new Thread(new CheckedRunnable() {
379 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
380 >        Thread t = newStartedThread(new CheckedRunnable() {
381              public void realRun() throws InterruptedException {
382                  for (int i = 0; i < SIZE; ++i) {
383                      assertEquals(i, q.take());
384                  }
385 +
386 +                Thread.currentThread().interrupt();
387 +                try {
388 +                    q.take();
389 +                    shouldThrow();
390 +                } catch (InterruptedException success) {}
391 +                assertFalse(Thread.interrupted());
392 +
393 +                pleaseInterrupt.countDown();
394                  try {
395                      q.take();
396                      shouldThrow();
397                  } catch (InterruptedException success) {}
398 +                assertFalse(Thread.interrupted());
399              }});
400  
401 <        t.start();
402 <        Thread.sleep(SHORT_DELAY_MS);
401 >        await(pleaseInterrupt);
402 >        assertThreadStaysAlive(t);
403          t.interrupt();
404 <        t.join();
404 >        awaitTermination(t);
405      }
406  
433
407      /**
408       * poll succeeds unless empty
409       */
# Line 443 | Line 416 | public class ArrayBlockingQueueTest exte
416      }
417  
418      /**
419 <     * timed pool with zero timeout succeeds when non-empty, else times out
419 >     * timed poll with zero timeout succeeds when non-empty, else times out
420       */
421      public void testTimedPoll0() throws InterruptedException {
422          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 451 | Line 424 | public class ArrayBlockingQueueTest exte
424              assertEquals(i, q.poll(0, MILLISECONDS));
425          }
426          assertNull(q.poll(0, MILLISECONDS));
427 +        checkEmpty(q);
428      }
429  
430      /**
431 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
431 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
432       */
433      public void testTimedPoll() throws InterruptedException {
434          ArrayBlockingQueue q = populatedQueue(SIZE);
435          for (int i = 0; i < SIZE; ++i) {
436 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
437 <        }
438 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
436 >            long startTime = System.nanoTime();
437 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
438 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
439 >        }
440 >        long startTime = System.nanoTime();
441 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
442 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
443 >        checkEmpty(q);
444      }
445  
446      /**
# Line 469 | Line 448 | public class ArrayBlockingQueueTest exte
448       * returning timeout status
449       */
450      public void testInterruptedTimedPoll() throws InterruptedException {
451 <        Thread t = new Thread(new CheckedRunnable() {
451 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
452 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
453 >        Thread t = newStartedThread(new CheckedRunnable() {
454              public void realRun() throws InterruptedException {
455 <                ArrayBlockingQueue q = populatedQueue(SIZE);
455 >                long startTime = System.nanoTime();
456                  for (int i = 0; i < SIZE; ++i) {
457 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));;
457 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
458                  }
459 +                aboutToWait.countDown();
460                  try {
461 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
461 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
462                      shouldThrow();
463 <                } catch (InterruptedException success) {}
463 >                } catch (InterruptedException success) {
464 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
465 >                }
466              }});
467  
468 <        t.start();
469 <        Thread.sleep(SHORT_DELAY_MS);
468 >        await(aboutToWait);
469 >        waitForThreadToEnterWaitState(t);
470          t.interrupt();
471 <        t.join();
471 >        awaitTermination(t);
472 >        checkEmpty(q);
473      }
474  
475      /**
# Line 531 | Line 516 | public class ArrayBlockingQueueTest exte
516      }
517  
518      /**
534     * remove(x) removes x and returns true if present
535     */
536    public void testRemoveElement() {
537        ArrayBlockingQueue q = populatedQueue(SIZE);
538        for (int i = 1; i < SIZE; i+=2) {
539            assertTrue(q.remove(new Integer(i)));
540        }
541        for (int i = 0; i < SIZE; i+=2) {
542            assertTrue(q.remove(new Integer(i)));
543            assertFalse(q.remove(new Integer(i+1)));
544        }
545        assertTrue(q.isEmpty());
546    }
547
548    /**
519       * contains(x) reports true when elements added but not yet removed
520       */
521      public void testContains() {
# Line 601 | Line 571 | public class ArrayBlockingQueueTest exte
571                  assertTrue(changed);
572  
573              assertTrue(q.containsAll(p));
574 <            assertEquals(SIZE-i, q.size());
574 >            assertEquals(SIZE - i, q.size());
575              p.remove();
576          }
577      }
# Line 614 | Line 584 | public class ArrayBlockingQueueTest exte
584              ArrayBlockingQueue q = populatedQueue(SIZE);
585              ArrayBlockingQueue p = populatedQueue(i);
586              assertTrue(q.removeAll(p));
587 <            assertEquals(SIZE-i, q.size());
587 >            assertEquals(SIZE - i, q.size());
588              for (int j = 0; j < i; ++j) {
589 <                Integer I = (Integer)(p.remove());
590 <                assertFalse(q.contains(I));
589 >                Integer x = (Integer)(p.remove());
590 >                assertFalse(q.contains(x));
591              }
592          }
593      }
594  
595 <    /**
596 <     * toArray contains all elements
627 <     */
628 <    public void testToArray() throws InterruptedException {
629 <        ArrayBlockingQueue q = populatedQueue(SIZE);
595 >    void checkToArray(ArrayBlockingQueue q) {
596 >        int size = q.size();
597          Object[] o = q.toArray();
598 <        for (int i = 0; i < o.length; i++)
599 <            assertEquals(o[i], q.take());
598 >        assertEquals(size, o.length);
599 >        Iterator it = q.iterator();
600 >        for (int i = 0; i < size; i++) {
601 >            Integer x = (Integer) it.next();
602 >            assertEquals((Integer)o[0] + i, (int) x);
603 >            assertSame(o[i], x);
604 >        }
605      }
606  
607      /**
608 <     * toArray(a) contains all elements
608 >     * toArray() contains all elements in FIFO order
609       */
610 <    public void testToArray2() throws InterruptedException {
611 <        ArrayBlockingQueue q = populatedQueue(SIZE);
612 <        Integer[] ints = new Integer[SIZE];
613 <        ints = (Integer[])q.toArray(ints);
614 <        for (int i = 0; i < ints.length; i++)
615 <            assertEquals(ints[i], q.take());
610 >    public void testToArray() {
611 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
612 >        for (int i = 0; i < SIZE; i++) {
613 >            checkToArray(q);
614 >            q.add(i);
615 >        }
616 >        // Provoke wraparound
617 >        for (int i = 0; i < SIZE; i++) {
618 >            checkToArray(q);
619 >            assertEquals(i, q.poll());
620 >            checkToArray(q);
621 >            q.add(SIZE + i);
622 >        }
623 >        for (int i = 0; i < SIZE; i++) {
624 >            checkToArray(q);
625 >            assertEquals(SIZE + i, q.poll());
626 >        }
627 >    }
628 >
629 >    void checkToArray2(ArrayBlockingQueue q) {
630 >        int size = q.size();
631 >        Integer[] a1 = (size == 0) ? null : new Integer[size - 1];
632 >        Integer[] a2 = new Integer[size];
633 >        Integer[] a3 = new Integer[size + 2];
634 >        if (size > 0) Arrays.fill(a1, 42);
635 >        Arrays.fill(a2, 42);
636 >        Arrays.fill(a3, 42);
637 >        Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1);
638 >        Integer[] b2 = (Integer[]) q.toArray(a2);
639 >        Integer[] b3 = (Integer[]) q.toArray(a3);
640 >        assertSame(a2, b2);
641 >        assertSame(a3, b3);
642 >        Iterator it = q.iterator();
643 >        for (int i = 0; i < size; i++) {
644 >            Integer x = (Integer) it.next();
645 >            assertSame(b1[i], x);
646 >            assertEquals(b1[0] + i, (int) x);
647 >            assertSame(b2[i], x);
648 >            assertSame(b3[i], x);
649 >        }
650 >        assertNull(a3[size]);
651 >        assertEquals(42, (int) a3[size + 1]);
652 >        if (size > 0) {
653 >            assertNotSame(a1, b1);
654 >            assertEquals(size, b1.length);
655 >            for (int i = 0; i < a1.length; i++) {
656 >                assertEquals(42, (int) a1[i]);
657 >            }
658 >        }
659      }
660  
661      /**
662 <     * toArray(null) throws NPE
662 >     * toArray(a) contains all elements in FIFO order
663       */
664 <    public void testToArray_BadArg() {
665 <        ArrayBlockingQueue q = populatedQueue(SIZE);
666 <        try {
667 <            Object o[] = q.toArray(null);
668 <            shouldThrow();
669 <        } catch (NullPointerException success) {}
664 >    public void testToArray2() {
665 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
666 >        for (int i = 0; i < SIZE; i++) {
667 >            checkToArray2(q);
668 >            q.add(i);
669 >        }
670 >        // Provoke wraparound
671 >        for (int i = 0; i < SIZE; i++) {
672 >            checkToArray2(q);
673 >            assertEquals(i, q.poll());
674 >            checkToArray2(q);
675 >            q.add(SIZE + i);
676 >        }
677 >        for (int i = 0; i < SIZE; i++) {
678 >            checkToArray2(q);
679 >            assertEquals(SIZE + i, q.poll());
680 >        }
681      }
682  
683      /**
684 <     * toArray with incompatible array type throws CCE
684 >     * toArray(incompatible array type) throws ArrayStoreException
685       */
686      public void testToArray1_BadArg() {
687          ArrayBlockingQueue q = populatedQueue(SIZE);
688          try {
689 <            Object o[] = q.toArray(new String[10]);
689 >            q.toArray(new String[10]);
690              shouldThrow();
691          } catch (ArrayStoreException success) {}
692      }
693  
668
694      /**
695       * iterator iterates through all elements
696       */
697      public void testIterator() throws InterruptedException {
698          ArrayBlockingQueue q = populatedQueue(SIZE);
699          Iterator it = q.iterator();
700 <        while (it.hasNext()) {
700 >        int i;
701 >        for (i = 0; it.hasNext(); i++)
702 >            assertTrue(q.contains(it.next()));
703 >        assertEquals(i, SIZE);
704 >        assertIteratorExhausted(it);
705 >
706 >        it = q.iterator();
707 >        for (i = 0; it.hasNext(); i++)
708              assertEquals(it.next(), q.take());
709 <        }
709 >        assertEquals(i, SIZE);
710 >        assertIteratorExhausted(it);
711 >    }
712 >
713 >    /**
714 >     * iterator of empty collection has no elements
715 >     */
716 >    public void testEmptyIterator() {
717 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
718      }
719  
720      /**
# Line 729 | Line 769 | public class ArrayBlockingQueueTest exte
769          assertEquals(0, q.size());
770      }
771  
732
772      /**
773       * toString contains toStrings of elements
774       */
# Line 737 | Line 776 | public class ArrayBlockingQueueTest exte
776          ArrayBlockingQueue q = populatedQueue(SIZE);
777          String s = q.toString();
778          for (int i = 0; i < SIZE; ++i) {
779 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
779 >            assertTrue(s.contains(String.valueOf(i)));
780          }
781      }
782  
744
783      /**
784       * offer transfers elements across Executor tasks
785       */
# Line 749 | Line 787 | public class ArrayBlockingQueueTest exte
787          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
788          q.add(one);
789          q.add(two);
790 <        ExecutorService executor = Executors.newFixedThreadPool(2);
791 <        executor.execute(new CheckedRunnable() {
792 <            public void realRun() throws InterruptedException {
793 <                assertFalse(q.offer(three));
794 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
795 <                assertEquals(0, q.remainingCapacity());
796 <            }});
797 <
798 <        executor.execute(new CheckedRunnable() {
799 <            public void realRun() throws InterruptedException {
800 <                Thread.sleep(SMALL_DELAY_MS);
801 <                assertSame(one, q.take());
802 <            }});
803 <
804 <        joinPool(executor);
790 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
791 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
792 >        try (PoolCleaner cleaner = cleaner(executor)) {
793 >            executor.execute(new CheckedRunnable() {
794 >                public void realRun() throws InterruptedException {
795 >                    assertFalse(q.offer(three));
796 >                    threadsStarted.await();
797 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
798 >                    assertEquals(0, q.remainingCapacity());
799 >                }});
800 >
801 >            executor.execute(new CheckedRunnable() {
802 >                public void realRun() throws InterruptedException {
803 >                    threadsStarted.await();
804 >                    assertEquals(0, q.remainingCapacity());
805 >                    assertSame(one, q.take());
806 >                }});
807 >        }
808      }
809  
810      /**
811 <     * poll retrieves elements across Executor threads
811 >     * timed poll retrieves elements across Executor threads
812       */
813      public void testPollInExecutor() {
814          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
815 <        ExecutorService executor = Executors.newFixedThreadPool(2);
816 <        executor.execute(new CheckedRunnable() {
817 <            public void realRun() throws InterruptedException {
818 <                assertNull(q.poll());
819 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
820 <                assertTrue(q.isEmpty());
821 <            }});
822 <
823 <        executor.execute(new CheckedRunnable() {
824 <            public void realRun() throws InterruptedException {
825 <                Thread.sleep(SMALL_DELAY_MS);
826 <                q.put(one);
827 <            }});
828 <
829 <        joinPool(executor);
815 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
816 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
817 >        try (PoolCleaner cleaner = cleaner(executor)) {
818 >            executor.execute(new CheckedRunnable() {
819 >                public void realRun() throws InterruptedException {
820 >                    assertNull(q.poll());
821 >                    threadsStarted.await();
822 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
823 >                    checkEmpty(q);
824 >                }});
825 >
826 >            executor.execute(new CheckedRunnable() {
827 >                public void realRun() throws InterruptedException {
828 >                    threadsStarted.await();
829 >                    q.put(one);
830 >                }});
831 >        }
832      }
833  
834      /**
835       * A deserialized serialized queue has same elements in same order
836       */
837      public void testSerialization() throws Exception {
838 <        ArrayBlockingQueue q = populatedQueue(SIZE);
839 <
797 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
798 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
799 <        out.writeObject(q);
800 <        out.close();
801 <
802 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
803 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
804 <        ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
805 <        assertEquals(q.size(), r.size());
806 <        while (!q.isEmpty())
807 <            assertEquals(q.remove(), r.remove());
808 <    }
838 >        Queue x = populatedQueue(SIZE);
839 >        Queue y = serialClone(x);
840  
841 <    /**
842 <     * drainTo(null) throws NPE
843 <     */
844 <    public void testDrainToNull() {
845 <        ArrayBlockingQueue q = populatedQueue(SIZE);
846 <        try {
847 <            q.drainTo(null);
848 <            shouldThrow();
849 <        } catch (NullPointerException success) {}
819 <    }
820 <
821 <    /**
822 <     * drainTo(this) throws IAE
823 <     */
824 <    public void testDrainToSelf() {
825 <        ArrayBlockingQueue q = populatedQueue(SIZE);
826 <        try {
827 <            q.drainTo(q);
828 <            shouldThrow();
829 <        } catch (IllegalArgumentException success) {}
841 >        assertNotSame(x, y);
842 >        assertEquals(x.size(), y.size());
843 >        assertEquals(x.toString(), y.toString());
844 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
845 >        while (!x.isEmpty()) {
846 >            assertFalse(y.isEmpty());
847 >            assertEquals(x.remove(), y.remove());
848 >        }
849 >        assertTrue(y.isEmpty());
850      }
851  
852      /**
# Line 836 | Line 856 | public class ArrayBlockingQueueTest exte
856          ArrayBlockingQueue q = populatedQueue(SIZE);
857          ArrayList l = new ArrayList();
858          q.drainTo(l);
859 <        assertEquals(q.size(), 0);
860 <        assertEquals(l.size(), SIZE);
859 >        assertEquals(0, q.size());
860 >        assertEquals(SIZE, l.size());
861          for (int i = 0; i < SIZE; ++i)
862              assertEquals(l.get(i), new Integer(i));
863          q.add(zero);
# Line 847 | Line 867 | public class ArrayBlockingQueueTest exte
867          assertTrue(q.contains(one));
868          l.clear();
869          q.drainTo(l);
870 <        assertEquals(q.size(), 0);
871 <        assertEquals(l.size(), 2);
870 >        assertEquals(0, q.size());
871 >        assertEquals(2, l.size());
872          for (int i = 0; i < 2; ++i)
873              assertEquals(l.get(i), new Integer(i));
874      }
# Line 860 | Line 880 | public class ArrayBlockingQueueTest exte
880          final ArrayBlockingQueue q = populatedQueue(SIZE);
881          Thread t = new Thread(new CheckedRunnable() {
882              public void realRun() throws InterruptedException {
883 <                q.put(new Integer(SIZE+1));
883 >                q.put(new Integer(SIZE + 1));
884              }});
885  
886          t.start();
# Line 874 | Line 894 | public class ArrayBlockingQueueTest exte
894      }
895  
896      /**
877     * drainTo(null, n) throws NPE
878     */
879    public void testDrainToNullN() {
880        ArrayBlockingQueue q = populatedQueue(SIZE);
881        try {
882            q.drainTo(null, 0);
883            shouldThrow();
884        } catch (NullPointerException success) {}
885    }
886
887    /**
888     * drainTo(this, n) throws IAE
889     */
890    public void testDrainToSelfN() {
891        ArrayBlockingQueue q = populatedQueue(SIZE);
892        try {
893            q.drainTo(q, 0);
894            shouldThrow();
895        } catch (IllegalArgumentException success) {}
896    }
897
898    /**
897       * drainTo(c, n) empties first min(n, size) elements of queue into c
898       */
899      public void testDrainToN() {
900 <        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
900 >        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
901          for (int i = 0; i < SIZE + 2; ++i) {
902              for (int j = 0; j < SIZE; j++)
903                  assertTrue(q.offer(new Integer(j)));
904              ArrayList l = new ArrayList();
905              q.drainTo(l, i);
906 <            int k = (i < SIZE)? i : SIZE;
907 <            assertEquals(l.size(), k);
908 <            assertEquals(q.size(), SIZE-k);
906 >            int k = (i < SIZE) ? i : SIZE;
907 >            assertEquals(k, l.size());
908 >            assertEquals(SIZE - k, q.size());
909              for (int j = 0; j < k; ++j)
910                  assertEquals(l.get(j), new Integer(j));
911 <            while (q.poll() != null) ;
911 >            do {} while (q.poll() != null);
912          }
913      }
914  
915 +    /**
916 +     * remove(null), contains(null) always return false
917 +     */
918 +    public void testNeverContainsNull() {
919 +        Collection<?>[] qs = {
920 +            new ArrayBlockingQueue<Object>(10),
921 +            populatedQueue(2),
922 +        };
923 +
924 +        for (Collection<?> q : qs) {
925 +            assertFalse(q.contains(null));
926 +            assertFalse(q.remove(null));
927 +        }
928 +    }
929   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines