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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.39 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.87 by jsr166, Thu Sep 5 21:39:57 2019 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 import junit.framework.*;
8 import java.util.*;
9 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 < import java.io.*;
8 >
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Deque;
13 > import java.util.Iterator;
14 > import java.util.NoSuchElementException;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingDeque;
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.LinkedBlockingDeque;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingDequeTest extends JSR166TestCase {
26  
# Line 20 | Line 32 | public class LinkedBlockingDequeTest ext
32  
33      public static class Bounded extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new LinkedBlockingDeque(20);
35 >            return new LinkedBlockingDeque(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 LinkedBlockingDeque.class; }
46 +            public Collection emptyCollection() { return new LinkedBlockingDeque(); }
47 +            public Object makeElement(int i) { return i; }
48 +            public boolean isConcurrent() { return true; }
49 +            public boolean permitsNulls() { return false; }
50 +        }
51          return newTestSuite(LinkedBlockingDequeTest.class,
52                              new Unbounded().testSuite(),
53 <                            new Bounded().testSuite());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58 <     * Create a deque of given size containing consecutive
59 <     * Integers 0 ... n.
58 >     * Returns a new deque of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingDeque<Integer> populatedDeque(int n) {
61 >    private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62          LinkedBlockingDeque<Integer> q =
63              new LinkedBlockingDeque<Integer>(n);
64          assertTrue(q.isEmpty());
# Line 47 | Line 67 | public class LinkedBlockingDequeTest ext
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peekFirst());
71 +        assertEquals((Integer) (n - 1), q.peekLast());
72          return q;
73      }
74  
# Line 70 | Line 92 | public class LinkedBlockingDequeTest ext
92      public void testSize() {
93          LinkedBlockingDeque q = populatedDeque(SIZE);
94          for (int i = 0; i < SIZE; ++i) {
95 <            assertEquals(SIZE-i, q.size());
95 >            assertEquals(SIZE - i, q.size());
96              q.removeFirst();
97          }
98          for (int i = 0; i < SIZE; ++i) {
# Line 80 | Line 102 | public class LinkedBlockingDequeTest ext
102      }
103  
104      /**
105 <     * offer(null) throws NPE
105 >     * offerFirst(null) throws NullPointerException
106       */
107      public void testOfferFirstNull() {
108 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
109          try {
87            LinkedBlockingDeque q = new LinkedBlockingDeque();
110              q.offerFirst(null);
111              shouldThrow();
112          } catch (NullPointerException success) {}
113      }
114  
115      /**
116 +     * offerLast(null) throws NullPointerException
117 +     */
118 +    public void testOfferLastNull() {
119 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
120 +        try {
121 +            q.offerLast(null);
122 +            shouldThrow();
123 +        } catch (NullPointerException success) {}
124 +    }
125 +
126 +    /**
127       * OfferFirst succeeds
128       */
129      public void testOfferFirst() {
# Line 124 | Line 157 | public class LinkedBlockingDequeTest ext
157       */
158      public void testPollLast() {
159          LinkedBlockingDeque q = populatedDeque(SIZE);
160 <        for (int i = SIZE-1; i >= 0; --i) {
160 >        for (int i = SIZE - 1; i >= 0; --i) {
161              assertEquals(i, q.pollLast());
162          }
163          assertNull(q.pollLast());
# Line 163 | Line 196 | public class LinkedBlockingDequeTest ext
196       */
197      public void testPeekLast() {
198          LinkedBlockingDeque q = populatedDeque(SIZE);
199 <        for (int i = SIZE-1; i >= 0; --i) {
199 >        for (int i = SIZE - 1; i >= 0; --i) {
200              assertEquals(i, q.peekLast());
201              assertEquals(i, q.pollLast());
202              assertTrue(q.peekLast() == null ||
# Line 193 | Line 226 | public class LinkedBlockingDequeTest ext
226       */
227      public void testLastElement() {
228          LinkedBlockingDeque q = populatedDeque(SIZE);
229 <        for (int i = SIZE-1; i >= 0; --i) {
229 >        for (int i = SIZE - 1; i >= 0; --i) {
230              assertEquals(i, q.getLast());
231              assertEquals(i, q.pollLast());
232          }
# Line 253 | Line 286 | public class LinkedBlockingDequeTest ext
286       */
287      public void testRemoveFirstOccurrence() {
288          LinkedBlockingDeque q = populatedDeque(SIZE);
289 <        for (int i = 1; i < SIZE; i+=2) {
289 >        for (int i = 1; i < SIZE; i += 2) {
290              assertTrue(q.removeFirstOccurrence(new Integer(i)));
291          }
292 <        for (int i = 0; i < SIZE; i+=2) {
292 >        for (int i = 0; i < SIZE; i += 2) {
293              assertTrue(q.removeFirstOccurrence(new Integer(i)));
294 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
294 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
295          }
296          assertTrue(q.isEmpty());
297      }
# Line 268 | Line 301 | public class LinkedBlockingDequeTest ext
301       */
302      public void testRemoveLastOccurrence() {
303          LinkedBlockingDeque q = populatedDeque(SIZE);
304 <        for (int i = 1; i < SIZE; i+=2) {
304 >        for (int i = 1; i < SIZE; i += 2) {
305              assertTrue(q.removeLastOccurrence(new Integer(i)));
306          }
307 <        for (int i = 0; i < SIZE; i+=2) {
307 >        for (int i = 0; i < SIZE; i += 2) {
308              assertTrue(q.removeLastOccurrence(new Integer(i)));
309 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
309 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
310          }
311          assertTrue(q.isEmpty());
312      }
# Line 308 | Line 341 | public class LinkedBlockingDequeTest ext
341      }
342  
343      /**
344 <     * Constructor throws IAE if capacity argument nonpositive
344 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
345       */
346      public void testConstructor2() {
347          try {
348 <            LinkedBlockingDeque q = new LinkedBlockingDeque(0);
348 >            new LinkedBlockingDeque(0);
349              shouldThrow();
350          } catch (IllegalArgumentException success) {}
351      }
352  
353      /**
354 <     * Initializing from null Collection throws NPE
354 >     * Initializing from null Collection throws NullPointerException
355       */
356      public void testConstructor3() {
357          try {
358 <            LinkedBlockingDeque q = new LinkedBlockingDeque(null);
358 >            new LinkedBlockingDeque(null);
359              shouldThrow();
360          } catch (NullPointerException success) {}
361      }
362  
363      /**
364 <     * Initializing from Collection of null elements throws NPE
364 >     * Initializing from Collection of null elements throws NullPointerException
365       */
366      public void testConstructor4() {
367 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
368          try {
369 <            Integer[] ints = new Integer[SIZE];
336 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
369 >            new LinkedBlockingDeque(elements);
370              shouldThrow();
371          } catch (NullPointerException success) {}
372      }
373  
374      /**
375 <     * Initializing from Collection with some null elements throws NPE
375 >     * Initializing from Collection with some null elements throws
376 >     * NullPointerException
377       */
378      public void testConstructor5() {
379 +        Integer[] ints = new Integer[SIZE];
380 +        for (int i = 0; i < SIZE - 1; ++i)
381 +            ints[i] = i;
382 +        Collection<Integer> elements = Arrays.asList(ints);
383          try {
384 <            Integer[] ints = new Integer[SIZE];
347 <            for (int i = 0; i < SIZE-1; ++i)
348 <                ints[i] = new Integer(i);
349 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
384 >            new LinkedBlockingDeque(elements);
385              shouldThrow();
386          } catch (NullPointerException success) {}
387      }
# Line 357 | Line 392 | public class LinkedBlockingDequeTest ext
392      public void testConstructor6() {
393          Integer[] ints = new Integer[SIZE];
394          for (int i = 0; i < SIZE; ++i)
395 <            ints[i] = new Integer(i);
395 >            ints[i] = i;
396          LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
397          for (int i = 0; i < SIZE; ++i)
398              assertEquals(ints[i], q.poll());
# Line 382 | Line 417 | public class LinkedBlockingDequeTest ext
417       * remainingCapacity decreases on add, increases on remove
418       */
419      public void testRemainingCapacity() {
420 <        LinkedBlockingDeque q = populatedDeque(SIZE);
420 >        BlockingQueue q = populatedDeque(SIZE);
421          for (int i = 0; i < SIZE; ++i) {
422              assertEquals(i, q.remainingCapacity());
423 <            assertEquals(SIZE-i, q.size());
424 <            q.remove();
423 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
424 >            assertEquals(i, q.remove());
425          }
426          for (int i = 0; i < SIZE; ++i) {
427 <            assertEquals(SIZE-i, q.remainingCapacity());
428 <            assertEquals(i, q.size());
429 <            q.add(new Integer(i));
427 >            assertEquals(SIZE - i, q.remainingCapacity());
428 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
429 >            assertTrue(q.add(i));
430          }
431      }
432  
433      /**
399     * offer(null) throws NPE
400     */
401    public void testOfferNull() {
402        try {
403            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
404            q.offer(null);
405            shouldThrow();
406        } catch (NullPointerException success) {}
407    }
408
409    /**
410     * add(null) throws NPE
411     */
412    public void testAddNull() {
413        try {
414            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
415            q.add(null);
416            shouldThrow();
417        } catch (NullPointerException success) {}
418    }
419
420    /**
434       * push(null) throws NPE
435       */
436      public void testPushNull() {
437 +        LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438          try {
425            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
439              q.push(null);
440              shouldThrow();
441          } catch (NullPointerException success) {}
442      }
443  
444      /**
445 <     * push succeeds if not full; throws ISE if full
445 >     * push succeeds if not full; throws IllegalStateException if full
446       */
447      public void testPush() {
448 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
449 +        for (int i = 0; i < SIZE; ++i) {
450 +            Integer x = new Integer(i);
451 +            q.push(x);
452 +            assertEquals(x, q.peek());
453 +        }
454 +        assertEquals(0, q.remainingCapacity());
455          try {
436            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
437            for (int i = 0; i < SIZE; ++i) {
438                Integer I = new Integer(i);
439                q.push(I);
440                assertEquals(I, q.peek());
441            }
442            assertEquals(0, q.remainingCapacity());
456              q.push(new Integer(SIZE));
457              shouldThrow();
458          } catch (IllegalStateException success) {}
# Line 479 | Line 492 | public class LinkedBlockingDequeTest ext
492      }
493  
494      /**
495 <     * add succeeds if not full; throws ISE if full
495 >     * add succeeds if not full; throws IllegalStateException if full
496       */
497      public void testAdd() {
498 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
499 +        for (int i = 0; i < SIZE; ++i)
500 +            assertTrue(q.add(new Integer(i)));
501 +        assertEquals(0, q.remainingCapacity());
502          try {
486            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
487            for (int i = 0; i < SIZE; ++i) {
488                assertTrue(q.add(new Integer(i)));
489            }
490            assertEquals(0, q.remainingCapacity());
503              q.add(new Integer(SIZE));
504              shouldThrow();
505          } catch (IllegalStateException success) {}
506      }
507  
508      /**
509 <     * addAll(null) throws NPE
498 <     */
499 <    public void testAddAll1() {
500 <        try {
501 <            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
502 <            q.addAll(null);
503 <            shouldThrow();
504 <        } catch (NullPointerException success) {}
505 <    }
506 <
507 <    /**
508 <     * addAll(this) throws IAE
509 >     * addAll(this) throws IllegalArgumentException
510       */
511      public void testAddAllSelf() {
512 +        LinkedBlockingDeque q = populatedDeque(SIZE);
513          try {
512            LinkedBlockingDeque q = populatedDeque(SIZE);
514              q.addAll(q);
515              shouldThrow();
516          } catch (IllegalArgumentException success) {}
517      }
518  
519      /**
519     * addAll of a collection with null elements throws NPE
520     */
521    public void testAddAll2() {
522        try {
523            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
524            Integer[] ints = new Integer[SIZE];
525            q.addAll(Arrays.asList(ints));
526            shouldThrow();
527        } catch (NullPointerException success) {}
528    }
529
530    /**
520       * addAll of a collection with any null elements throws NPE after
521       * possibly adding some elements
522       */
523      public void testAddAll3() {
524 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
525 +        Integer[] ints = new Integer[SIZE];
526 +        for (int i = 0; i < SIZE - 1; ++i)
527 +            ints[i] = new Integer(i);
528 +        Collection<Integer> elements = Arrays.asList(ints);
529          try {
530 <            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
537 <            Integer[] ints = new Integer[SIZE];
538 <            for (int i = 0; i < SIZE-1; ++i)
539 <                ints[i] = new Integer(i);
540 <            q.addAll(Arrays.asList(ints));
530 >            q.addAll(elements);
531              shouldThrow();
532          } catch (NullPointerException success) {}
533      }
534  
535      /**
536 <     * addAll throws ISE if not enough room
536 >     * addAll throws IllegalStateException if not enough room
537       */
538      public void testAddAll4() {
539 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE - 1);
540 +        Integer[] ints = new Integer[SIZE];
541 +        for (int i = 0; i < SIZE; ++i)
542 +            ints[i] = new Integer(i);
543 +        Collection<Integer> elements = Arrays.asList(ints);
544          try {
545 <            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
551 <            Integer[] ints = new Integer[SIZE];
552 <            for (int i = 0; i < SIZE; ++i)
553 <                ints[i] = new Integer(i);
554 <            q.addAll(Arrays.asList(ints));
545 >            q.addAll(elements);
546              shouldThrow();
547          } catch (IllegalStateException success) {}
548      }
# Line 572 | Line 563 | public class LinkedBlockingDequeTest ext
563      }
564  
565      /**
575     * put(null) throws NPE
576     */
577    public void testPutNull() throws InterruptedException {
578        try {
579            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
580            q.put(null);
581            shouldThrow();
582        } catch (NullPointerException success) {}
583    }
584
585    /**
566       * all elements successfully put are contained
567       */
568      public void testPut() throws InterruptedException {
569          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
570          for (int i = 0; i < SIZE; ++i) {
571 <            Integer I = new Integer(i);
572 <            q.put(I);
573 <            assertTrue(q.contains(I));
571 >            Integer x = new Integer(i);
572 >            q.put(x);
573 >            assertTrue(q.contains(x));
574          }
575          assertEquals(0, q.remainingCapacity());
576      }
# Line 624 | Line 604 | public class LinkedBlockingDequeTest ext
604              }});
605  
606          await(pleaseInterrupt);
607 <        assertThreadStaysAlive(t);
607 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609          awaitTermination(t);
610          assertEquals(SIZE, q.size());
# Line 646 | Line 626 | public class LinkedBlockingDequeTest ext
626                  pleaseTake.countDown();
627                  q.put(86);
628  
629 +                Thread.currentThread().interrupt();
630 +                try {
631 +                    q.put(99);
632 +                    shouldThrow();
633 +                } catch (InterruptedException success) {}
634 +                assertFalse(Thread.interrupted());
635 +
636                  pleaseInterrupt.countDown();
637                  try {
638                      q.put(99);
# Line 655 | Line 642 | public class LinkedBlockingDequeTest ext
642              }});
643  
644          await(pleaseTake);
645 <        assertEquals(q.remainingCapacity(), 0);
645 >        assertEquals(0, q.remainingCapacity());
646          assertEquals(0, q.take());
647  
648          await(pleaseInterrupt);
649 <        assertThreadStaysAlive(t);
649 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
650          t.interrupt();
651          awaitTermination(t);
652 <        assertEquals(q.remainingCapacity(), 0);
652 >        assertEquals(0, q.remainingCapacity());
653      }
654  
655      /**
656       * timed offer times out if full and elements not taken
657       */
658 <    public void testTimedOffer() throws InterruptedException {
658 >    public void testTimedOffer() {
659          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
660          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
661          Thread t = newStartedThread(new CheckedRunnable() {
# Line 676 | Line 663 | public class LinkedBlockingDequeTest ext
663                  q.put(new Object());
664                  q.put(new Object());
665                  long startTime = System.nanoTime();
666 +
667                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
668                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
669 +
670 +                Thread.currentThread().interrupt();
671 +                try {
672 +                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
673 +                    shouldThrow();
674 +                } catch (InterruptedException success) {}
675 +                assertFalse(Thread.interrupted());
676 +
677                  pleaseInterrupt.countDown();
678                  try {
679 <                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
679 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
680                      shouldThrow();
681                  } catch (InterruptedException success) {}
682 +                assertFalse(Thread.interrupted());
683              }});
684  
685          await(pleaseInterrupt);
686 <        assertThreadStaysAlive(t);
686 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
687          t.interrupt();
688          awaitTermination(t);
689      }
# Line 709 | Line 706 | public class LinkedBlockingDequeTest ext
706          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
707          Thread t = newStartedThread(new CheckedRunnable() {
708              public void realRun() throws InterruptedException {
709 <                for (int i = 0; i < SIZE; ++i) {
713 <                    assertEquals(i, q.take());
714 <                }
709 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
710  
711                  Thread.currentThread().interrupt();
712                  try {
# Line 729 | Line 724 | public class LinkedBlockingDequeTest ext
724              }});
725  
726          await(pleaseInterrupt);
727 <        assertThreadStaysAlive(t);
727 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
728          t.interrupt();
729          awaitTermination(t);
730      }
# Line 778 | Line 773 | public class LinkedBlockingDequeTest ext
773       */
774      public void testInterruptedTimedPoll() throws InterruptedException {
775          final BlockingQueue<Integer> q = populatedDeque(SIZE);
776 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
776 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
777          Thread t = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                for (int i = 0; i < SIZE; ++i) {
785 <                    long t0 = System.nanoTime();
779 >                for (int i = 0; i < SIZE; i++)
780                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
781 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
782 <                }
783 <                long t0 = System.nanoTime();
784 <                aboutToWait.countDown();
781 >
782 >                Thread.currentThread().interrupt();
783 >                try {
784 >                    q.poll(randomTimeout(), randomTimeUnit());
785 >                    shouldThrow();
786 >                } catch (InterruptedException success) {}
787 >                assertFalse(Thread.interrupted());
788 >
789 >                pleaseInterrupt.countDown();
790                  try {
791 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
791 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
792                      shouldThrow();
793 <                } catch (InterruptedException success) {
794 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
796 <                }
793 >                } catch (InterruptedException success) {}
794 >                assertFalse(Thread.interrupted());
795              }});
796  
797 <        aboutToWait.await();
798 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
797 >        await(pleaseInterrupt);
798 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
799          t.interrupt();
800 <        awaitTermination(t, MEDIUM_DELAY_MS);
800 >        awaitTermination(t);
801          checkEmpty(q);
802      }
803  
# Line 807 | Line 805 | public class LinkedBlockingDequeTest ext
805       * putFirst(null) throws NPE
806       */
807      public void testPutFirstNull() throws InterruptedException {
808 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
809          try {
811            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
810              q.putFirst(null);
811              shouldThrow();
812          } catch (NullPointerException success) {}
# Line 820 | Line 818 | public class LinkedBlockingDequeTest ext
818      public void testPutFirst() throws InterruptedException {
819          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
820          for (int i = 0; i < SIZE; ++i) {
821 <            Integer I = new Integer(i);
822 <            q.putFirst(I);
823 <            assertTrue(q.contains(I));
821 >            Integer x = new Integer(i);
822 >            q.putFirst(x);
823 >            assertTrue(q.contains(x));
824          }
825          assertEquals(0, q.remainingCapacity());
826      }
# Line 856 | Line 854 | public class LinkedBlockingDequeTest ext
854              }});
855  
856          await(pleaseInterrupt);
857 <        assertThreadStaysAlive(t);
857 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
858          t.interrupt();
859          awaitTermination(t);
860          assertEquals(SIZE, q.size());
# Line 887 | Line 885 | public class LinkedBlockingDequeTest ext
885              }});
886  
887          await(pleaseTake);
888 <        assertEquals(q.remainingCapacity(), 0);
888 >        assertEquals(0, q.remainingCapacity());
889          assertEquals(capacity - 1, q.take());
890  
891          await(pleaseInterrupt);
892 <        assertThreadStaysAlive(t);
892 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
893          t.interrupt();
894          awaitTermination(t);
895 <        assertEquals(q.remainingCapacity(), 0);
895 >        assertEquals(0, q.remainingCapacity());
896      }
897  
898      /**
899       * timed offerFirst times out if full and elements not taken
900       */
901 <    public void testTimedOfferFirst() throws InterruptedException {
901 >    public void testTimedOfferFirst() {
902          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
903          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
904          Thread t = newStartedThread(new CheckedRunnable() {
# Line 908 | Line 906 | public class LinkedBlockingDequeTest ext
906                  q.putFirst(new Object());
907                  q.putFirst(new Object());
908                  long startTime = System.nanoTime();
909 +
910                  assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
911                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
912 +
913 +                Thread.currentThread().interrupt();
914 +                try {
915 +                    q.offerFirst(new Object(), randomTimeout(), randomTimeUnit());
916 +                    shouldThrow();
917 +                } catch (InterruptedException success) {}
918 +                assertFalse(Thread.interrupted());
919 +
920                  pleaseInterrupt.countDown();
921                  try {
922 <                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
922 >                    q.offerFirst(new Object(), LONGER_DELAY_MS, MILLISECONDS);
923                      shouldThrow();
924                  } catch (InterruptedException success) {}
925 +                assertFalse(Thread.interrupted());
926              }});
927  
928          await(pleaseInterrupt);
929 <        assertThreadStaysAlive(t);
929 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
930          t.interrupt();
931          awaitTermination(t);
932      }
# Line 950 | Line 958 | public class LinkedBlockingDequeTest ext
958              }});
959  
960          await(threadStarted);
961 <        assertThreadStaysAlive(t);
961 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
962          t.interrupt();
963          awaitTermination(t);
964      }
# Line 991 | Line 999 | public class LinkedBlockingDequeTest ext
999              }});
1000  
1001          await(threadStarted);
1002 <        assertThreadStaysAlive(t);
1002 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1003          t.interrupt();
1004          awaitTermination(t);
1005      }
# Line 1023 | Line 1031 | public class LinkedBlockingDequeTest ext
1031          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1032          Thread t = newStartedThread(new CheckedRunnable() {
1033              public void realRun() throws InterruptedException {
1034 <                for (int i = 0; i < SIZE; ++i) {
1027 <                    assertEquals(i, q.takeFirst());
1028 <                }
1034 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1035  
1036                  Thread.currentThread().interrupt();
1037                  try {
# Line 1043 | Line 1049 | public class LinkedBlockingDequeTest ext
1049              }});
1050  
1051          await(pleaseInterrupt);
1052 <        assertThreadStaysAlive(t);
1052 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1053          t.interrupt();
1054          awaitTermination(t);
1055      }
# Line 1080 | Line 1086 | public class LinkedBlockingDequeTest ext
1086       * returning timeout status
1087       */
1088      public void testInterruptedTimedPollFirst() throws InterruptedException {
1089 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1090          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1091          Thread t = newStartedThread(new CheckedRunnable() {
1092              public void realRun() throws InterruptedException {
1093 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1087 <                for (int i = 0; i < SIZE; ++i) {
1093 >                for (int i = 0; i < SIZE; i++)
1094                      assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1089                }
1095  
1096                  Thread.currentThread().interrupt();
1097                  try {
1098 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1098 >                    q.pollFirst(randomTimeout(), randomTimeUnit());
1099                      shouldThrow();
1100                  } catch (InterruptedException success) {}
1101                  assertFalse(Thread.interrupted());
1102  
1103                  pleaseInterrupt.countDown();
1104                  try {
1105 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1105 >                    q.pollFirst(LONGER_DELAY_MS, MILLISECONDS);
1106                      shouldThrow();
1107                  } catch (InterruptedException success) {}
1108                  assertFalse(Thread.interrupted());
1109              }});
1110  
1111          await(pleaseInterrupt);
1112 <        assertThreadStaysAlive(t);
1112 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1113          t.interrupt();
1114          awaitTermination(t);
1115      }
# Line 1128 | Line 1133 | public class LinkedBlockingDequeTest ext
1133  
1134                  Thread.currentThread().interrupt();
1135                  try {
1136 <                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1136 >                    q.pollFirst(randomTimeout(), randomTimeUnit());
1137                      shouldThrow();
1138                  } catch (InterruptedException success) {}
1139  
# Line 1137 | Line 1142 | public class LinkedBlockingDequeTest ext
1142                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1143                      shouldThrow();
1144                  } catch (InterruptedException success) {}
1145 +                assertFalse(Thread.interrupted());
1146 +
1147                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1148              }});
1149  
# Line 1145 | Line 1152 | public class LinkedBlockingDequeTest ext
1152          assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1153          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1154          barrier.await();
1155 <        assertThreadStaysAlive(t);
1155 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1156          t.interrupt();
1157          awaitTermination(t);
1158      }
# Line 1154 | Line 1161 | public class LinkedBlockingDequeTest ext
1161       * putLast(null) throws NPE
1162       */
1163      public void testPutLastNull() throws InterruptedException {
1164 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1165          try {
1158            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1166              q.putLast(null);
1167              shouldThrow();
1168          } catch (NullPointerException success) {}
# Line 1167 | Line 1174 | public class LinkedBlockingDequeTest ext
1174      public void testPutLast() throws InterruptedException {
1175          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1176          for (int i = 0; i < SIZE; ++i) {
1177 <            Integer I = new Integer(i);
1178 <            q.putLast(I);
1179 <            assertTrue(q.contains(I));
1177 >            Integer x = new Integer(i);
1178 >            q.putLast(x);
1179 >            assertTrue(q.contains(x));
1180          }
1181          assertEquals(0, q.remainingCapacity());
1182      }
# Line 1203 | Line 1210 | public class LinkedBlockingDequeTest ext
1210              }});
1211  
1212          await(pleaseInterrupt);
1213 <        assertThreadStaysAlive(t);
1213 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1214          t.interrupt();
1215          awaitTermination(t);
1216          assertEquals(SIZE, q.size());
# Line 1225 | Line 1232 | public class LinkedBlockingDequeTest ext
1232                  pleaseTake.countDown();
1233                  q.putLast(86);
1234  
1235 +                Thread.currentThread().interrupt();
1236 +                try {
1237 +                    q.putLast(99);
1238 +                    shouldThrow();
1239 +                } catch (InterruptedException success) {}
1240 +                assertFalse(Thread.interrupted());
1241 +
1242                  pleaseInterrupt.countDown();
1243                  try {
1244                      q.putLast(99);
# Line 1234 | Line 1248 | public class LinkedBlockingDequeTest ext
1248              }});
1249  
1250          await(pleaseTake);
1251 <        assertEquals(q.remainingCapacity(), 0);
1251 >        assertEquals(0, q.remainingCapacity());
1252          assertEquals(0, q.take());
1253  
1254          await(pleaseInterrupt);
1255 <        assertThreadStaysAlive(t);
1255 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1256          t.interrupt();
1257          awaitTermination(t);
1258 <        assertEquals(q.remainingCapacity(), 0);
1258 >        assertEquals(0, q.remainingCapacity());
1259      }
1260  
1261      /**
1262       * timed offerLast times out if full and elements not taken
1263       */
1264 <    public void testTimedOfferLast() throws InterruptedException {
1264 >    public void testTimedOfferLast() {
1265          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1266          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1267          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1255 | Line 1269 | public class LinkedBlockingDequeTest ext
1269                  q.putLast(new Object());
1270                  q.putLast(new Object());
1271                  long startTime = System.nanoTime();
1272 +
1273                  assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1274                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1275 +
1276 +                Thread.currentThread().interrupt();
1277 +                try {
1278 +                    q.offerLast(new Object(), randomTimeout(), randomTimeUnit());
1279 +                    shouldThrow();
1280 +                } catch (InterruptedException success) {}
1281 +
1282                  pleaseInterrupt.countDown();
1283                  try {
1284 <                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1284 >                    q.offerLast(new Object(), LONGER_DELAY_MS, MILLISECONDS);
1285                      shouldThrow();
1286                  } catch (InterruptedException success) {}
1287              }});
1288  
1289          await(pleaseInterrupt);
1290 <        assertThreadStaysAlive(t);
1290 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1291          t.interrupt();
1292          awaitTermination(t);
1293      }
# Line 1276 | Line 1298 | public class LinkedBlockingDequeTest ext
1298      public void testTakeLast() throws InterruptedException {
1299          LinkedBlockingDeque q = populatedDeque(SIZE);
1300          for (int i = 0; i < SIZE; ++i) {
1301 <            assertEquals(SIZE-i-1, q.takeLast());
1301 >            assertEquals(SIZE - i - 1, q.takeLast());
1302          }
1303      }
1304  
# Line 1288 | Line 1310 | public class LinkedBlockingDequeTest ext
1310          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1311          Thread t = newStartedThread(new CheckedRunnable() {
1312              public void realRun() throws InterruptedException {
1313 <                for (int i = 0; i < SIZE; ++i) {
1314 <                    assertEquals(SIZE-i-1, q.takeLast());
1293 <                }
1313 >                for (int i = 0; i < SIZE; i++)
1314 >                    assertEquals(SIZE - i - 1, q.takeLast());
1315  
1316                  Thread.currentThread().interrupt();
1317                  try {
# Line 1308 | Line 1329 | public class LinkedBlockingDequeTest ext
1329              }});
1330  
1331          await(pleaseInterrupt);
1332 <        assertThreadStaysAlive(t);
1332 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1333          t.interrupt();
1334          awaitTermination(t);
1335      }
# Line 1319 | Line 1340 | public class LinkedBlockingDequeTest ext
1340      public void testTimedPollLast0() throws InterruptedException {
1341          LinkedBlockingDeque q = populatedDeque(SIZE);
1342          for (int i = 0; i < SIZE; ++i) {
1343 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1343 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1344          }
1345          assertNull(q.pollLast(0, MILLISECONDS));
1346      }
# Line 1331 | Line 1352 | public class LinkedBlockingDequeTest ext
1352          LinkedBlockingDeque q = populatedDeque(SIZE);
1353          for (int i = 0; i < SIZE; ++i) {
1354              long startTime = System.nanoTime();
1355 <            assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1355 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1356              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1357          }
1358          long startTime = System.nanoTime();
# Line 1345 | Line 1366 | public class LinkedBlockingDequeTest ext
1366       * returning timeout status
1367       */
1368      public void testInterruptedTimedPollLast() throws InterruptedException {
1369 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1370          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1371          Thread t = newStartedThread(new CheckedRunnable() {
1372              public void realRun() throws InterruptedException {
1373 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1374 <                for (int i = 0; i < SIZE; ++i) {
1375 <                    assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1354 <                }
1373 >                for (int i = 0; i < SIZE; i++)
1374 >                    assertEquals(SIZE - i - 1,
1375 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1376  
1377                  Thread.currentThread().interrupt();
1378                  try {
1379 <                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1379 >                    q.pollLast(randomTimeout(), randomTimeUnit());
1380                      shouldThrow();
1381                  } catch (InterruptedException success) {}
1382                  assertFalse(Thread.interrupted());
1383  
1384                  pleaseInterrupt.countDown();
1385                  try {
1386 <                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1386 >                    q.pollLast(LONGER_DELAY_MS, MILLISECONDS);
1387                      shouldThrow();
1388                  } catch (InterruptedException success) {}
1389                  assertFalse(Thread.interrupted());
1390              }});
1391  
1392          await(pleaseInterrupt);
1393 <        assertThreadStaysAlive(t);
1393 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1394          t.interrupt();
1395          awaitTermination(t);
1396 +        checkEmpty(q);
1397      }
1398  
1399      /**
# Line 1393 | Line 1415 | public class LinkedBlockingDequeTest ext
1415  
1416                  Thread.currentThread().interrupt();
1417                  try {
1418 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1418 >                    q.poll(randomTimeout(), randomTimeUnit());
1419                      shouldThrow();
1420                  } catch (InterruptedException success) {}
1421                  assertFalse(Thread.interrupted());
# Line 1404 | Line 1426 | public class LinkedBlockingDequeTest ext
1426                      shouldThrow();
1427                  } catch (InterruptedException success) {}
1428                  assertFalse(Thread.interrupted());
1429 +
1430 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1431              }});
1432  
1433          barrier.await();
# Line 1412 | Line 1436 | public class LinkedBlockingDequeTest ext
1436          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1437  
1438          barrier.await();
1439 <        assertThreadStaysAlive(t);
1439 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1440          t.interrupt();
1441          awaitTermination(t);
1442      }
# Line 1433 | Line 1457 | public class LinkedBlockingDequeTest ext
1457      }
1458  
1459      /**
1436     * remove(x) removes x and returns true if present
1437     */
1438    public void testRemoveElement() {
1439        LinkedBlockingDeque q = populatedDeque(SIZE);
1440        for (int i = 1; i < SIZE; i+=2) {
1441            assertTrue(q.contains(i));
1442            assertTrue(q.remove(i));
1443            assertFalse(q.contains(i));
1444            assertTrue(q.contains(i-1));
1445        }
1446        for (int i = 0; i < SIZE; i+=2) {
1447            assertTrue(q.contains(i));
1448            assertTrue(q.remove(i));
1449            assertFalse(q.contains(i));
1450            assertFalse(q.remove(i+1));
1451            assertFalse(q.contains(i+1));
1452        }
1453        assertTrue(q.isEmpty());
1454    }
1455
1456    /**
1460       * contains(x) reports true when elements added but not yet removed
1461       */
1462      public void testContains() {
# Line 1509 | Line 1512 | public class LinkedBlockingDequeTest ext
1512                  assertTrue(changed);
1513  
1514              assertTrue(q.containsAll(p));
1515 <            assertEquals(SIZE-i, q.size());
1515 >            assertEquals(SIZE - i, q.size());
1516              p.remove();
1517          }
1518      }
# Line 1522 | Line 1525 | public class LinkedBlockingDequeTest ext
1525              LinkedBlockingDeque q = populatedDeque(SIZE);
1526              LinkedBlockingDeque p = populatedDeque(i);
1527              assertTrue(q.removeAll(p));
1528 <            assertEquals(SIZE-i, q.size());
1528 >            assertEquals(SIZE - i, q.size());
1529              for (int j = 0; j < i; ++j) {
1530 <                Integer I = (Integer)(p.remove());
1531 <                assertFalse(q.contains(I));
1530 >                Integer x = (Integer)(p.remove());
1531 >                assertFalse(q.contains(x));
1532              }
1533          }
1534      }
# Line 1533 | Line 1536 | public class LinkedBlockingDequeTest ext
1536      /**
1537       * toArray contains all elements in FIFO order
1538       */
1539 <    public void testToArray() throws InterruptedException{
1539 >    public void testToArray() throws InterruptedException {
1540          LinkedBlockingDeque q = populatedDeque(SIZE);
1541 <        Object[] o = q.toArray();
1542 <        for (int i = 0; i < o.length; i++)
1543 <            assertSame(o[i], q.poll());
1541 >        Object[] a = q.toArray();
1542 >        assertSame(Object[].class, a.getClass());
1543 >        for (Object o : a)
1544 >            assertSame(o, q.poll());
1545 >        assertTrue(q.isEmpty());
1546      }
1547  
1548      /**
# Line 1548 | Line 1553 | public class LinkedBlockingDequeTest ext
1553          Integer[] ints = new Integer[SIZE];
1554          Integer[] array = q.toArray(ints);
1555          assertSame(ints, array);
1556 <        for (int i = 0; i < ints.length; i++)
1557 <            assertSame(ints[i], q.remove());
1558 <    }
1554 <
1555 <    /**
1556 <     * toArray(null) throws NullPointerException
1557 <     */
1558 <    public void testToArray_NullArg() {
1559 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1560 <        try {
1561 <            q.toArray(null);
1562 <            shouldThrow();
1563 <        } catch (NullPointerException success) {}
1556 >        for (Integer o : ints)
1557 >            assertSame(o, q.remove());
1558 >        assertTrue(q.isEmpty());
1559      }
1560  
1561      /**
# Line 1580 | Line 1575 | public class LinkedBlockingDequeTest ext
1575      public void testIterator() throws InterruptedException {
1576          LinkedBlockingDeque q = populatedDeque(SIZE);
1577          Iterator it = q.iterator();
1578 <        while (it.hasNext()) {
1578 >        int i;
1579 >        for (i = 0; it.hasNext(); i++)
1580 >            assertTrue(q.contains(it.next()));
1581 >        assertEquals(i, SIZE);
1582 >        assertIteratorExhausted(it);
1583 >
1584 >        it = q.iterator();
1585 >        for (i = 0; it.hasNext(); i++)
1586              assertEquals(it.next(), q.take());
1587 <        }
1587 >        assertEquals(i, SIZE);
1588 >        assertIteratorExhausted(it);
1589 >    }
1590 >
1591 >    /**
1592 >     * iterator of empty collection has no elements
1593 >     */
1594 >    public void testEmptyIterator() {
1595 >        Deque c = new LinkedBlockingDeque();
1596 >        assertIteratorExhausted(c.iterator());
1597 >        assertIteratorExhausted(c.descendingIterator());
1598      }
1599  
1600      /**
# Line 1715 | Line 1727 | public class LinkedBlockingDequeTest ext
1727          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1728          q.add(one);
1729          q.add(two);
1718        ExecutorService executor = Executors.newFixedThreadPool(2);
1730          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1731 <        executor.execute(new CheckedRunnable() {
1732 <            public void realRun() throws InterruptedException {
1733 <                assertFalse(q.offer(three));
1734 <                threadsStarted.await();
1735 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1736 <                assertEquals(0, q.remainingCapacity());
1737 <            }});
1738 <
1739 <        executor.execute(new CheckedRunnable() {
1740 <            public void realRun() throws InterruptedException {
1741 <                threadsStarted.await();
1742 <                assertSame(one, q.take());
1743 <            }});
1744 <
1745 <        joinPool(executor);
1731 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1732 >        try (PoolCleaner cleaner = cleaner(executor)) {
1733 >            executor.execute(new CheckedRunnable() {
1734 >                public void realRun() throws InterruptedException {
1735 >                    assertFalse(q.offer(three));
1736 >                    threadsStarted.await();
1737 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1738 >                    assertEquals(0, q.remainingCapacity());
1739 >                }});
1740 >
1741 >            executor.execute(new CheckedRunnable() {
1742 >                public void realRun() throws InterruptedException {
1743 >                    threadsStarted.await();
1744 >                    assertSame(one, q.take());
1745 >                }});
1746 >        }
1747      }
1748  
1749      /**
# Line 1740 | Line 1752 | public class LinkedBlockingDequeTest ext
1752      public void testPollInExecutor() {
1753          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1754          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1755 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1756 <        executor.execute(new CheckedRunnable() {
1757 <            public void realRun() throws InterruptedException {
1758 <                assertNull(q.poll());
1759 <                threadsStarted.await();
1760 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1761 <                checkEmpty(q);
1762 <            }});
1763 <
1764 <        executor.execute(new CheckedRunnable() {
1765 <            public void realRun() throws InterruptedException {
1766 <                threadsStarted.await();
1767 <                q.put(one);
1768 <            }});
1769 <
1770 <        joinPool(executor);
1755 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1756 >        try (PoolCleaner cleaner = cleaner(executor)) {
1757 >            executor.execute(new CheckedRunnable() {
1758 >                public void realRun() throws InterruptedException {
1759 >                    assertNull(q.poll());
1760 >                    threadsStarted.await();
1761 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1762 >                    checkEmpty(q);
1763 >                }});
1764 >
1765 >            executor.execute(new CheckedRunnable() {
1766 >                public void realRun() throws InterruptedException {
1767 >                    threadsStarted.await();
1768 >                    q.put(one);
1769 >                }});
1770 >        }
1771      }
1772  
1773      /**
1774 <     * A deserialized serialized deque has same elements in same order
1774 >     * A deserialized/reserialized deque has same elements in same order
1775       */
1776      public void testSerialization() throws Exception {
1777 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1777 >        Queue x = populatedDeque(SIZE);
1778 >        Queue y = serialClone(x);
1779  
1780 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1781 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1782 <        out.writeObject(q);
1783 <        out.close();
1784 <
1785 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1786 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1787 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1788 <        assertEquals(q.size(), r.size());
1776 <        while (!q.isEmpty())
1777 <            assertEquals(q.remove(), r.remove());
1778 <    }
1779 <
1780 <    /**
1781 <     * drainTo(null) throws NPE
1782 <     */
1783 <    public void testDrainToNull() {
1784 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1785 <        try {
1786 <            q.drainTo(null);
1787 <            shouldThrow();
1788 <        } catch (NullPointerException success) {}
1789 <    }
1790 <
1791 <    /**
1792 <     * drainTo(this) throws IAE
1793 <     */
1794 <    public void testDrainToSelf() {
1795 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1796 <        try {
1797 <            q.drainTo(q);
1798 <            shouldThrow();
1799 <        } catch (IllegalArgumentException success) {}
1780 >        assertNotSame(y, x);
1781 >        assertEquals(x.size(), y.size());
1782 >        assertEquals(x.toString(), y.toString());
1783 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1784 >        while (!x.isEmpty()) {
1785 >            assertFalse(y.isEmpty());
1786 >            assertEquals(x.remove(), y.remove());
1787 >        }
1788 >        assertTrue(y.isEmpty());
1789      }
1790  
1791      /**
# Line 1806 | Line 1795 | public class LinkedBlockingDequeTest ext
1795          LinkedBlockingDeque q = populatedDeque(SIZE);
1796          ArrayList l = new ArrayList();
1797          q.drainTo(l);
1798 <        assertEquals(q.size(), 0);
1799 <        assertEquals(l.size(), SIZE);
1798 >        assertEquals(0, q.size());
1799 >        assertEquals(SIZE, l.size());
1800          for (int i = 0; i < SIZE; ++i)
1801              assertEquals(l.get(i), new Integer(i));
1802          q.add(zero);
# Line 1817 | Line 1806 | public class LinkedBlockingDequeTest ext
1806          assertTrue(q.contains(one));
1807          l.clear();
1808          q.drainTo(l);
1809 <        assertEquals(q.size(), 0);
1810 <        assertEquals(l.size(), 2);
1809 >        assertEquals(0, q.size());
1810 >        assertEquals(2, l.size());
1811          for (int i = 0; i < 2; ++i)
1812              assertEquals(l.get(i), new Integer(i));
1813      }
# Line 1830 | Line 1819 | public class LinkedBlockingDequeTest ext
1819          final LinkedBlockingDeque q = populatedDeque(SIZE);
1820          Thread t = new Thread(new CheckedRunnable() {
1821              public void realRun() throws InterruptedException {
1822 <                q.put(new Integer(SIZE+1));
1822 >                q.put(new Integer(SIZE + 1));
1823              }});
1824  
1825          t.start();
# Line 1844 | Line 1833 | public class LinkedBlockingDequeTest ext
1833      }
1834  
1835      /**
1847     * drainTo(null, n) throws NPE
1848     */
1849    public void testDrainToNullN() {
1850        LinkedBlockingDeque q = populatedDeque(SIZE);
1851        try {
1852            q.drainTo(null, 0);
1853            shouldThrow();
1854        } catch (NullPointerException success) {}
1855    }
1856
1857    /**
1858     * drainTo(this, n) throws IAE
1859     */
1860    public void testDrainToSelfN() {
1861        LinkedBlockingDeque q = populatedDeque(SIZE);
1862        try {
1863            q.drainTo(q, 0);
1864            shouldThrow();
1865        } catch (IllegalArgumentException success) {}
1866    }
1867
1868    /**
1836       * drainTo(c, n) empties first min(n, size) elements of queue into c
1837       */
1838      public void testDrainToN() {
# Line 1876 | Line 1843 | public class LinkedBlockingDequeTest ext
1843              ArrayList l = new ArrayList();
1844              q.drainTo(l, i);
1845              int k = (i < SIZE) ? i : SIZE;
1846 <            assertEquals(l.size(), k);
1847 <            assertEquals(q.size(), SIZE-k);
1846 >            assertEquals(k, l.size());
1847 >            assertEquals(SIZE - k, q.size());
1848              for (int j = 0; j < k; ++j)
1849                  assertEquals(l.get(j), new Integer(j));
1850 <            while (q.poll() != null) ;
1850 >            do {} while (q.poll() != null);
1851 >        }
1852 >    }
1853 >
1854 >    /**
1855 >     * remove(null), contains(null) always return false
1856 >     */
1857 >    public void testNeverContainsNull() {
1858 >        Deque<?>[] qs = {
1859 >            new LinkedBlockingDeque<Object>(),
1860 >            populatedDeque(2),
1861 >        };
1862 >
1863 >        for (Deque<?> q : qs) {
1864 >            assertFalse(q.contains(null));
1865 >            assertFalse(q.remove(null));
1866 >            assertFalse(q.removeFirstOccurrence(null));
1867 >            assertFalse(q.removeLastOccurrence(null));
1868          }
1869      }
1870  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines