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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.38 by jsr166, Thu Nov 18 20:21:53 2010 UTC vs.
Revision 1.81 by jsr166, Thu Sep 5 21:11:13 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 import junit.framework.*;
10 import java.util.*;
11 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.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedBlockingQueue;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingQueueTest extends JSR166TestCase {
26  
# Line 22 | Line 32 | public class LinkedBlockingQueueTest ext
32  
33      public static class Bounded extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new LinkedBlockingQueue(20);
35 >            return new LinkedBlockingQueue(SIZE);
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() {
44 +        class Implementation implements CollectionImplementation {
45 +            public Class<?> klazz() { return LinkedBlockingQueue.class; }
46 +            public Collection emptyCollection() { return new LinkedBlockingQueue(); }
47 +            public Object makeElement(int i) { return i; }
48 +            public boolean isConcurrent() { return true; }
49 +            public boolean permitsNulls() { return false; }
50 +        }
51          return newTestSuite(LinkedBlockingQueueTest.class,
52                              new Unbounded().testSuite(),
53 <                            new Bounded().testSuite());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
39
57      /**
58 <     * Create a queue of given size containing consecutive
59 <     * Integers 0 ... n.
58 >     * Returns a new queue of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingQueue<Integer> populatedQueue(int n) {
62 <        LinkedBlockingQueue<Integer> q =
46 <            new LinkedBlockingQueue<Integer>(n);
61 >    private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62 >        LinkedBlockingQueue<Integer> q = new LinkedBlockingQueue<>(n);
63          assertTrue(q.isEmpty());
64          for (int i = 0; i < n; i++)
65              assertTrue(q.offer(new Integer(i)));
66          assertFalse(q.isEmpty());
67          assertEquals(0, q.remainingCapacity());
68          assertEquals(n, q.size());
69 +        assertEquals((Integer) 0, q.peek());
70          return q;
71      }
72  
# Line 63 | Line 80 | public class LinkedBlockingQueueTest ext
80      }
81  
82      /**
83 <     * Constructor throws IAE if capacity argument nonpositive
83 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
84       */
85      public void testConstructor2() {
86          try {
87 <            LinkedBlockingQueue q = new LinkedBlockingQueue(0);
87 >            new LinkedBlockingQueue(0);
88              shouldThrow();
89          } catch (IllegalArgumentException success) {}
90      }
91  
92      /**
93 <     * Initializing from null Collection throws NPE
93 >     * Initializing from null Collection throws NullPointerException
94       */
95      public void testConstructor3() {
96          try {
97 <            LinkedBlockingQueue q = new LinkedBlockingQueue(null);
97 >            new LinkedBlockingQueue(null);
98              shouldThrow();
99          } catch (NullPointerException success) {}
100      }
101  
102      /**
103 <     * Initializing from Collection of null elements throws NPE
103 >     * Initializing from Collection of null elements throws NullPointerException
104       */
105      public void testConstructor4() {
106 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
107          try {
108 <            Integer[] ints = new Integer[SIZE];
91 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
108 >            new LinkedBlockingQueue(elements);
109              shouldThrow();
110          } catch (NullPointerException success) {}
111      }
112  
113      /**
114 <     * Initializing from Collection with some null elements throws NPE
114 >     * Initializing from Collection with some null elements throws
115 >     * NullPointerException
116       */
117      public void testConstructor5() {
118 +        Integer[] ints = new Integer[SIZE];
119 +        for (int i = 0; i < SIZE - 1; ++i)
120 +            ints[i] = new Integer(i);
121 +        Collection<Integer> elements = Arrays.asList(ints);
122          try {
123 <            Integer[] ints = new Integer[SIZE];
102 <            for (int i = 0; i < SIZE-1; ++i)
103 <                ints[i] = new Integer(i);
104 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
123 >            new LinkedBlockingQueue(elements);
124              shouldThrow();
125          } catch (NullPointerException success) {}
126      }
# Line 137 | Line 156 | public class LinkedBlockingQueueTest ext
156       * remainingCapacity decreases on add, increases on remove
157       */
158      public void testRemainingCapacity() {
159 <        LinkedBlockingQueue q = populatedQueue(SIZE);
159 >        BlockingQueue q = populatedQueue(SIZE);
160          for (int i = 0; i < SIZE; ++i) {
161              assertEquals(i, q.remainingCapacity());
162 <            assertEquals(SIZE-i, q.size());
163 <            q.remove();
162 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
163 >            assertEquals(i, q.remove());
164          }
165          for (int i = 0; i < SIZE; ++i) {
166 <            assertEquals(SIZE-i, q.remainingCapacity());
167 <            assertEquals(i, q.size());
168 <            q.add(new Integer(i));
166 >            assertEquals(SIZE - i, q.remainingCapacity());
167 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
168 >            assertTrue(q.add(i));
169          }
170      }
171  
172      /**
154     * offer(null) throws NPE
155     */
156    public void testOfferNull() {
157        try {
158            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
159            q.offer(null);
160            shouldThrow();
161        } catch (NullPointerException success) {}
162    }
163
164    /**
165     * add(null) throws NPE
166     */
167    public void testAddNull() {
168        try {
169            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
170            q.add(null);
171            shouldThrow();
172        } catch (NullPointerException success) {}
173    }
174
175    /**
173       * Offer succeeds if not full; fails if full
174       */
175      public void testOffer() {
# Line 182 | Line 179 | public class LinkedBlockingQueueTest ext
179      }
180  
181      /**
182 <     * add succeeds if not full; throws ISE if full
182 >     * add succeeds if not full; throws IllegalStateException if full
183       */
184      public void testAdd() {
185 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
186 +        for (int i = 0; i < SIZE; ++i)
187 +            assertTrue(q.add(new Integer(i)));
188 +        assertEquals(0, q.remainingCapacity());
189          try {
189            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
190            for (int i = 0; i < SIZE; ++i) {
191                assertTrue(q.add(new Integer(i)));
192            }
193            assertEquals(0, q.remainingCapacity());
190              q.add(new Integer(SIZE));
191              shouldThrow();
192          } catch (IllegalStateException success) {}
193      }
194  
195      /**
196 <     * addAll(null) throws NPE
201 <     */
202 <    public void testAddAll1() {
203 <        try {
204 <            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
205 <            q.addAll(null);
206 <            shouldThrow();
207 <        } catch (NullPointerException success) {}
208 <    }
209 <
210 <    /**
211 <     * addAll(this) throws IAE
196 >     * addAll(this) throws IllegalArgumentException
197       */
198      public void testAddAllSelf() {
199 +        LinkedBlockingQueue q = populatedQueue(SIZE);
200          try {
215            LinkedBlockingQueue q = populatedQueue(SIZE);
201              q.addAll(q);
202              shouldThrow();
203          } catch (IllegalArgumentException success) {}
204      }
205  
206      /**
222     * addAll of a collection with null elements throws NPE
223     */
224    public void testAddAll2() {
225        try {
226            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
227            Integer[] ints = new Integer[SIZE];
228            q.addAll(Arrays.asList(ints));
229            shouldThrow();
230        } catch (NullPointerException success) {}
231    }
232
233    /**
207       * addAll of a collection with any null elements throws NPE after
208       * possibly adding some elements
209       */
210      public void testAddAll3() {
211 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
212 +        Integer[] ints = new Integer[SIZE];
213 +        for (int i = 0; i < SIZE - 1; ++i)
214 +            ints[i] = new Integer(i);
215 +        Collection<Integer> elements = Arrays.asList(ints);
216          try {
217 <            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
240 <            Integer[] ints = new Integer[SIZE];
241 <            for (int i = 0; i < SIZE-1; ++i)
242 <                ints[i] = new Integer(i);
243 <            q.addAll(Arrays.asList(ints));
217 >            q.addAll(elements);
218              shouldThrow();
219          } catch (NullPointerException success) {}
220      }
221  
222      /**
223 <     * addAll throws ISE if not enough room
223 >     * addAll throws IllegalStateException if not enough room
224       */
225      public void testAddAll4() {
226 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
227 +        Integer[] ints = new Integer[SIZE];
228 +        for (int i = 0; i < SIZE; ++i)
229 +            ints[i] = new Integer(i);
230 +        Collection<Integer> elements = Arrays.asList(ints);
231          try {
232 <            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
254 <            Integer[] ints = new Integer[SIZE];
255 <            for (int i = 0; i < SIZE; ++i)
256 <                ints[i] = new Integer(i);
257 <            q.addAll(Arrays.asList(ints));
232 >            q.addAll(elements);
233              shouldThrow();
234          } catch (IllegalStateException success) {}
235      }
# Line 275 | Line 250 | public class LinkedBlockingQueueTest ext
250      }
251  
252      /**
278     * put(null) throws NPE
279     */
280     public void testPutNull() throws InterruptedException {
281        try {
282            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
283            q.put(null);
284            shouldThrow();
285        } catch (NullPointerException success) {}
286     }
287
288    /**
253       * all elements successfully put are contained
254       */
255      public void testPut() throws InterruptedException {
256          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
257          for (int i = 0; i < SIZE; ++i) {
258 <            Integer I = new Integer(i);
259 <            q.put(I);
260 <            assertTrue(q.contains(I));
258 >            Integer x = new Integer(i);
259 >            q.put(x);
260 >            assertTrue(q.contains(x));
261          }
262          assertEquals(0, q.remainingCapacity());
263      }
# Line 303 | Line 267 | public class LinkedBlockingQueueTest ext
267       */
268      public void testBlockingPut() throws InterruptedException {
269          final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
270 <        Thread t = new Thread(new CheckedRunnable() {
270 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
271 >        Thread t = newStartedThread(new CheckedRunnable() {
272              public void realRun() throws InterruptedException {
273                  for (int i = 0; i < SIZE; ++i)
274                      q.put(i);
275                  assertEquals(SIZE, q.size());
276                  assertEquals(0, q.remainingCapacity());
277 +
278 +                Thread.currentThread().interrupt();
279 +                try {
280 +                    q.put(99);
281 +                    shouldThrow();
282 +                } catch (InterruptedException success) {}
283 +                assertFalse(Thread.interrupted());
284 +
285 +                pleaseInterrupt.countDown();
286                  try {
287                      q.put(99);
288                      shouldThrow();
289                  } catch (InterruptedException success) {}
290 +                assertFalse(Thread.interrupted());
291              }});
292  
293 <        t.start();
294 <        Thread.sleep(SHORT_DELAY_MS);
293 >        await(pleaseInterrupt);
294 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
295          t.interrupt();
296 <        t.join();
296 >        awaitTermination(t);
297          assertEquals(SIZE, q.size());
298          assertEquals(0, q.remainingCapacity());
299      }
300  
301      /**
302 <     * put blocks waiting for take when full
302 >     * put blocks interruptibly waiting for take when full
303       */
304      public void testPutWithTake() throws InterruptedException {
305          final int capacity = 2;
306          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
307 <        Thread t = new Thread(new CheckedRunnable() {
307 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
308 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
309 >        Thread t = newStartedThread(new CheckedRunnable() {
310              public void realRun() throws InterruptedException {
311 <                for (int i = 0; i < capacity + 1; i++)
311 >                for (int i = 0; i < capacity; i++)
312                      q.put(i);
313 +                pleaseTake.countDown();
314 +                q.put(86);
315 +
316 +                Thread.currentThread().interrupt();
317                  try {
318                      q.put(99);
319                      shouldThrow();
320                  } catch (InterruptedException success) {}
321 +                assertFalse(Thread.interrupted());
322 +
323 +                pleaseInterrupt.countDown();
324 +                try {
325 +                    q.put(99);
326 +                    shouldThrow();
327 +                } catch (InterruptedException success) {}
328 +                assertFalse(Thread.interrupted());
329              }});
330  
331 <        t.start();
332 <        Thread.sleep(SHORT_DELAY_MS);
344 <        assertEquals(q.remainingCapacity(), 0);
331 >        await(pleaseTake);
332 >        assertEquals(0, q.remainingCapacity());
333          assertEquals(0, q.take());
334 <        Thread.sleep(SHORT_DELAY_MS);
334 >
335 >        await(pleaseInterrupt);
336 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
337          t.interrupt();
338 <        t.join();
339 <        assertEquals(q.remainingCapacity(), 0);
338 >        awaitTermination(t);
339 >        assertEquals(0, q.remainingCapacity());
340      }
341  
342      /**
343       * timed offer times out if full and elements not taken
344       */
345 <    public void testTimedOffer() throws InterruptedException {
345 >    public void testTimedOffer() {
346          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
347 <        Thread t = new Thread(new CheckedRunnable() {
347 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
348 >        Thread t = newStartedThread(new CheckedRunnable() {
349              public void realRun() throws InterruptedException {
350                  q.put(new Object());
351                  q.put(new Object());
352 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
352 >                long startTime = System.nanoTime();
353 >
354 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
355 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
356 >
357 >                Thread.currentThread().interrupt();
358 >                try {
359 >                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
360 >                    shouldThrow();
361 >                } catch (InterruptedException success) {}
362 >                assertFalse(Thread.interrupted());
363 >
364 >                pleaseInterrupt.countDown();
365                  try {
366 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
366 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
367                      shouldThrow();
368                  } catch (InterruptedException success) {}
369 +                assertFalse(Thread.interrupted());
370              }});
371  
372 <        t.start();
373 <        Thread.sleep(SMALL_DELAY_MS);
372 >        await(pleaseInterrupt);
373 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
374          t.interrupt();
375 <        t.join();
375 >        awaitTermination(t);
376      }
377  
378      /**
# Line 385 | Line 389 | public class LinkedBlockingQueueTest ext
389       * Take removes existing elements until empty, then blocks interruptibly
390       */
391      public void testBlockingTake() throws InterruptedException {
392 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
393 <        Thread t = new Thread(new CheckedRunnable() {
392 >        final BlockingQueue q = populatedQueue(SIZE);
393 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
394 >        Thread t = newStartedThread(new CheckedRunnable() {
395              public void realRun() throws InterruptedException {
396 <                for (int i = 0; i < SIZE; ++i) {
397 <                    assertEquals(i, q.take());
398 <                }
396 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
397 >
398 >                Thread.currentThread().interrupt();
399 >                try {
400 >                    q.take();
401 >                    shouldThrow();
402 >                } catch (InterruptedException success) {}
403 >                assertFalse(Thread.interrupted());
404 >
405 >                pleaseInterrupt.countDown();
406                  try {
407                      q.take();
408                      shouldThrow();
409                  } catch (InterruptedException success) {}
410 +                assertFalse(Thread.interrupted());
411              }});
412  
413 <        t.start();
414 <        Thread.sleep(SHORT_DELAY_MS);
413 >        await(pleaseInterrupt);
414 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
415          t.interrupt();
416 <        t.join();
416 >        awaitTermination(t);
417      }
418  
419      /**
# Line 429 | Line 442 | public class LinkedBlockingQueueTest ext
442       * timed poll with nonzero timeout succeeds when non-empty, else times out
443       */
444      public void testTimedPoll() throws InterruptedException {
445 <        LinkedBlockingQueue q = populatedQueue(SIZE);
445 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
446          for (int i = 0; i < SIZE; ++i) {
447 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
448 <        }
449 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
447 >            long startTime = System.nanoTime();
448 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
449 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
450 >        }
451 >        long startTime = System.nanoTime();
452 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
453 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
454 >        checkEmpty(q);
455      }
456  
457      /**
# Line 441 | Line 459 | public class LinkedBlockingQueueTest ext
459       * returning timeout status
460       */
461      public void testInterruptedTimedPoll() throws InterruptedException {
462 <        Thread t = new Thread(new CheckedRunnable() {
462 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
463 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
464 >        Thread t = newStartedThread(new CheckedRunnable() {
465              public void realRun() throws InterruptedException {
466 <                LinkedBlockingQueue q = populatedQueue(SIZE);
467 <                for (int i = 0; i < SIZE; ++i) {
468 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
469 <                }
466 >                for (int i = 0; i < SIZE; i++)
467 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
468 >
469 >                Thread.currentThread().interrupt();
470 >                try {
471 >                    q.poll(randomTimeout(), randomTimeUnit());
472 >                    shouldThrow();
473 >                } catch (InterruptedException success) {}
474 >                assertFalse(Thread.interrupted());
475 >
476 >                pleaseInterrupt.countDown();
477                  try {
478 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
478 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
479                      shouldThrow();
480                  } catch (InterruptedException success) {}
481 +                assertFalse(Thread.interrupted());
482              }});
483  
484 <        t.start();
485 <        Thread.sleep(SHORT_DELAY_MS);
484 >        await(pleaseInterrupt);
485 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
486          t.interrupt();
487 <        t.join();
487 >        awaitTermination(t);
488 >        checkEmpty(q);
489      }
490  
491      /**
# Line 503 | Line 532 | public class LinkedBlockingQueueTest ext
532      }
533  
534      /**
506     * remove(x) removes x and returns true if present
507     */
508    public void testRemoveElement() {
509        LinkedBlockingQueue q = populatedQueue(SIZE);
510        for (int i = 1; i < SIZE; i+=2) {
511            assertTrue(q.contains(i));
512            assertTrue(q.remove(i));
513            assertFalse(q.contains(i));
514            assertTrue(q.contains(i-1));
515        }
516        for (int i = 0; i < SIZE; i+=2) {
517            assertTrue(q.contains(i));
518            assertTrue(q.remove(i));
519            assertFalse(q.contains(i));
520            assertFalse(q.remove(i+1));
521            assertFalse(q.contains(i+1));
522        }
523        assertTrue(q.isEmpty());
524    }
525
526    /**
535       * An add following remove(x) succeeds
536       */
537      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 533 | Line 541 | public class LinkedBlockingQueueTest ext
541          assertTrue(q.remove(new Integer(1)));
542          assertTrue(q.remove(new Integer(2)));
543          assertTrue(q.add(new Integer(3)));
544 <        assertTrue(q.take() != null);
544 >        assertNotNull(q.take());
545      }
546  
547      /**
# Line 592 | Line 600 | public class LinkedBlockingQueueTest ext
600                  assertTrue(changed);
601  
602              assertTrue(q.containsAll(p));
603 <            assertEquals(SIZE-i, q.size());
603 >            assertEquals(SIZE - i, q.size());
604              p.remove();
605          }
606      }
# Line 605 | Line 613 | public class LinkedBlockingQueueTest ext
613              LinkedBlockingQueue q = populatedQueue(SIZE);
614              LinkedBlockingQueue p = populatedQueue(i);
615              assertTrue(q.removeAll(p));
616 <            assertEquals(SIZE-i, q.size());
616 >            assertEquals(SIZE - i, q.size());
617              for (int j = 0; j < i; ++j) {
618 <                Integer I = (Integer)(p.remove());
619 <                assertFalse(q.contains(I));
618 >                Integer x = (Integer)(p.remove());
619 >                assertFalse(q.contains(x));
620              }
621          }
622      }
# Line 618 | Line 626 | public class LinkedBlockingQueueTest ext
626       */
627      public void testToArray() {
628          LinkedBlockingQueue q = populatedQueue(SIZE);
629 <        Object[] o = q.toArray();
630 <        for (int i = 0; i < o.length; i++)
631 <            assertSame(o[i], q.poll());
629 >        Object[] a = q.toArray();
630 >        assertSame(Object[].class, a.getClass());
631 >        for (Object o : a)
632 >            assertSame(o, q.poll());
633 >        assertTrue(q.isEmpty());
634      }
635  
636      /**
# Line 631 | Line 641 | public class LinkedBlockingQueueTest ext
641          Integer[] ints = new Integer[SIZE];
642          Integer[] array = q.toArray(ints);
643          assertSame(ints, array);
644 <        for (int i = 0; i < ints.length; i++)
645 <            assertSame(ints[i], q.poll());
646 <    }
637 <
638 <    /**
639 <     * toArray(null) throws NullPointerException
640 <     */
641 <    public void testToArray_NullArg() {
642 <        LinkedBlockingQueue q = populatedQueue(SIZE);
643 <        try {
644 <            q.toArray(null);
645 <            shouldThrow();
646 <        } catch (NullPointerException success) {}
644 >        for (Integer o : ints)
645 >            assertSame(o, q.poll());
646 >        assertTrue(q.isEmpty());
647      }
648  
649      /**
# Line 657 | Line 657 | public class LinkedBlockingQueueTest ext
657          } catch (ArrayStoreException success) {}
658      }
659  
660
660      /**
661       * iterator iterates through all elements
662       */
663      public void testIterator() throws InterruptedException {
664          LinkedBlockingQueue q = populatedQueue(SIZE);
665          Iterator it = q.iterator();
666 <        while (it.hasNext()) {
666 >        int i;
667 >        for (i = 0; it.hasNext(); i++)
668 >            assertTrue(q.contains(it.next()));
669 >        assertEquals(i, SIZE);
670 >        assertIteratorExhausted(it);
671 >
672 >        it = q.iterator();
673 >        for (i = 0; it.hasNext(); i++)
674              assertEquals(it.next(), q.take());
675 <        }
675 >        assertEquals(i, SIZE);
676 >        assertIteratorExhausted(it);
677 >    }
678 >
679 >    /**
680 >     * iterator of empty collection has no elements
681 >     */
682 >    public void testEmptyIterator() {
683 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
684      }
685  
686      /**
# Line 688 | Line 702 | public class LinkedBlockingQueueTest ext
702          assertFalse(it.hasNext());
703      }
704  
691
705      /**
706       * iterator ordering is FIFO
707       */
# Line 720 | Line 733 | public class LinkedBlockingQueueTest ext
733          assertEquals(0, q.size());
734      }
735  
723
736      /**
737       * toString contains toStrings of elements
738       */
# Line 728 | Line 740 | public class LinkedBlockingQueueTest ext
740          LinkedBlockingQueue q = populatedQueue(SIZE);
741          String s = q.toString();
742          for (int i = 0; i < SIZE; ++i) {
743 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
743 >            assertTrue(s.contains(String.valueOf(i)));
744          }
745      }
746  
735
747      /**
748       * offer transfers elements across Executor tasks
749       */
# Line 740 | Line 751 | public class LinkedBlockingQueueTest ext
751          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
752          q.add(one);
753          q.add(two);
754 <        ExecutorService executor = Executors.newFixedThreadPool(2);
755 <        executor.execute(new CheckedRunnable() {
756 <            public void realRun() throws InterruptedException {
757 <                assertFalse(q.offer(three));
758 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
759 <                assertEquals(0, q.remainingCapacity());
760 <            }});
761 <
762 <        executor.execute(new CheckedRunnable() {
763 <            public void realRun() throws InterruptedException {
764 <                Thread.sleep(SMALL_DELAY_MS);
765 <                assertSame(one, q.take());
766 <            }});
767 <
768 <        joinPool(executor);
754 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
755 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
756 >        try (PoolCleaner cleaner = cleaner(executor)) {
757 >            executor.execute(new CheckedRunnable() {
758 >                public void realRun() throws InterruptedException {
759 >                    assertFalse(q.offer(three));
760 >                    threadsStarted.await();
761 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
762 >                    assertEquals(0, q.remainingCapacity());
763 >                }});
764 >
765 >            executor.execute(new CheckedRunnable() {
766 >                public void realRun() throws InterruptedException {
767 >                    threadsStarted.await();
768 >                    assertSame(one, q.take());
769 >                }});
770 >        }
771      }
772  
773      /**
774 <     * poll retrieves elements across Executor threads
774 >     * timed poll retrieves elements across Executor threads
775       */
776      public void testPollInExecutor() {
777          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
778 <        ExecutorService executor = Executors.newFixedThreadPool(2);
779 <        executor.execute(new CheckedRunnable() {
780 <            public void realRun() throws InterruptedException {
781 <                assertNull(q.poll());
782 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
783 <                assertTrue(q.isEmpty());
784 <            }});
785 <
786 <        executor.execute(new CheckedRunnable() {
787 <            public void realRun() throws InterruptedException {
788 <                Thread.sleep(SMALL_DELAY_MS);
789 <                q.put(one);
790 <            }});
791 <
792 <        joinPool(executor);
778 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
779 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
780 >        try (PoolCleaner cleaner = cleaner(executor)) {
781 >            executor.execute(new CheckedRunnable() {
782 >                public void realRun() throws InterruptedException {
783 >                    assertNull(q.poll());
784 >                    threadsStarted.await();
785 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
786 >                    checkEmpty(q);
787 >                }});
788 >
789 >            executor.execute(new CheckedRunnable() {
790 >                public void realRun() throws InterruptedException {
791 >                    threadsStarted.await();
792 >                    q.put(one);
793 >                }});
794 >        }
795      }
796  
797      /**
798 <     * A deserialized serialized queue has same elements in same order
798 >     * A deserialized/reserialized queue has same elements in same order
799       */
800      public void testSerialization() throws Exception {
801 <        LinkedBlockingQueue q = populatedQueue(SIZE);
802 <
788 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
789 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
790 <        out.writeObject(q);
791 <        out.close();
792 <
793 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
794 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
795 <        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
796 <        assertEquals(q.size(), r.size());
797 <        while (!q.isEmpty())
798 <            assertEquals(q.remove(), r.remove());
799 <    }
800 <
801 <    /**
802 <     * drainTo(null) throws NPE
803 <     */
804 <    public void testDrainToNull() {
805 <        LinkedBlockingQueue q = populatedQueue(SIZE);
806 <        try {
807 <            q.drainTo(null);
808 <            shouldThrow();
809 <        } catch (NullPointerException success) {}
810 <    }
801 >        Queue x = populatedQueue(SIZE);
802 >        Queue y = serialClone(x);
803  
804 <    /**
805 <     * drainTo(this) throws IAE
806 <     */
807 <    public void testDrainToSelf() {
808 <        LinkedBlockingQueue q = populatedQueue(SIZE);
809 <        try {
810 <            q.drainTo(q);
811 <            shouldThrow();
812 <        } catch (IllegalArgumentException success) {}
804 >        assertNotSame(x, y);
805 >        assertEquals(x.size(), y.size());
806 >        assertEquals(x.toString(), y.toString());
807 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
808 >        while (!x.isEmpty()) {
809 >            assertFalse(y.isEmpty());
810 >            assertEquals(x.remove(), y.remove());
811 >        }
812 >        assertTrue(y.isEmpty());
813      }
814  
815      /**
# Line 827 | Line 819 | public class LinkedBlockingQueueTest ext
819          LinkedBlockingQueue q = populatedQueue(SIZE);
820          ArrayList l = new ArrayList();
821          q.drainTo(l);
822 <        assertEquals(q.size(), 0);
823 <        assertEquals(l.size(), SIZE);
822 >        assertEquals(0, q.size());
823 >        assertEquals(SIZE, l.size());
824          for (int i = 0; i < SIZE; ++i)
825              assertEquals(l.get(i), new Integer(i));
826          q.add(zero);
# Line 838 | Line 830 | public class LinkedBlockingQueueTest ext
830          assertTrue(q.contains(one));
831          l.clear();
832          q.drainTo(l);
833 <        assertEquals(q.size(), 0);
834 <        assertEquals(l.size(), 2);
833 >        assertEquals(0, q.size());
834 >        assertEquals(2, l.size());
835          for (int i = 0; i < 2; ++i)
836              assertEquals(l.get(i), new Integer(i));
837      }
# Line 851 | Line 843 | public class LinkedBlockingQueueTest ext
843          final LinkedBlockingQueue q = populatedQueue(SIZE);
844          Thread t = new Thread(new CheckedRunnable() {
845              public void realRun() throws InterruptedException {
846 <                q.put(new Integer(SIZE+1));
846 >                q.put(new Integer(SIZE + 1));
847              }});
848  
849          t.start();
# Line 865 | Line 857 | public class LinkedBlockingQueueTest ext
857      }
858  
859      /**
868     * drainTo(null, n) throws NPE
869     */
870    public void testDrainToNullN() {
871        LinkedBlockingQueue q = populatedQueue(SIZE);
872        try {
873            q.drainTo(null, 0);
874            shouldThrow();
875        } catch (NullPointerException success) {}
876    }
877
878    /**
879     * drainTo(this, n) throws IAE
880     */
881    public void testDrainToSelfN() {
882        LinkedBlockingQueue q = populatedQueue(SIZE);
883        try {
884            q.drainTo(q, 0);
885            shouldThrow();
886        } catch (IllegalArgumentException success) {}
887    }
888
889    /**
860       * drainTo(c, n) empties first min(n, size) elements of queue into c
861       */
862      public void testDrainToN() {
# Line 897 | Line 867 | public class LinkedBlockingQueueTest ext
867              ArrayList l = new ArrayList();
868              q.drainTo(l, i);
869              int k = (i < SIZE) ? i : SIZE;
870 <            assertEquals(l.size(), k);
871 <            assertEquals(q.size(), SIZE-k);
870 >            assertEquals(k, l.size());
871 >            assertEquals(SIZE - k, q.size());
872              for (int j = 0; j < k; ++j)
873                  assertEquals(l.get(j), new Integer(j));
874 <            while (q.poll() != null) ;
874 >            do {} while (q.poll() != null);
875 >        }
876 >    }
877 >
878 >    /**
879 >     * remove(null), contains(null) always return false
880 >     */
881 >    public void testNeverContainsNull() {
882 >        Collection<?>[] qs = {
883 >            new LinkedBlockingQueue<Object>(),
884 >            populatedQueue(2),
885 >        };
886 >
887 >        for (Collection<?> q : qs) {
888 >            assertFalse(q.contains(null));
889 >            assertFalse(q.remove(null));
890          }
891      }
892  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines