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.64 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 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() {
# Line 36 | Line 46 | public class LinkedBlockingQueueTest ext
46                              new Bounded().testSuite());
47      }
48  
39
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 LinkedBlockingQueue<Integer> populatedQueue(int n) {
54          LinkedBlockingQueue<Integer> q =
# Line 50 | Line 59 | public class LinkedBlockingQueueTest ext
59          assertFalse(q.isEmpty());
60          assertEquals(0, q.remainingCapacity());
61          assertEquals(n, q.size());
62 +        assertEquals((Integer) 0, q.peek());
63          return q;
64      }
65  
# Line 63 | Line 73 | public class LinkedBlockingQueueTest ext
73      }
74  
75      /**
76 <     * Constructor throws IAE if capacity argument nonpositive
76 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
77       */
78      public void testConstructor2() {
79          try {
80 <            LinkedBlockingQueue q = new LinkedBlockingQueue(0);
80 >            new LinkedBlockingQueue(0);
81              shouldThrow();
82          } catch (IllegalArgumentException success) {}
83      }
84  
85      /**
86 <     * Initializing from null Collection throws NPE
86 >     * Initializing from null Collection throws NullPointerException
87       */
88      public void testConstructor3() {
89          try {
90 <            LinkedBlockingQueue q = new LinkedBlockingQueue(null);
90 >            new LinkedBlockingQueue(null);
91              shouldThrow();
92          } catch (NullPointerException success) {}
93      }
94  
95      /**
96 <     * Initializing from Collection of null elements throws NPE
96 >     * Initializing from Collection of null elements throws NullPointerException
97       */
98      public void testConstructor4() {
99 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
100          try {
101 <            Integer[] ints = new Integer[SIZE];
91 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
101 >            new LinkedBlockingQueue(elements);
102              shouldThrow();
103          } catch (NullPointerException success) {}
104      }
105  
106      /**
107 <     * Initializing from Collection with some null elements throws NPE
107 >     * Initializing from Collection with some null elements throws
108 >     * NullPointerException
109       */
110      public void testConstructor5() {
111 +        Integer[] ints = new Integer[SIZE];
112 +        for (int i = 0; i < SIZE - 1; ++i)
113 +            ints[i] = new Integer(i);
114 +        Collection<Integer> elements = Arrays.asList(ints);
115          try {
116 <            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));
116 >            new LinkedBlockingQueue(elements);
117              shouldThrow();
118          } catch (NullPointerException success) {}
119      }
# Line 137 | Line 149 | public class LinkedBlockingQueueTest ext
149       * remainingCapacity decreases on add, increases on remove
150       */
151      public void testRemainingCapacity() {
152 <        LinkedBlockingQueue q = populatedQueue(SIZE);
152 >        BlockingQueue q = populatedQueue(SIZE);
153          for (int i = 0; i < SIZE; ++i) {
154              assertEquals(i, q.remainingCapacity());
155 <            assertEquals(SIZE-i, q.size());
156 <            q.remove();
155 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
156 >            assertEquals(i, q.remove());
157          }
158          for (int i = 0; i < SIZE; ++i) {
159 <            assertEquals(SIZE-i, q.remainingCapacity());
160 <            assertEquals(i, q.size());
161 <            q.add(new Integer(i));
159 >            assertEquals(SIZE - i, q.remainingCapacity());
160 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
161 >            assertTrue(q.add(i));
162          }
163      }
164  
165      /**
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    /**
166       * Offer succeeds if not full; fails if full
167       */
168      public void testOffer() {
# Line 182 | Line 172 | public class LinkedBlockingQueueTest ext
172      }
173  
174      /**
175 <     * add succeeds if not full; throws ISE if full
175 >     * add succeeds if not full; throws IllegalStateException if full
176       */
177      public void testAdd() {
178 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
179 +        for (int i = 0; i < SIZE; ++i)
180 +            assertTrue(q.add(new Integer(i)));
181 +        assertEquals(0, q.remainingCapacity());
182          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());
183              q.add(new Integer(SIZE));
184              shouldThrow();
185          } catch (IllegalStateException success) {}
186      }
187  
188      /**
189 <     * 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
189 >     * addAll(this) throws IllegalArgumentException
190       */
191      public void testAddAllSelf() {
192 +        LinkedBlockingQueue q = populatedQueue(SIZE);
193          try {
215            LinkedBlockingQueue q = populatedQueue(SIZE);
194              q.addAll(q);
195              shouldThrow();
196          } catch (IllegalArgumentException success) {}
197      }
198  
199      /**
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    /**
200       * addAll of a collection with any null elements throws NPE after
201       * possibly adding some elements
202       */
203      public void testAddAll3() {
204 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
205 +        Integer[] ints = new Integer[SIZE];
206 +        for (int i = 0; i < SIZE - 1; ++i)
207 +            ints[i] = new Integer(i);
208 +        Collection<Integer> elements = Arrays.asList(ints);
209          try {
210 <            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));
210 >            q.addAll(elements);
211              shouldThrow();
212          } catch (NullPointerException success) {}
213      }
214  
215      /**
216 <     * addAll throws ISE if not enough room
216 >     * addAll throws IllegalStateException if not enough room
217       */
218      public void testAddAll4() {
219 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
220 +        Integer[] ints = new Integer[SIZE];
221 +        for (int i = 0; i < SIZE; ++i)
222 +            ints[i] = new Integer(i);
223 +        Collection<Integer> elements = Arrays.asList(ints);
224          try {
225 <            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));
225 >            q.addAll(elements);
226              shouldThrow();
227          } catch (IllegalStateException success) {}
228      }
# Line 275 | Line 243 | public class LinkedBlockingQueueTest ext
243      }
244  
245      /**
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    /**
246       * all elements successfully put are contained
247       */
248      public void testPut() throws InterruptedException {
249          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
250          for (int i = 0; i < SIZE; ++i) {
251 <            Integer I = new Integer(i);
252 <            q.put(I);
253 <            assertTrue(q.contains(I));
251 >            Integer x = new Integer(i);
252 >            q.put(x);
253 >            assertTrue(q.contains(x));
254          }
255          assertEquals(0, q.remainingCapacity());
256      }
# Line 303 | Line 260 | public class LinkedBlockingQueueTest ext
260       */
261      public void testBlockingPut() throws InterruptedException {
262          final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
263 <        Thread t = new Thread(new CheckedRunnable() {
263 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
264 >        Thread t = newStartedThread(new CheckedRunnable() {
265              public void realRun() throws InterruptedException {
266                  for (int i = 0; i < SIZE; ++i)
267                      q.put(i);
268                  assertEquals(SIZE, q.size());
269                  assertEquals(0, q.remainingCapacity());
270 +
271 +                Thread.currentThread().interrupt();
272 +                try {
273 +                    q.put(99);
274 +                    shouldThrow();
275 +                } catch (InterruptedException success) {}
276 +                assertFalse(Thread.interrupted());
277 +
278 +                pleaseInterrupt.countDown();
279                  try {
280                      q.put(99);
281                      shouldThrow();
282                  } catch (InterruptedException success) {}
283 +                assertFalse(Thread.interrupted());
284              }});
285  
286 <        t.start();
287 <        Thread.sleep(SHORT_DELAY_MS);
286 >        await(pleaseInterrupt);
287 >        assertThreadStaysAlive(t);
288          t.interrupt();
289 <        t.join();
289 >        awaitTermination(t);
290          assertEquals(SIZE, q.size());
291          assertEquals(0, q.remainingCapacity());
292      }
293  
294      /**
295 <     * put blocks waiting for take when full
295 >     * put blocks interruptibly waiting for take when full
296       */
297      public void testPutWithTake() throws InterruptedException {
298          final int capacity = 2;
299          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
300 <        Thread t = new Thread(new CheckedRunnable() {
300 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
301 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
302 >        Thread t = newStartedThread(new CheckedRunnable() {
303              public void realRun() throws InterruptedException {
304 <                for (int i = 0; i < capacity + 1; i++)
304 >                for (int i = 0; i < capacity; i++)
305                      q.put(i);
306 +                pleaseTake.countDown();
307 +                q.put(86);
308 +
309 +                pleaseInterrupt.countDown();
310                  try {
311                      q.put(99);
312                      shouldThrow();
313                  } catch (InterruptedException success) {}
314 +                assertFalse(Thread.interrupted());
315              }});
316  
317 <        t.start();
318 <        Thread.sleep(SHORT_DELAY_MS);
344 <        assertEquals(q.remainingCapacity(), 0);
317 >        await(pleaseTake);
318 >        assertEquals(0, q.remainingCapacity());
319          assertEquals(0, q.take());
320 <        Thread.sleep(SHORT_DELAY_MS);
320 >
321 >        await(pleaseInterrupt);
322 >        assertThreadStaysAlive(t);
323          t.interrupt();
324 <        t.join();
325 <        assertEquals(q.remainingCapacity(), 0);
324 >        awaitTermination(t);
325 >        assertEquals(0, q.remainingCapacity());
326      }
327  
328      /**
329       * timed offer times out if full and elements not taken
330       */
331 <    public void testTimedOffer() throws InterruptedException {
331 >    public void testTimedOffer() {
332          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
333 <        Thread t = new Thread(new CheckedRunnable() {
333 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334 >        Thread t = newStartedThread(new CheckedRunnable() {
335              public void realRun() throws InterruptedException {
336                  q.put(new Object());
337                  q.put(new Object());
338 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
338 >                long startTime = System.nanoTime();
339 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
340 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
341 >                pleaseInterrupt.countDown();
342                  try {
343 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
343 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
344                      shouldThrow();
345                  } catch (InterruptedException success) {}
346              }});
347  
348 <        t.start();
349 <        Thread.sleep(SMALL_DELAY_MS);
348 >        await(pleaseInterrupt);
349 >        assertThreadStaysAlive(t);
350          t.interrupt();
351 <        t.join();
351 >        awaitTermination(t);
352      }
353  
354      /**
# Line 385 | Line 365 | public class LinkedBlockingQueueTest ext
365       * Take removes existing elements until empty, then blocks interruptibly
366       */
367      public void testBlockingTake() throws InterruptedException {
368 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
369 <        Thread t = new Thread(new CheckedRunnable() {
368 >        final BlockingQueue q = populatedQueue(SIZE);
369 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
370 >        Thread t = newStartedThread(new CheckedRunnable() {
371              public void realRun() throws InterruptedException {
372                  for (int i = 0; i < SIZE; ++i) {
373                      assertEquals(i, q.take());
374                  }
375 +
376 +                Thread.currentThread().interrupt();
377 +                try {
378 +                    q.take();
379 +                    shouldThrow();
380 +                } catch (InterruptedException success) {}
381 +                assertFalse(Thread.interrupted());
382 +
383 +                pleaseInterrupt.countDown();
384                  try {
385                      q.take();
386                      shouldThrow();
387                  } catch (InterruptedException success) {}
388 +                assertFalse(Thread.interrupted());
389              }});
390  
391 <        t.start();
392 <        Thread.sleep(SHORT_DELAY_MS);
391 >        await(pleaseInterrupt);
392 >        assertThreadStaysAlive(t);
393          t.interrupt();
394 <        t.join();
394 >        awaitTermination(t);
395      }
396  
397      /**
# Line 429 | Line 420 | public class LinkedBlockingQueueTest ext
420       * timed poll with nonzero timeout succeeds when non-empty, else times out
421       */
422      public void testTimedPoll() throws InterruptedException {
423 <        LinkedBlockingQueue q = populatedQueue(SIZE);
423 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
424          for (int i = 0; i < SIZE; ++i) {
425 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
426 <        }
427 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
425 >            long startTime = System.nanoTime();
426 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
427 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
428 >        }
429 >        long startTime = System.nanoTime();
430 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
431 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
432 >        checkEmpty(q);
433      }
434  
435      /**
# Line 441 | Line 437 | public class LinkedBlockingQueueTest ext
437       * returning timeout status
438       */
439      public void testInterruptedTimedPoll() throws InterruptedException {
440 <        Thread t = new Thread(new CheckedRunnable() {
440 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
441 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
442 >        Thread t = newStartedThread(new CheckedRunnable() {
443              public void realRun() throws InterruptedException {
444 <                LinkedBlockingQueue q = populatedQueue(SIZE);
444 >                long startTime = System.nanoTime();
445                  for (int i = 0; i < SIZE; ++i) {
446 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
446 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
447                  }
448 +                aboutToWait.countDown();
449                  try {
450 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
450 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
451                      shouldThrow();
452 <                } catch (InterruptedException success) {}
452 >                } catch (InterruptedException success) {
453 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
454 >                }
455              }});
456  
457 <        t.start();
458 <        Thread.sleep(SHORT_DELAY_MS);
457 >        await(aboutToWait);
458 >        waitForThreadToEnterWaitState(t);
459          t.interrupt();
460 <        t.join();
460 >        awaitTermination(t);
461 >        checkEmpty(q);
462      }
463  
464      /**
# Line 503 | Line 505 | public class LinkedBlockingQueueTest ext
505      }
506  
507      /**
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    /**
508       * An add following remove(x) succeeds
509       */
510      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 533 | Line 514 | public class LinkedBlockingQueueTest ext
514          assertTrue(q.remove(new Integer(1)));
515          assertTrue(q.remove(new Integer(2)));
516          assertTrue(q.add(new Integer(3)));
517 <        assertTrue(q.take() != null);
517 >        assertNotNull(q.take());
518      }
519  
520      /**
# Line 592 | Line 573 | public class LinkedBlockingQueueTest ext
573                  assertTrue(changed);
574  
575              assertTrue(q.containsAll(p));
576 <            assertEquals(SIZE-i, q.size());
576 >            assertEquals(SIZE - i, q.size());
577              p.remove();
578          }
579      }
# Line 605 | Line 586 | public class LinkedBlockingQueueTest ext
586              LinkedBlockingQueue q = populatedQueue(SIZE);
587              LinkedBlockingQueue p = populatedQueue(i);
588              assertTrue(q.removeAll(p));
589 <            assertEquals(SIZE-i, q.size());
589 >            assertEquals(SIZE - i, q.size());
590              for (int j = 0; j < i; ++j) {
591 <                Integer I = (Integer)(p.remove());
592 <                assertFalse(q.contains(I));
591 >                Integer x = (Integer)(p.remove());
592 >                assertFalse(q.contains(x));
593              }
594          }
595      }
# Line 636 | Line 617 | public class LinkedBlockingQueueTest ext
617      }
618  
619      /**
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) {}
647    }
648
649    /**
620       * toArray(incompatible array type) throws ArrayStoreException
621       */
622      public void testToArray1_BadArg() {
# Line 657 | Line 627 | public class LinkedBlockingQueueTest ext
627          } catch (ArrayStoreException success) {}
628      }
629  
660
630      /**
631       * iterator iterates through all elements
632       */
633      public void testIterator() throws InterruptedException {
634          LinkedBlockingQueue q = populatedQueue(SIZE);
635          Iterator it = q.iterator();
636 <        while (it.hasNext()) {
636 >        int i;
637 >        for (i = 0; it.hasNext(); i++)
638 >            assertTrue(q.contains(it.next()));
639 >        assertEquals(i, SIZE);
640 >        assertIteratorExhausted(it);
641 >
642 >        it = q.iterator();
643 >        for (i = 0; it.hasNext(); i++)
644              assertEquals(it.next(), q.take());
645 <        }
645 >        assertEquals(i, SIZE);
646 >        assertIteratorExhausted(it);
647 >    }
648 >
649 >    /**
650 >     * iterator of empty collection has no elements
651 >     */
652 >    public void testEmptyIterator() {
653 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
654      }
655  
656      /**
# Line 688 | Line 672 | public class LinkedBlockingQueueTest ext
672          assertFalse(it.hasNext());
673      }
674  
691
675      /**
676       * iterator ordering is FIFO
677       */
# Line 720 | Line 703 | public class LinkedBlockingQueueTest ext
703          assertEquals(0, q.size());
704      }
705  
723
706      /**
707       * toString contains toStrings of elements
708       */
# Line 728 | Line 710 | public class LinkedBlockingQueueTest ext
710          LinkedBlockingQueue q = populatedQueue(SIZE);
711          String s = q.toString();
712          for (int i = 0; i < SIZE; ++i) {
713 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
713 >            assertTrue(s.contains(String.valueOf(i)));
714          }
715      }
716  
735
717      /**
718       * offer transfers elements across Executor tasks
719       */
# Line 740 | Line 721 | public class LinkedBlockingQueueTest ext
721          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
722          q.add(one);
723          q.add(two);
724 <        ExecutorService executor = Executors.newFixedThreadPool(2);
725 <        executor.execute(new CheckedRunnable() {
726 <            public void realRun() throws InterruptedException {
727 <                assertFalse(q.offer(three));
728 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
729 <                assertEquals(0, q.remainingCapacity());
730 <            }});
731 <
732 <        executor.execute(new CheckedRunnable() {
733 <            public void realRun() throws InterruptedException {
734 <                Thread.sleep(SMALL_DELAY_MS);
735 <                assertSame(one, q.take());
736 <            }});
737 <
738 <        joinPool(executor);
724 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
725 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
726 >        try (PoolCleaner cleaner = cleaner(executor)) {
727 >            executor.execute(new CheckedRunnable() {
728 >                public void realRun() throws InterruptedException {
729 >                    assertFalse(q.offer(three));
730 >                    threadsStarted.await();
731 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
732 >                    assertEquals(0, q.remainingCapacity());
733 >                }});
734 >
735 >            executor.execute(new CheckedRunnable() {
736 >                public void realRun() throws InterruptedException {
737 >                    threadsStarted.await();
738 >                    assertSame(one, q.take());
739 >                }});
740 >        }
741      }
742  
743      /**
744 <     * poll retrieves elements across Executor threads
744 >     * timed poll retrieves elements across Executor threads
745       */
746      public void testPollInExecutor() {
747          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
748 <        ExecutorService executor = Executors.newFixedThreadPool(2);
749 <        executor.execute(new CheckedRunnable() {
750 <            public void realRun() throws InterruptedException {
751 <                assertNull(q.poll());
752 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
753 <                assertTrue(q.isEmpty());
754 <            }});
755 <
756 <        executor.execute(new CheckedRunnable() {
757 <            public void realRun() throws InterruptedException {
758 <                Thread.sleep(SMALL_DELAY_MS);
759 <                q.put(one);
760 <            }});
761 <
762 <        joinPool(executor);
748 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
749 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
750 >        try (PoolCleaner cleaner = cleaner(executor)) {
751 >            executor.execute(new CheckedRunnable() {
752 >                public void realRun() throws InterruptedException {
753 >                    assertNull(q.poll());
754 >                    threadsStarted.await();
755 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
756 >                    checkEmpty(q);
757 >                }});
758 >
759 >            executor.execute(new CheckedRunnable() {
760 >                public void realRun() throws InterruptedException {
761 >                    threadsStarted.await();
762 >                    q.put(one);
763 >                }});
764 >        }
765      }
766  
767      /**
768       * A deserialized serialized queue has same elements in same order
769       */
770      public void testSerialization() throws Exception {
771 <        LinkedBlockingQueue q = populatedQueue(SIZE);
772 <
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 <    }
771 >        Queue x = populatedQueue(SIZE);
772 >        Queue y = serialClone(x);
773  
774 <    /**
775 <     * drainTo(this) throws IAE
776 <     */
777 <    public void testDrainToSelf() {
778 <        LinkedBlockingQueue q = populatedQueue(SIZE);
779 <        try {
780 <            q.drainTo(q);
781 <            shouldThrow();
782 <        } catch (IllegalArgumentException success) {}
774 >        assertNotSame(x, y);
775 >        assertEquals(x.size(), y.size());
776 >        assertEquals(x.toString(), y.toString());
777 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
778 >        while (!x.isEmpty()) {
779 >            assertFalse(y.isEmpty());
780 >            assertEquals(x.remove(), y.remove());
781 >        }
782 >        assertTrue(y.isEmpty());
783      }
784  
785      /**
# Line 827 | Line 789 | public class LinkedBlockingQueueTest ext
789          LinkedBlockingQueue q = populatedQueue(SIZE);
790          ArrayList l = new ArrayList();
791          q.drainTo(l);
792 <        assertEquals(q.size(), 0);
793 <        assertEquals(l.size(), SIZE);
792 >        assertEquals(0, q.size());
793 >        assertEquals(SIZE, l.size());
794          for (int i = 0; i < SIZE; ++i)
795              assertEquals(l.get(i), new Integer(i));
796          q.add(zero);
# Line 838 | Line 800 | public class LinkedBlockingQueueTest ext
800          assertTrue(q.contains(one));
801          l.clear();
802          q.drainTo(l);
803 <        assertEquals(q.size(), 0);
804 <        assertEquals(l.size(), 2);
803 >        assertEquals(0, q.size());
804 >        assertEquals(2, l.size());
805          for (int i = 0; i < 2; ++i)
806              assertEquals(l.get(i), new Integer(i));
807      }
# Line 851 | Line 813 | public class LinkedBlockingQueueTest ext
813          final LinkedBlockingQueue q = populatedQueue(SIZE);
814          Thread t = new Thread(new CheckedRunnable() {
815              public void realRun() throws InterruptedException {
816 <                q.put(new Integer(SIZE+1));
816 >                q.put(new Integer(SIZE + 1));
817              }});
818  
819          t.start();
# Line 865 | Line 827 | public class LinkedBlockingQueueTest ext
827      }
828  
829      /**
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    /**
830       * drainTo(c, n) empties first min(n, size) elements of queue into c
831       */
832      public void testDrainToN() {
# Line 897 | Line 837 | public class LinkedBlockingQueueTest ext
837              ArrayList l = new ArrayList();
838              q.drainTo(l, i);
839              int k = (i < SIZE) ? i : SIZE;
840 <            assertEquals(l.size(), k);
841 <            assertEquals(q.size(), SIZE-k);
840 >            assertEquals(k, l.size());
841 >            assertEquals(SIZE - k, q.size());
842              for (int j = 0; j < k; ++j)
843                  assertEquals(l.get(j), new Integer(j));
844 <            while (q.poll() != null) ;
844 >            do {} while (q.poll() != null);
845 >        }
846 >    }
847 >
848 >    /**
849 >     * remove(null), contains(null) always return false
850 >     */
851 >    public void testNeverContainsNull() {
852 >        Collection<?>[] qs = {
853 >            new LinkedBlockingQueue<Object>(),
854 >            populatedQueue(2),
855 >        };
856 >
857 >        for (Collection<?> q : qs) {
858 >            assertFalse(q.contains(null));
859 >            assertFalse(q.remove(null));
860          }
861      }
862  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines