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.78 by jsr166, Sun May 14 01:30:34 2017 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) {}
# Line 432 | Line 445 | public class LinkedBlockingDequeTest ext
445       * push succeeds if not full; throws ISE 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 482 | Line 495 | public class LinkedBlockingDequeTest ext
495       * add succeeds if not full; throws ISE 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      /**
497     * 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    /**
509       * addAll(this) throws IAE
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 >        assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609          awaitTermination(t);
610          assertEquals(SIZE, q.size());
# Line 655 | Line 635 | public class LinkedBlockingDequeTest ext
635              }});
636  
637          await(pleaseTake);
638 <        assertEquals(q.remainingCapacity(), 0);
638 >        assertEquals(0, q.remainingCapacity());
639          assertEquals(0, q.take());
640  
641          await(pleaseInterrupt);
642 <        assertThreadStaysAlive(t);
642 >        assertThreadBlocks(t, Thread.State.WAITING);
643          t.interrupt();
644          awaitTermination(t);
645 <        assertEquals(q.remainingCapacity(), 0);
645 >        assertEquals(0, q.remainingCapacity());
646      }
647  
648      /**
# Line 683 | Line 663 | public class LinkedBlockingDequeTest ext
663                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
664                      shouldThrow();
665                  } catch (InterruptedException success) {}
666 +                assertFalse(Thread.interrupted());
667              }});
668  
669          await(pleaseInterrupt);
670 <        assertThreadStaysAlive(t);
670 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
671          t.interrupt();
672          awaitTermination(t);
673      }
# Line 709 | Line 690 | public class LinkedBlockingDequeTest ext
690          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
691          Thread t = newStartedThread(new CheckedRunnable() {
692              public void realRun() throws InterruptedException {
693 <                for (int i = 0; i < SIZE; ++i) {
713 <                    assertEquals(i, q.take());
714 <                }
693 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
694  
695                  Thread.currentThread().interrupt();
696                  try {
# Line 729 | Line 708 | public class LinkedBlockingDequeTest ext
708              }});
709  
710          await(pleaseInterrupt);
711 <        assertThreadStaysAlive(t);
711 >        assertThreadBlocks(t, Thread.State.WAITING);
712          t.interrupt();
713          awaitTermination(t);
714      }
# Line 778 | Line 757 | public class LinkedBlockingDequeTest ext
757       */
758      public void testInterruptedTimedPoll() throws InterruptedException {
759          final BlockingQueue<Integer> q = populatedDeque(SIZE);
760 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
760 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
761          Thread t = newStartedThread(new CheckedRunnable() {
762              public void realRun() throws InterruptedException {
763 <                for (int i = 0; i < SIZE; ++i) {
764 <                    long t0 = System.nanoTime();
763 >                long startTime = System.nanoTime();
764 >                for (int i = 0; i < SIZE; i++)
765                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
766 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
767 <                }
789 <                long t0 = System.nanoTime();
790 <                aboutToWait.countDown();
766 >
767 >                Thread.currentThread().interrupt();
768                  try {
769 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
769 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
770                      shouldThrow();
771 <                } catch (InterruptedException success) {
772 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
773 <                }
771 >                } catch (InterruptedException success) {}
772 >                assertFalse(Thread.interrupted());
773 >
774 >                pleaseInterrupt.countDown();
775 >                try {
776 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
777 >                    shouldThrow();
778 >                } catch (InterruptedException success) {}
779 >                assertFalse(Thread.interrupted());
780 >
781 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
782              }});
783  
784 <        aboutToWait.await();
785 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
784 >        await(pleaseInterrupt);
785 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
786          t.interrupt();
787 <        awaitTermination(t, MEDIUM_DELAY_MS);
787 >        awaitTermination(t);
788          checkEmpty(q);
789      }
790  
# Line 807 | Line 792 | public class LinkedBlockingDequeTest ext
792       * putFirst(null) throws NPE
793       */
794      public void testPutFirstNull() throws InterruptedException {
795 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
796          try {
811            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
797              q.putFirst(null);
798              shouldThrow();
799          } catch (NullPointerException success) {}
# Line 820 | Line 805 | public class LinkedBlockingDequeTest ext
805      public void testPutFirst() throws InterruptedException {
806          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
807          for (int i = 0; i < SIZE; ++i) {
808 <            Integer I = new Integer(i);
809 <            q.putFirst(I);
810 <            assertTrue(q.contains(I));
808 >            Integer x = new Integer(i);
809 >            q.putFirst(x);
810 >            assertTrue(q.contains(x));
811          }
812          assertEquals(0, q.remainingCapacity());
813      }
# Line 856 | Line 841 | public class LinkedBlockingDequeTest ext
841              }});
842  
843          await(pleaseInterrupt);
844 <        assertThreadStaysAlive(t);
844 >        assertThreadBlocks(t, Thread.State.WAITING);
845          t.interrupt();
846          awaitTermination(t);
847          assertEquals(SIZE, q.size());
# Line 887 | Line 872 | public class LinkedBlockingDequeTest ext
872              }});
873  
874          await(pleaseTake);
875 <        assertEquals(q.remainingCapacity(), 0);
875 >        assertEquals(0, q.remainingCapacity());
876          assertEquals(capacity - 1, q.take());
877  
878          await(pleaseInterrupt);
879 <        assertThreadStaysAlive(t);
879 >        assertThreadBlocks(t, Thread.State.WAITING);
880          t.interrupt();
881          awaitTermination(t);
882 <        assertEquals(q.remainingCapacity(), 0);
882 >        assertEquals(0, q.remainingCapacity());
883      }
884  
885      /**
# Line 915 | Line 900 | public class LinkedBlockingDequeTest ext
900                      q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
901                      shouldThrow();
902                  } catch (InterruptedException success) {}
903 +                assertFalse(Thread.interrupted());
904              }});
905  
906          await(pleaseInterrupt);
907 <        assertThreadStaysAlive(t);
907 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
908          t.interrupt();
909          awaitTermination(t);
910      }
# Line 950 | Line 936 | public class LinkedBlockingDequeTest ext
936              }});
937  
938          await(threadStarted);
939 <        assertThreadStaysAlive(t);
939 >        assertThreadBlocks(t, Thread.State.WAITING);
940          t.interrupt();
941          awaitTermination(t);
942      }
# Line 991 | Line 977 | public class LinkedBlockingDequeTest ext
977              }});
978  
979          await(threadStarted);
980 <        assertThreadStaysAlive(t);
980 >        assertThreadBlocks(t, Thread.State.WAITING);
981          t.interrupt();
982          awaitTermination(t);
983      }
# Line 1023 | Line 1009 | public class LinkedBlockingDequeTest ext
1009          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1010          Thread t = newStartedThread(new CheckedRunnable() {
1011              public void realRun() throws InterruptedException {
1012 <                for (int i = 0; i < SIZE; ++i) {
1027 <                    assertEquals(i, q.takeFirst());
1028 <                }
1012 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1013  
1014                  Thread.currentThread().interrupt();
1015                  try {
# Line 1043 | Line 1027 | public class LinkedBlockingDequeTest ext
1027              }});
1028  
1029          await(pleaseInterrupt);
1030 <        assertThreadStaysAlive(t);
1030 >        assertThreadBlocks(t, Thread.State.WAITING);
1031          t.interrupt();
1032          awaitTermination(t);
1033      }
# Line 1080 | Line 1064 | public class LinkedBlockingDequeTest ext
1064       * returning timeout status
1065       */
1066      public void testInterruptedTimedPollFirst() throws InterruptedException {
1067 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1068          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1069          Thread t = newStartedThread(new CheckedRunnable() {
1070              public void realRun() throws InterruptedException {
1071 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1072 <                for (int i = 0; i < SIZE; ++i) {
1071 >                long startTime = System.nanoTime();
1072 >                for (int i = 0; i < SIZE; i++)
1073                      assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1089                }
1074  
1075                  Thread.currentThread().interrupt();
1076                  try {
1077 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1077 >                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1078                      shouldThrow();
1079                  } catch (InterruptedException success) {}
1080                  assertFalse(Thread.interrupted());
1081  
1082                  pleaseInterrupt.countDown();
1083                  try {
1084 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1084 >                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1085                      shouldThrow();
1086                  } catch (InterruptedException success) {}
1087                  assertFalse(Thread.interrupted());
1088 +
1089 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1090              }});
1091  
1092          await(pleaseInterrupt);
1093 <        assertThreadStaysAlive(t);
1093 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1094          t.interrupt();
1095          awaitTermination(t);
1096      }
# Line 1137 | Line 1123 | public class LinkedBlockingDequeTest ext
1123                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1124                      shouldThrow();
1125                  } catch (InterruptedException success) {}
1126 +                assertFalse(Thread.interrupted());
1127                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1128              }});
1129  
# Line 1145 | Line 1132 | public class LinkedBlockingDequeTest ext
1132          assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1133          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1134          barrier.await();
1135 <        assertThreadStaysAlive(t);
1135 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1136          t.interrupt();
1137          awaitTermination(t);
1138      }
# Line 1154 | Line 1141 | public class LinkedBlockingDequeTest ext
1141       * putLast(null) throws NPE
1142       */
1143      public void testPutLastNull() throws InterruptedException {
1144 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1145          try {
1158            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1146              q.putLast(null);
1147              shouldThrow();
1148          } catch (NullPointerException success) {}
# Line 1167 | Line 1154 | public class LinkedBlockingDequeTest ext
1154      public void testPutLast() throws InterruptedException {
1155          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1156          for (int i = 0; i < SIZE; ++i) {
1157 <            Integer I = new Integer(i);
1158 <            q.putLast(I);
1159 <            assertTrue(q.contains(I));
1157 >            Integer x = new Integer(i);
1158 >            q.putLast(x);
1159 >            assertTrue(q.contains(x));
1160          }
1161          assertEquals(0, q.remainingCapacity());
1162      }
# Line 1203 | Line 1190 | public class LinkedBlockingDequeTest ext
1190              }});
1191  
1192          await(pleaseInterrupt);
1193 <        assertThreadStaysAlive(t);
1193 >        assertThreadBlocks(t, Thread.State.WAITING);
1194          t.interrupt();
1195          awaitTermination(t);
1196          assertEquals(SIZE, q.size());
# Line 1234 | Line 1221 | public class LinkedBlockingDequeTest ext
1221              }});
1222  
1223          await(pleaseTake);
1224 <        assertEquals(q.remainingCapacity(), 0);
1224 >        assertEquals(0, q.remainingCapacity());
1225          assertEquals(0, q.take());
1226  
1227          await(pleaseInterrupt);
1228 <        assertThreadStaysAlive(t);
1228 >        assertThreadBlocks(t, Thread.State.WAITING);
1229          t.interrupt();
1230          awaitTermination(t);
1231 <        assertEquals(q.remainingCapacity(), 0);
1231 >        assertEquals(0, q.remainingCapacity());
1232      }
1233  
1234      /**
# Line 1265 | Line 1252 | public class LinkedBlockingDequeTest ext
1252              }});
1253  
1254          await(pleaseInterrupt);
1255 <        assertThreadStaysAlive(t);
1255 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1256          t.interrupt();
1257          awaitTermination(t);
1258      }
# Line 1276 | Line 1263 | public class LinkedBlockingDequeTest ext
1263      public void testTakeLast() throws InterruptedException {
1264          LinkedBlockingDeque q = populatedDeque(SIZE);
1265          for (int i = 0; i < SIZE; ++i) {
1266 <            assertEquals(SIZE-i-1, q.takeLast());
1266 >            assertEquals(SIZE - i - 1, q.takeLast());
1267          }
1268      }
1269  
# Line 1288 | Line 1275 | public class LinkedBlockingDequeTest ext
1275          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1276          Thread t = newStartedThread(new CheckedRunnable() {
1277              public void realRun() throws InterruptedException {
1278 <                for (int i = 0; i < SIZE; ++i) {
1279 <                    assertEquals(SIZE-i-1, q.takeLast());
1293 <                }
1278 >                for (int i = 0; i < SIZE; i++)
1279 >                    assertEquals(SIZE - i - 1, q.takeLast());
1280  
1281                  Thread.currentThread().interrupt();
1282                  try {
# Line 1308 | Line 1294 | public class LinkedBlockingDequeTest ext
1294              }});
1295  
1296          await(pleaseInterrupt);
1297 <        assertThreadStaysAlive(t);
1297 >        assertThreadBlocks(t, Thread.State.WAITING);
1298          t.interrupt();
1299          awaitTermination(t);
1300      }
# Line 1319 | Line 1305 | public class LinkedBlockingDequeTest ext
1305      public void testTimedPollLast0() throws InterruptedException {
1306          LinkedBlockingDeque q = populatedDeque(SIZE);
1307          for (int i = 0; i < SIZE; ++i) {
1308 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1308 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1309          }
1310          assertNull(q.pollLast(0, MILLISECONDS));
1311      }
# Line 1331 | Line 1317 | public class LinkedBlockingDequeTest ext
1317          LinkedBlockingDeque q = populatedDeque(SIZE);
1318          for (int i = 0; i < SIZE; ++i) {
1319              long startTime = System.nanoTime();
1320 <            assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1320 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1321              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1322          }
1323          long startTime = System.nanoTime();
# Line 1345 | Line 1331 | public class LinkedBlockingDequeTest ext
1331       * returning timeout status
1332       */
1333      public void testInterruptedTimedPollLast() throws InterruptedException {
1334 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1335          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1336          Thread t = newStartedThread(new CheckedRunnable() {
1337              public void realRun() throws InterruptedException {
1338 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1339 <                for (int i = 0; i < SIZE; ++i) {
1340 <                    assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1341 <                }
1338 >                long startTime = System.nanoTime();
1339 >                for (int i = 0; i < SIZE; i++)
1340 >                    assertEquals(SIZE - i - 1,
1341 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1342  
1343                  Thread.currentThread().interrupt();
1344                  try {
# Line 1366 | Line 1353 | public class LinkedBlockingDequeTest ext
1353                      shouldThrow();
1354                  } catch (InterruptedException success) {}
1355                  assertFalse(Thread.interrupted());
1356 +
1357 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1358              }});
1359  
1360          await(pleaseInterrupt);
1361 <        assertThreadStaysAlive(t);
1361 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1362          t.interrupt();
1363          awaitTermination(t);
1364 +        checkEmpty(q);
1365      }
1366  
1367      /**
# Line 1404 | Line 1394 | public class LinkedBlockingDequeTest ext
1394                      shouldThrow();
1395                  } catch (InterruptedException success) {}
1396                  assertFalse(Thread.interrupted());
1397 +
1398 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1399              }});
1400  
1401          barrier.await();
# Line 1412 | Line 1404 | public class LinkedBlockingDequeTest ext
1404          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1405  
1406          barrier.await();
1407 <        assertThreadStaysAlive(t);
1407 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1408          t.interrupt();
1409          awaitTermination(t);
1410      }
# Line 1433 | Line 1425 | public class LinkedBlockingDequeTest ext
1425      }
1426  
1427      /**
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    /**
1428       * contains(x) reports true when elements added but not yet removed
1429       */
1430      public void testContains() {
# Line 1509 | Line 1480 | public class LinkedBlockingDequeTest ext
1480                  assertTrue(changed);
1481  
1482              assertTrue(q.containsAll(p));
1483 <            assertEquals(SIZE-i, q.size());
1483 >            assertEquals(SIZE - i, q.size());
1484              p.remove();
1485          }
1486      }
# Line 1522 | Line 1493 | public class LinkedBlockingDequeTest ext
1493              LinkedBlockingDeque q = populatedDeque(SIZE);
1494              LinkedBlockingDeque p = populatedDeque(i);
1495              assertTrue(q.removeAll(p));
1496 <            assertEquals(SIZE-i, q.size());
1496 >            assertEquals(SIZE - i, q.size());
1497              for (int j = 0; j < i; ++j) {
1498 <                Integer I = (Integer)(p.remove());
1499 <                assertFalse(q.contains(I));
1498 >                Integer x = (Integer)(p.remove());
1499 >                assertFalse(q.contains(x));
1500              }
1501          }
1502      }
# Line 1533 | Line 1504 | public class LinkedBlockingDequeTest ext
1504      /**
1505       * toArray contains all elements in FIFO order
1506       */
1507 <    public void testToArray() throws InterruptedException{
1507 >    public void testToArray() throws InterruptedException {
1508          LinkedBlockingDeque q = populatedDeque(SIZE);
1509          Object[] o = q.toArray();
1510          for (int i = 0; i < o.length; i++)
# Line 1553 | Line 1524 | public class LinkedBlockingDequeTest ext
1524      }
1525  
1526      /**
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) {}
1564    }
1565
1566    /**
1527       * toArray(incompatible array type) throws ArrayStoreException
1528       */
1529      public void testToArray1_BadArg() {
# Line 1580 | Line 1540 | public class LinkedBlockingDequeTest ext
1540      public void testIterator() throws InterruptedException {
1541          LinkedBlockingDeque q = populatedDeque(SIZE);
1542          Iterator it = q.iterator();
1543 <        while (it.hasNext()) {
1543 >        int i;
1544 >        for (i = 0; it.hasNext(); i++)
1545 >            assertTrue(q.contains(it.next()));
1546 >        assertEquals(i, SIZE);
1547 >        assertIteratorExhausted(it);
1548 >
1549 >        it = q.iterator();
1550 >        for (i = 0; it.hasNext(); i++)
1551              assertEquals(it.next(), q.take());
1552 <        }
1552 >        assertEquals(i, SIZE);
1553 >        assertIteratorExhausted(it);
1554 >    }
1555 >
1556 >    /**
1557 >     * iterator of empty collection has no elements
1558 >     */
1559 >    public void testEmptyIterator() {
1560 >        Deque c = new LinkedBlockingDeque();
1561 >        assertIteratorExhausted(c.iterator());
1562 >        assertIteratorExhausted(c.descendingIterator());
1563      }
1564  
1565      /**
# Line 1715 | Line 1692 | public class LinkedBlockingDequeTest ext
1692          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1693          q.add(one);
1694          q.add(two);
1718        ExecutorService executor = Executors.newFixedThreadPool(2);
1695          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1696 <        executor.execute(new CheckedRunnable() {
1697 <            public void realRun() throws InterruptedException {
1698 <                assertFalse(q.offer(three));
1699 <                threadsStarted.await();
1700 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1701 <                assertEquals(0, q.remainingCapacity());
1702 <            }});
1703 <
1704 <        executor.execute(new CheckedRunnable() {
1705 <            public void realRun() throws InterruptedException {
1706 <                threadsStarted.await();
1707 <                assertSame(one, q.take());
1708 <            }});
1709 <
1710 <        joinPool(executor);
1696 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1697 >        try (PoolCleaner cleaner = cleaner(executor)) {
1698 >            executor.execute(new CheckedRunnable() {
1699 >                public void realRun() throws InterruptedException {
1700 >                    assertFalse(q.offer(three));
1701 >                    threadsStarted.await();
1702 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1703 >                    assertEquals(0, q.remainingCapacity());
1704 >                }});
1705 >
1706 >            executor.execute(new CheckedRunnable() {
1707 >                public void realRun() throws InterruptedException {
1708 >                    threadsStarted.await();
1709 >                    assertSame(one, q.take());
1710 >                }});
1711 >        }
1712      }
1713  
1714      /**
# Line 1740 | Line 1717 | public class LinkedBlockingDequeTest ext
1717      public void testPollInExecutor() {
1718          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1719          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1720 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1721 <        executor.execute(new CheckedRunnable() {
1722 <            public void realRun() throws InterruptedException {
1723 <                assertNull(q.poll());
1724 <                threadsStarted.await();
1725 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1726 <                checkEmpty(q);
1727 <            }});
1728 <
1729 <        executor.execute(new CheckedRunnable() {
1730 <            public void realRun() throws InterruptedException {
1731 <                threadsStarted.await();
1732 <                q.put(one);
1733 <            }});
1734 <
1735 <        joinPool(executor);
1720 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1721 >        try (PoolCleaner cleaner = cleaner(executor)) {
1722 >            executor.execute(new CheckedRunnable() {
1723 >                public void realRun() throws InterruptedException {
1724 >                    assertNull(q.poll());
1725 >                    threadsStarted.await();
1726 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1727 >                    checkEmpty(q);
1728 >                }});
1729 >
1730 >            executor.execute(new CheckedRunnable() {
1731 >                public void realRun() throws InterruptedException {
1732 >                    threadsStarted.await();
1733 >                    q.put(one);
1734 >                }});
1735 >        }
1736      }
1737  
1738      /**
1739       * A deserialized serialized deque has same elements in same order
1740       */
1741      public void testSerialization() throws Exception {
1742 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1743 <
1767 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1768 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1769 <        out.writeObject(q);
1770 <        out.close();
1771 <
1772 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1773 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1774 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1775 <        assertEquals(q.size(), r.size());
1776 <        while (!q.isEmpty())
1777 <            assertEquals(q.remove(), r.remove());
1778 <    }
1742 >        Queue x = populatedDeque(SIZE);
1743 >        Queue y = serialClone(x);
1744  
1745 <    /**
1746 <     * drainTo(null) throws NPE
1747 <     */
1748 <    public void testDrainToNull() {
1749 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1750 <        try {
1751 <            q.drainTo(null);
1752 <            shouldThrow();
1753 <        } 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) {}
1745 >        assertNotSame(y, x);
1746 >        assertEquals(x.size(), y.size());
1747 >        assertEquals(x.toString(), y.toString());
1748 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1749 >        while (!x.isEmpty()) {
1750 >            assertFalse(y.isEmpty());
1751 >            assertEquals(x.remove(), y.remove());
1752 >        }
1753 >        assertTrue(y.isEmpty());
1754      }
1755  
1756      /**
# Line 1806 | Line 1760 | public class LinkedBlockingDequeTest ext
1760          LinkedBlockingDeque q = populatedDeque(SIZE);
1761          ArrayList l = new ArrayList();
1762          q.drainTo(l);
1763 <        assertEquals(q.size(), 0);
1764 <        assertEquals(l.size(), SIZE);
1763 >        assertEquals(0, q.size());
1764 >        assertEquals(SIZE, l.size());
1765          for (int i = 0; i < SIZE; ++i)
1766              assertEquals(l.get(i), new Integer(i));
1767          q.add(zero);
# Line 1817 | Line 1771 | public class LinkedBlockingDequeTest ext
1771          assertTrue(q.contains(one));
1772          l.clear();
1773          q.drainTo(l);
1774 <        assertEquals(q.size(), 0);
1775 <        assertEquals(l.size(), 2);
1774 >        assertEquals(0, q.size());
1775 >        assertEquals(2, l.size());
1776          for (int i = 0; i < 2; ++i)
1777              assertEquals(l.get(i), new Integer(i));
1778      }
# Line 1830 | Line 1784 | public class LinkedBlockingDequeTest ext
1784          final LinkedBlockingDeque q = populatedDeque(SIZE);
1785          Thread t = new Thread(new CheckedRunnable() {
1786              public void realRun() throws InterruptedException {
1787 <                q.put(new Integer(SIZE+1));
1787 >                q.put(new Integer(SIZE + 1));
1788              }});
1789  
1790          t.start();
# Line 1844 | Line 1798 | public class LinkedBlockingDequeTest ext
1798      }
1799  
1800      /**
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    /**
1801       * drainTo(c, n) empties first min(n, size) elements of queue into c
1802       */
1803      public void testDrainToN() {
# Line 1876 | Line 1808 | public class LinkedBlockingDequeTest ext
1808              ArrayList l = new ArrayList();
1809              q.drainTo(l, i);
1810              int k = (i < SIZE) ? i : SIZE;
1811 <            assertEquals(l.size(), k);
1812 <            assertEquals(q.size(), SIZE-k);
1811 >            assertEquals(k, l.size());
1812 >            assertEquals(SIZE - k, q.size());
1813              for (int j = 0; j < k; ++j)
1814                  assertEquals(l.get(j), new Integer(j));
1815 <            while (q.poll() != null) ;
1815 >            do {} while (q.poll() != null);
1816 >        }
1817 >    }
1818 >
1819 >    /**
1820 >     * remove(null), contains(null) always return false
1821 >     */
1822 >    public void testNeverContainsNull() {
1823 >        Deque<?>[] qs = {
1824 >            new LinkedBlockingDeque<Object>(),
1825 >            populatedDeque(2),
1826 >        };
1827 >
1828 >        for (Deque<?> q : qs) {
1829 >            assertFalse(q.contains(null));
1830 >            assertFalse(q.remove(null));
1831 >            assertFalse(q.removeFirstOccurrence(null));
1832 >            assertFalse(q.removeLastOccurrence(null));
1833          }
1834      }
1835  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines