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.27 by jsr166, Tue Oct 19 00:43:49 2010 UTC vs.
Revision 1.87 by jsr166, Thu Sep 5 21:39:57 2019 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
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 populatedDeque(int n) {
62 <        LinkedBlockingDeque q = new LinkedBlockingDeque(n);
61 >    private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62 >        LinkedBlockingDeque<Integer> q =
63 >            new LinkedBlockingDeque<Integer>(n);
64          assertTrue(q.isEmpty());
65          for (int i = 0; i < n; i++)
66              assertTrue(q.offer(new Integer(i)));
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 69 | 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 79 | 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 {
86            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 123 | 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 162 | 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 192 | 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 252 | 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 267 | 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 297 | Line 331 | public class LinkedBlockingDequeTest ext
331          assertSame(four, q.peekLast());
332      }
333  
300
334      /**
335       * A new deque has the indicated capacity, or Integer.MAX_VALUE if
336       * none given
# 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 455 | Line 468 | public class LinkedBlockingDequeTest ext
468          assertSame(four, q.peekFirst());
469      }
470  
458
471      /**
472       * pop removes next element, or throws NSEE if empty
473       */
# Line 470 | Line 482 | public class LinkedBlockingDequeTest ext
482          } catch (NoSuchElementException success) {}
483      }
484  
473
485      /**
486       * Offer succeeds if not full; fails if full
487       */
# Line 481 | 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 {
488            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
489            for (int i = 0; i < SIZE; ++i) {
490                assertTrue(q.add(new Integer(i)));
491            }
492            assertEquals(0, q.remainingCapacity());
503              q.add(new Integer(SIZE));
504              shouldThrow();
505          } catch (IllegalStateException success) {}
506      }
507  
508      /**
509 <     * addAll(null) throws NPE
500 <     */
501 <    public void testAddAll1() {
502 <        try {
503 <            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
504 <            q.addAll(null);
505 <            shouldThrow();
506 <        } catch (NullPointerException success) {}
507 <    }
508 <
509 <    /**
510 <     * addAll(this) throws IAE
509 >     * addAll(this) throws IllegalArgumentException
510       */
511      public void testAddAllSelf() {
512 +        LinkedBlockingDeque q = populatedDeque(SIZE);
513          try {
514            LinkedBlockingDeque q = populatedDeque(SIZE);
514              q.addAll(q);
515              shouldThrow();
516          } catch (IllegalArgumentException success) {}
517      }
518  
519      /**
521     * addAll of a collection with null elements throws NPE
522     */
523    public void testAddAll2() {
524        try {
525            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
526            Integer[] ints = new Integer[SIZE];
527            q.addAll(Arrays.asList(ints));
528            shouldThrow();
529        } catch (NullPointerException success) {}
530    }
531
532    /**
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);
539 <            Integer[] ints = new Integer[SIZE];
540 <            for (int i = 0; i < SIZE-1; ++i)
541 <                ints[i] = new Integer(i);
542 <            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);
553 <            Integer[] ints = new Integer[SIZE];
554 <            for (int i = 0; i < SIZE; ++i)
555 <                ints[i] = new Integer(i);
556 <            q.addAll(Arrays.asList(ints));
545 >            q.addAll(elements);
546              shouldThrow();
547          } catch (IllegalStateException success) {}
548      }
# Line 573 | Line 562 | public class LinkedBlockingDequeTest ext
562              assertEquals(ints[i], q.poll());
563      }
564  
576
577    /**
578     * put(null) throws NPE
579     */
580    public void testPutNull() throws InterruptedException {
581        try {
582            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
583            q.put(null);
584            shouldThrow();
585        } catch (NullPointerException success) {}
586    }
587
565      /**
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 603 | Line 580 | public class LinkedBlockingDequeTest ext
580       */
581      public void testBlockingPut() throws InterruptedException {
582          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
583 <        Thread t = new Thread(new CheckedRunnable() {
583 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
584 >        Thread t = newStartedThread(new CheckedRunnable() {
585              public void realRun() throws InterruptedException {
586                  for (int i = 0; i < SIZE; ++i)
587                      q.put(i);
588                  assertEquals(SIZE, q.size());
589                  assertEquals(0, q.remainingCapacity());
590 +
591 +                Thread.currentThread().interrupt();
592                  try {
593                      q.put(99);
594                      shouldThrow();
595                  } catch (InterruptedException success) {}
596 +                assertFalse(Thread.interrupted());
597 +
598 +                pleaseInterrupt.countDown();
599 +                try {
600 +                    q.put(99);
601 +                    shouldThrow();
602 +                } catch (InterruptedException success) {}
603 +                assertFalse(Thread.interrupted());
604              }});
605  
606 <        t.start();
607 <        Thread.sleep(SHORT_DELAY_MS);
606 >        await(pleaseInterrupt);
607 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609 <        t.join();
609 >        awaitTermination(t);
610          assertEquals(SIZE, q.size());
611          assertEquals(0, q.remainingCapacity());
612      }
613  
614      /**
615 <     * put blocks waiting for take when full
615 >     * put blocks interruptibly waiting for take when full
616       */
617      public void testPutWithTake() throws InterruptedException {
618          final int capacity = 2;
619          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
620 <        Thread t = new Thread(new CheckedRunnable() {
620 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
621 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
622 >        Thread t = newStartedThread(new CheckedRunnable() {
623              public void realRun() throws InterruptedException {
624 <                for (int i = 0; i < capacity + 1; i++)
624 >                for (int i = 0; i < capacity; i++)
625                      q.put(i);
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);
639                      shouldThrow();
640                  } catch (InterruptedException success) {}
641 +                assertFalse(Thread.interrupted());
642              }});
643  
644 <        t.start();
645 <        Thread.sleep(SHORT_DELAY_MS);
644 <        assertEquals(q.remainingCapacity(), 0);
644 >        await(pleaseTake);
645 >        assertEquals(0, q.remainingCapacity());
646          assertEquals(0, q.take());
647 <        Thread.sleep(SHORT_DELAY_MS);
647 >
648 >        await(pleaseInterrupt);
649 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
650          t.interrupt();
651 <        t.join();
652 <        assertEquals(q.remainingCapacity(), 0);
651 >        awaitTermination(t);
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 <        Thread t = new Thread(new CheckedRunnable() {
660 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
661 >        Thread t = newStartedThread(new CheckedRunnable() {
662              public void realRun() throws InterruptedException {
663                  q.put(new Object());
664                  q.put(new Object());
665 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
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(), LONG_DELAY_MS, MILLISECONDS);
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(), LONGER_DELAY_MS, MILLISECONDS);
680 +                    shouldThrow();
681 +                } catch (InterruptedException success) {}
682 +                assertFalse(Thread.interrupted());
683              }});
684  
685 <        t.start();
686 <        Thread.sleep(SMALL_DELAY_MS);
685 >        await(pleaseInterrupt);
686 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
687          t.interrupt();
688 <        t.join();
688 >        awaitTermination(t);
689      }
690  
691      /**
# Line 682 | Line 699 | public class LinkedBlockingDequeTest ext
699      }
700  
701      /**
702 <     * take blocks interruptibly when empty
686 <     */
687 <    public void testTakeFromEmpty() throws InterruptedException {
688 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
689 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
690 <            public void realRun() throws InterruptedException {
691 <                q.take();
692 <            }};
693 <
694 <        t.start();
695 <        Thread.sleep(SHORT_DELAY_MS);
696 <        t.interrupt();
697 <        t.join();
698 <    }
699 <
700 <    /**
701 <     * Take removes existing elements until empty, then blocks interruptibly
702 >     * take removes existing elements until empty, then blocks interruptibly
703       */
704      public void testBlockingTake() throws InterruptedException {
705          final LinkedBlockingDeque q = populatedDeque(SIZE);
706 <        Thread t = new Thread(new CheckedRunnable() {
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) {
710 <                    assertEquals(i, q.take());
711 <                }
709 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
710 >
711 >                Thread.currentThread().interrupt();
712                  try {
713                      q.take();
714                      shouldThrow();
715                  } catch (InterruptedException success) {}
716 +                assertFalse(Thread.interrupted());
717 +
718 +                pleaseInterrupt.countDown();
719 +                try {
720 +                    q.take();
721 +                    shouldThrow();
722 +                } catch (InterruptedException success) {}
723 +                assertFalse(Thread.interrupted());
724              }});
725  
726 <        t.start();
727 <        Thread.sleep(SHORT_DELAY_MS);
726 >        await(pleaseInterrupt);
727 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
728          t.interrupt();
729 <        t.join();
729 >        awaitTermination(t);
730      }
731  
722
732      /**
733       * poll succeeds unless empty
734       */
# Line 748 | Line 757 | public class LinkedBlockingDequeTest ext
757      public void testTimedPoll() throws InterruptedException {
758          LinkedBlockingDeque q = populatedDeque(SIZE);
759          for (int i = 0; i < SIZE; ++i) {
760 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
761 <        }
762 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
760 >            long startTime = System.nanoTime();
761 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
762 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
763 >        }
764 >        long startTime = System.nanoTime();
765 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
766 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
767 >        checkEmpty(q);
768      }
769  
770      /**
# Line 758 | Line 772 | public class LinkedBlockingDequeTest ext
772       * returning timeout status
773       */
774      public void testInterruptedTimedPoll() throws InterruptedException {
775 <        Thread t = new Thread(new CheckedRunnable() {
775 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
776 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
777 >        Thread t = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                LinkedBlockingDeque q = populatedDeque(SIZE);
780 <                for (int i = 0; i < SIZE; ++i) {
781 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
782 <                }
779 >                for (int i = 0; i < SIZE; i++)
780 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
781 >
782 >                Thread.currentThread().interrupt();
783                  try {
784 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
784 >                    q.poll(randomTimeout(), randomTimeUnit());
785                      shouldThrow();
786                  } catch (InterruptedException success) {}
787 +                assertFalse(Thread.interrupted());
788 +
789 +                pleaseInterrupt.countDown();
790 +                try {
791 +                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
792 +                    shouldThrow();
793 +                } catch (InterruptedException success) {}
794 +                assertFalse(Thread.interrupted());
795              }});
796  
797 <        t.start();
798 <        Thread.sleep(SHORT_DELAY_MS);
797 >        await(pleaseInterrupt);
798 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
799          t.interrupt();
800 <        t.join();
800 >        awaitTermination(t);
801 >        checkEmpty(q);
802      }
803  
804      /**
805       * putFirst(null) throws NPE
806       */
807 <     public void testPutFirstNull() throws InterruptedException {
807 >    public void testPutFirstNull() throws InterruptedException {
808 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
809          try {
784            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
810              q.putFirst(null);
811              shouldThrow();
812          } catch (NullPointerException success) {}
813 <     }
813 >    }
814  
815      /**
816       * all elements successfully putFirst are contained
817       */
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));
824 <         }
825 <         assertEquals(0, q.remainingCapacity());
818 >    public void testPutFirst() throws InterruptedException {
819 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
820 >        for (int i = 0; i < SIZE; ++i) {
821 >            Integer x = new Integer(i);
822 >            q.putFirst(x);
823 >            assertTrue(q.contains(x));
824 >        }
825 >        assertEquals(0, q.remainingCapacity());
826      }
827  
828      /**
# Line 805 | Line 830 | public class LinkedBlockingDequeTest ext
830       */
831      public void testBlockingPutFirst() throws InterruptedException {
832          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
833 <        Thread t = new Thread(new CheckedRunnable() {
833 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
834 >        Thread t = newStartedThread(new CheckedRunnable() {
835              public void realRun() throws InterruptedException {
836                  for (int i = 0; i < SIZE; ++i)
837                      q.putFirst(i);
838                  assertEquals(SIZE, q.size());
839                  assertEquals(0, q.remainingCapacity());
840 +
841 +                Thread.currentThread().interrupt();
842                  try {
843                      q.putFirst(99);
844                      shouldThrow();
845                  } catch (InterruptedException success) {}
846 +                assertFalse(Thread.interrupted());
847 +
848 +                pleaseInterrupt.countDown();
849 +                try {
850 +                    q.putFirst(99);
851 +                    shouldThrow();
852 +                } catch (InterruptedException success) {}
853 +                assertFalse(Thread.interrupted());
854              }});
855  
856 <        t.start();
857 <        Thread.sleep(SHORT_DELAY_MS);
856 >        await(pleaseInterrupt);
857 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
858          t.interrupt();
859 <        t.join();
859 >        awaitTermination(t);
860          assertEquals(SIZE, q.size());
861          assertEquals(0, q.remainingCapacity());
862      }
863  
864      /**
865 <     * putFirst blocks waiting for take when full
865 >     * putFirst blocks interruptibly waiting for take when full
866       */
867      public void testPutFirstWithTake() throws InterruptedException {
868          final int capacity = 2;
869          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
870 <        Thread t = new Thread(new CheckedRunnable() {
870 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
871 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
872 >        Thread t = newStartedThread(new CheckedRunnable() {
873              public void realRun() throws InterruptedException {
874 <                for (int i = 0; i < capacity + 1; i++)
874 >                for (int i = 0; i < capacity; i++)
875                      q.putFirst(i);
876 +                pleaseTake.countDown();
877 +                q.putFirst(86);
878 +
879 +                pleaseInterrupt.countDown();
880                  try {
881                      q.putFirst(99);
882                      shouldThrow();
883                  } catch (InterruptedException success) {}
884 +                assertFalse(Thread.interrupted());
885              }});
886  
887 <        t.start();
888 <        Thread.sleep(SHORT_DELAY_MS);
846 <        assertEquals(q.remainingCapacity(), 0);
887 >        await(pleaseTake);
888 >        assertEquals(0, q.remainingCapacity());
889          assertEquals(capacity - 1, q.take());
890 <        Thread.sleep(SHORT_DELAY_MS);
890 >
891 >        await(pleaseInterrupt);
892 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
893          t.interrupt();
894 <        t.join();
895 <        assertEquals(q.remainingCapacity(), 0);
894 >        awaitTermination(t);
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 <        Thread t = new Thread(new CheckedRunnable() {
903 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
904 >        Thread t = newStartedThread(new CheckedRunnable() {
905              public void realRun() throws InterruptedException {
906                  q.putFirst(new Object());
907                  q.putFirst(new Object());
908 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
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(), LONG_DELAY_MS, MILLISECONDS);
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(), LONGER_DELAY_MS, MILLISECONDS);
923 +                    shouldThrow();
924 +                } catch (InterruptedException success) {}
925 +                assertFalse(Thread.interrupted());
926              }});
927  
928 <        t.start();
929 <        Thread.sleep(SMALL_DELAY_MS);
928 >        await(pleaseInterrupt);
929 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
930          t.interrupt();
931 <        t.join();
931 >        awaitTermination(t);
932      }
933  
934      /**
# Line 884 | Line 942 | public class LinkedBlockingDequeTest ext
942      }
943  
944      /**
945 <     * takeFirst blocks interruptibly when empty
945 >     * takeFirst() blocks interruptibly when empty
946       */
947 <    public void testTakeFirstFromEmpty() throws InterruptedException {
948 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
949 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
950 <            public void realRun() throws InterruptedException {
951 <                q.takeFirst();
952 <            }};
947 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
948 >        final BlockingDeque q = new LinkedBlockingDeque();
949 >        final CountDownLatch threadStarted = new CountDownLatch(1);
950 >        Thread t = newStartedThread(new CheckedRunnable() {
951 >            public void realRun() {
952 >                threadStarted.countDown();
953 >                try {
954 >                    q.takeFirst();
955 >                    shouldThrow();
956 >                } catch (InterruptedException success) {}
957 >                assertFalse(Thread.interrupted());
958 >            }});
959  
960 <        t.start();
961 <        Thread.sleep(SHORT_DELAY_MS);
960 >        await(threadStarted);
961 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
962          t.interrupt();
963 <        t.join();
963 >        awaitTermination(t);
964      }
965  
966      /**
967 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
967 >     * takeFirst() throws InterruptedException immediately if interrupted
968 >     * before waiting
969 >     */
970 >    public void testTakeFirstFromEmptyAfterInterrupt() {
971 >        final BlockingDeque q = new LinkedBlockingDeque();
972 >        Thread t = newStartedThread(new CheckedRunnable() {
973 >            public void realRun() {
974 >                Thread.currentThread().interrupt();
975 >                try {
976 >                    q.takeFirst();
977 >                    shouldThrow();
978 >                } catch (InterruptedException success) {}
979 >                assertFalse(Thread.interrupted());
980 >            }});
981 >
982 >        awaitTermination(t);
983 >    }
984 >
985 >    /**
986 >     * takeLast() blocks interruptibly when empty
987 >     */
988 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
989 >        final BlockingDeque q = new LinkedBlockingDeque();
990 >        final CountDownLatch threadStarted = new CountDownLatch(1);
991 >        Thread t = newStartedThread(new CheckedRunnable() {
992 >            public void realRun() {
993 >                threadStarted.countDown();
994 >                try {
995 >                    q.takeLast();
996 >                    shouldThrow();
997 >                } catch (InterruptedException success) {}
998 >                assertFalse(Thread.interrupted());
999 >            }});
1000 >
1001 >        await(threadStarted);
1002 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1003 >        t.interrupt();
1004 >        awaitTermination(t);
1005 >    }
1006 >
1007 >    /**
1008 >     * takeLast() throws InterruptedException immediately if interrupted
1009 >     * before waiting
1010 >     */
1011 >    public void testTakeLastFromEmptyAfterInterrupt() {
1012 >        final BlockingDeque q = new LinkedBlockingDeque();
1013 >        Thread t = newStartedThread(new CheckedRunnable() {
1014 >            public void realRun() {
1015 >                Thread.currentThread().interrupt();
1016 >                try {
1017 >                    q.takeLast();
1018 >                    shouldThrow();
1019 >                } catch (InterruptedException success) {}
1020 >                assertFalse(Thread.interrupted());
1021 >            }});
1022 >
1023 >        awaitTermination(t);
1024 >    }
1025 >
1026 >    /**
1027 >     * takeFirst removes existing elements until empty, then blocks interruptibly
1028       */
1029      public void testBlockingTakeFirst() throws InterruptedException {
1030          final LinkedBlockingDeque q = populatedDeque(SIZE);
1031 <        Thread t = new Thread(new CheckedRunnable() {
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)
1035 <                    assertEquals(i, q.takeFirst());
1034 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1035 >
1036 >                Thread.currentThread().interrupt();
1037                  try {
1038                      q.takeFirst();
1039                      shouldThrow();
1040                  } catch (InterruptedException success) {}
1041 +                assertFalse(Thread.interrupted());
1042 +
1043 +                pleaseInterrupt.countDown();
1044 +                try {
1045 +                    q.takeFirst();
1046 +                    shouldThrow();
1047 +                } catch (InterruptedException success) {}
1048 +                assertFalse(Thread.interrupted());
1049              }});
1050  
1051 <        t.start();
1052 <        Thread.sleep(SHORT_DELAY_MS);
1051 >        await(pleaseInterrupt);
1052 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1053          t.interrupt();
1054 <        t.join();
1054 >        awaitTermination(t);
1055      }
1056  
923
1057      /**
1058       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1059       */
# Line 938 | Line 1071 | public class LinkedBlockingDequeTest ext
1071      public void testTimedPollFirst() throws InterruptedException {
1072          LinkedBlockingDeque q = populatedDeque(SIZE);
1073          for (int i = 0; i < SIZE; ++i) {
1074 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1075 <        }
1076 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1074 >            long startTime = System.nanoTime();
1075 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1076 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1077 >        }
1078 >        long startTime = System.nanoTime();
1079 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1080 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1081 >        checkEmpty(q);
1082      }
1083  
1084      /**
# Line 948 | Line 1086 | public class LinkedBlockingDequeTest ext
1086       * returning timeout status
1087       */
1088      public void testInterruptedTimedPollFirst() throws InterruptedException {
1089 <        Thread t = new Thread(new CheckedRunnable() {
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);
1094 <                for (int i = 0; i < SIZE; ++i) {
1095 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1096 <                }
1093 >                for (int i = 0; i < SIZE; i++)
1094 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
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(LONGER_DELAY_MS, MILLISECONDS);
1106 +                    shouldThrow();
1107 +                } catch (InterruptedException success) {}
1108 +                assertFalse(Thread.interrupted());
1109              }});
1110  
1111 <        t.start();
1112 <        Thread.sleep(SHORT_DELAY_MS);
1111 >        await(pleaseInterrupt);
1112 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1113          t.interrupt();
1114 <        t.join();
1114 >        awaitTermination(t);
1115      }
1116  
1117      /**
# Line 972 | Line 1120 | public class LinkedBlockingDequeTest ext
1120       */
1121      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1122          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1123 <        Thread t = new Thread(new CheckedRunnable() {
1123 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1124 >        Thread t = newStartedThread(new CheckedRunnable() {
1125              public void realRun() throws InterruptedException {
1126 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1126 >                long startTime = System.nanoTime();
1127 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1128 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1129 >
1130 >                barrier.await();
1131 >
1132                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1133 +
1134 +                Thread.currentThread().interrupt();
1135 +                try {
1136 +                    q.pollFirst(randomTimeout(), randomTimeUnit());
1137 +                    shouldThrow();
1138 +                } catch (InterruptedException success) {}
1139 +
1140 +                barrier.await();
1141                  try {
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  
1150 <        t.start();
1151 <        Thread.sleep(SMALL_DELAY_MS);
1152 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1150 >        barrier.await();
1151 >        long startTime = System.nanoTime();
1152 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1153 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1154 >        barrier.await();
1155 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1156          t.interrupt();
1157 <        t.join();
1157 >        awaitTermination(t);
1158      }
1159  
1160      /**
1161       * putLast(null) throws NPE
1162       */
1163 <     public void testPutLastNull() throws InterruptedException {
1163 >    public void testPutLastNull() throws InterruptedException {
1164 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1165          try {
997            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1166              q.putLast(null);
1167              shouldThrow();
1168          } catch (NullPointerException success) {}
1169 <     }
1169 >    }
1170  
1171      /**
1172       * all elements successfully putLast are contained
1173       */
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));
1180 <         }
1181 <         assertEquals(0, q.remainingCapacity());
1174 >    public void testPutLast() throws InterruptedException {
1175 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1176 >        for (int i = 0; i < SIZE; ++i) {
1177 >            Integer x = new Integer(i);
1178 >            q.putLast(x);
1179 >            assertTrue(q.contains(x));
1180 >        }
1181 >        assertEquals(0, q.remainingCapacity());
1182      }
1183  
1184      /**
# Line 1018 | Line 1186 | public class LinkedBlockingDequeTest ext
1186       */
1187      public void testBlockingPutLast() throws InterruptedException {
1188          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1189 <        Thread t = new Thread(new CheckedRunnable() {
1189 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1190 >        Thread t = newStartedThread(new CheckedRunnable() {
1191              public void realRun() throws InterruptedException {
1192                  for (int i = 0; i < SIZE; ++i)
1193                      q.putLast(i);
1194                  assertEquals(SIZE, q.size());
1195                  assertEquals(0, q.remainingCapacity());
1196 +
1197 +                Thread.currentThread().interrupt();
1198                  try {
1199                      q.putLast(99);
1200                      shouldThrow();
1201                  } catch (InterruptedException success) {}
1202 +                assertFalse(Thread.interrupted());
1203 +
1204 +                pleaseInterrupt.countDown();
1205 +                try {
1206 +                    q.putLast(99);
1207 +                    shouldThrow();
1208 +                } catch (InterruptedException success) {}
1209 +                assertFalse(Thread.interrupted());
1210              }});
1211  
1212 <        t.start();
1213 <        Thread.sleep(SHORT_DELAY_MS);
1212 >        await(pleaseInterrupt);
1213 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1214          t.interrupt();
1215 <        t.join();
1215 >        awaitTermination(t);
1216          assertEquals(SIZE, q.size());
1217          assertEquals(0, q.remainingCapacity());
1218      }
1219  
1220      /**
1221 <     * putLast blocks waiting for take when full
1221 >     * putLast blocks interruptibly waiting for take when full
1222       */
1223      public void testPutLastWithTake() throws InterruptedException {
1224          final int capacity = 2;
1225          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1226 <        Thread t = new Thread(new CheckedRunnable() {
1226 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1227 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1228 >        Thread t = newStartedThread(new CheckedRunnable() {
1229              public void realRun() throws InterruptedException {
1230 <                for (int i = 0; i < capacity + 1; i++)
1230 >                for (int i = 0; i < capacity; i++)
1231                      q.putLast(i);
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);
1245 +                    shouldThrow();
1246 +                } catch (InterruptedException success) {}
1247 +                assertFalse(Thread.interrupted());
1248              }});
1249  
1250 <        t.start();
1251 <        Thread.sleep(SHORT_DELAY_MS);
1059 <        assertEquals(q.remainingCapacity(), 0);
1250 >        await(pleaseTake);
1251 >        assertEquals(0, q.remainingCapacity());
1252          assertEquals(0, q.take());
1253 <        Thread.sleep(SHORT_DELAY_MS);
1253 >
1254 >        await(pleaseInterrupt);
1255 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1256          t.interrupt();
1257 <        t.join();
1258 <        assertEquals(q.remainingCapacity(), 0);
1257 >        awaitTermination(t);
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 <        Thread t = new Thread(new CheckedRunnable() {
1266 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1267 >        Thread t = newStartedThread(new CheckedRunnable() {
1268              public void realRun() throws InterruptedException {
1269                  q.putLast(new Object());
1270                  q.putLast(new Object());
1271 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
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(), LONG_DELAY_MS, MILLISECONDS);
1284 >                    q.offerLast(new Object(), LONGER_DELAY_MS, MILLISECONDS);
1285                      shouldThrow();
1286                  } catch (InterruptedException success) {}
1287              }});
1288  
1289 <        t.start();
1290 <        Thread.sleep(SMALL_DELAY_MS);
1289 >        await(pleaseInterrupt);
1290 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1291          t.interrupt();
1292 <        t.join();
1292 >        awaitTermination(t);
1293      }
1294  
1295      /**
# Line 1092 | 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  
1305      /**
1306 <     * takeLast blocks interruptibly when empty
1101 <     */
1102 <    public void testTakeLastFromEmpty() throws InterruptedException {
1103 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1104 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1105 <            public void realRun() throws InterruptedException {
1106 <                q.takeLast();
1107 <            }};
1108 <
1109 <        t.start();
1110 <        Thread.sleep(SHORT_DELAY_MS);
1111 <        t.interrupt();
1112 <        t.join();
1113 <    }
1114 <
1115 <    /**
1116 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1306 >     * takeLast removes existing elements until empty, then blocks interruptibly
1307       */
1308      public void testBlockingTakeLast() throws InterruptedException {
1309          final LinkedBlockingDeque q = populatedDeque(SIZE);
1310 <        Thread t = new Thread(new CheckedRunnable() {
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 - 1 - i, q.takeLast());
1313 >                for (int i = 0; i < SIZE; i++)
1314 >                    assertEquals(SIZE - i - 1, q.takeLast());
1315 >
1316 >                Thread.currentThread().interrupt();
1317                  try {
1318                      q.takeLast();
1319                      shouldThrow();
1320                  } catch (InterruptedException success) {}
1321 +                assertFalse(Thread.interrupted());
1322 +
1323 +                pleaseInterrupt.countDown();
1324 +                try {
1325 +                    q.takeLast();
1326 +                    shouldThrow();
1327 +                } catch (InterruptedException success) {}
1328 +                assertFalse(Thread.interrupted());
1329              }});
1330  
1331 <        t.start();
1332 <        Thread.sleep(SHORT_DELAY_MS);
1331 >        await(pleaseInterrupt);
1332 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1333          t.interrupt();
1334 <        t.join();
1334 >        awaitTermination(t);
1335      }
1336  
1337      /**
# Line 1139 | 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 1150 | Line 1351 | public class LinkedBlockingDequeTest ext
1351      public void testTimedPollLast() throws InterruptedException {
1352          LinkedBlockingDeque q = populatedDeque(SIZE);
1353          for (int i = 0; i < SIZE; ++i) {
1354 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1355 <        }
1356 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1354 >            long startTime = System.nanoTime();
1355 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1356 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1357 >        }
1358 >        long startTime = System.nanoTime();
1359 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1360 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1361 >        checkEmpty(q);
1362      }
1363  
1364      /**
# Line 1160 | Line 1366 | public class LinkedBlockingDequeTest ext
1366       * returning timeout status
1367       */
1368      public void testInterruptedTimedPollLast() throws InterruptedException {
1369 <        Thread t = new Thread(new CheckedRunnable() {
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(SHORT_DELAY_MS, MILLISECONDS));
1376 <                }
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(randomTimeout(), randomTimeUnit());
1380 >                    shouldThrow();
1381 >                } catch (InterruptedException success) {}
1382 >                assertFalse(Thread.interrupted());
1383 >
1384 >                pleaseInterrupt.countDown();
1385                  try {
1386 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1386 >                    q.pollLast(LONGER_DELAY_MS, MILLISECONDS);
1387                      shouldThrow();
1388                  } catch (InterruptedException success) {}
1389 +                assertFalse(Thread.interrupted());
1390              }});
1391  
1392 <        t.start();
1393 <        Thread.sleep(SHORT_DELAY_MS);
1392 >        await(pleaseInterrupt);
1393 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1394          t.interrupt();
1395 <        t.join();
1395 >        awaitTermination(t);
1396 >        checkEmpty(q);
1397      }
1398  
1399      /**
# Line 1184 | Line 1402 | public class LinkedBlockingDequeTest ext
1402       */
1403      public void testTimedPollWithOfferLast() throws InterruptedException {
1404          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1405 <        Thread t = new Thread(new CheckedRunnable() {
1405 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1406 >        Thread t = newStartedThread(new CheckedRunnable() {
1407              public void realRun() throws InterruptedException {
1408 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1408 >                long startTime = System.nanoTime();
1409 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1410 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1411 >
1412 >                barrier.await();
1413 >
1414                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1415 +
1416 +                Thread.currentThread().interrupt();
1417 +                try {
1418 +                    q.poll(randomTimeout(), randomTimeUnit());
1419 +                    shouldThrow();
1420 +                } catch (InterruptedException success) {}
1421 +                assertFalse(Thread.interrupted());
1422 +
1423 +                barrier.await();
1424                  try {
1425                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1426                      shouldThrow();
1427                  } catch (InterruptedException success) {}
1428 +                assertFalse(Thread.interrupted());
1429 +
1430 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1431              }});
1432  
1433 <        t.start();
1434 <        Thread.sleep(SMALL_DELAY_MS);
1435 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1433 >        barrier.await();
1434 >        long startTime = System.nanoTime();
1435 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1436 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1437 >
1438 >        barrier.await();
1439 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1440          t.interrupt();
1441 <        t.join();
1441 >        awaitTermination(t);
1442      }
1443  
1204
1444      /**
1445       * element returns next element, or throws NSEE if empty
1446       */
# Line 1218 | Line 1457 | public class LinkedBlockingDequeTest ext
1457      }
1458  
1459      /**
1221     * remove(x) removes x and returns true if present
1222     */
1223    public void testRemoveElement() {
1224        LinkedBlockingDeque q = populatedDeque(SIZE);
1225        for (int i = 1; i < SIZE; i+=2) {
1226            assertTrue(q.remove(new Integer(i)));
1227        }
1228        for (int i = 0; i < SIZE; i+=2) {
1229            assertTrue(q.remove(new Integer(i)));
1230            assertFalse(q.remove(new Integer(i+1)));
1231        }
1232        assertTrue(q.isEmpty());
1233    }
1234
1235    /**
1460       * contains(x) reports true when elements added but not yet removed
1461       */
1462      public void testContains() {
# Line 1288 | 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 1301 | 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      }
1535  
1536      /**
1537 <     * toArray contains all elements
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 <            assertEquals(o[i], q.take());
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      /**
1549 <     * toArray(a) contains all elements
1549 >     * toArray(a) contains all elements in FIFO order
1550       */
1551 <    public void testToArray2() throws InterruptedException {
1552 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1551 >    public void testToArray2() {
1552 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1553          Integer[] ints = new Integer[SIZE];
1554 <        ints = (Integer[])q.toArray(ints);
1555 <        for (int i = 0; i < ints.length; i++)
1556 <            assertEquals(ints[i], q.take());
1557 <    }
1558 <
1333 <    /**
1334 <     * toArray(null) throws NPE
1335 <     */
1336 <    public void testToArray_BadArg() {
1337 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1338 <        try {
1339 <            Object o[] = q.toArray(null);
1340 <            shouldThrow();
1341 <        } catch (NullPointerException success) {}
1554 >        Integer[] array = q.toArray(ints);
1555 >        assertSame(ints, array);
1556 >        for (Integer o : ints)
1557 >            assertSame(o, q.remove());
1558 >        assertTrue(q.isEmpty());
1559      }
1560  
1561      /**
1562 <     * toArray with incompatible array type throws CCE
1562 >     * toArray(incompatible array type) throws ArrayStoreException
1563       */
1564      public void testToArray1_BadArg() {
1565          LinkedBlockingDeque q = populatedDeque(SIZE);
1566          try {
1567 <            Object o[] = q.toArray(new String[10]);
1567 >            q.toArray(new String[10]);
1568              shouldThrow();
1569          } catch (ArrayStoreException success) {}
1570      }
1571  
1355
1572      /**
1573       * iterator iterates through all elements
1574       */
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 1383 | Line 1616 | public class LinkedBlockingDequeTest ext
1616          assertFalse(it.hasNext());
1617      }
1618  
1386
1619      /**
1620       * iterator ordering is FIFO
1621       */
# Line 1415 | Line 1647 | public class LinkedBlockingDequeTest ext
1647          assertEquals(0, q.size());
1648      }
1649  
1418
1650      /**
1651       * Descending iterator iterates through all elements
1652       */
# Line 1478 | Line 1709 | public class LinkedBlockingDequeTest ext
1709          }
1710      }
1711  
1481
1712      /**
1713       * toString contains toStrings of elements
1714       */
# Line 1486 | Line 1716 | public class LinkedBlockingDequeTest ext
1716          LinkedBlockingDeque q = populatedDeque(SIZE);
1717          String s = q.toString();
1718          for (int i = 0; i < SIZE; ++i) {
1719 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1719 >            assertTrue(s.contains(String.valueOf(i)));
1720          }
1721      }
1722  
1493
1723      /**
1724       * offer transfers elements across Executor tasks
1725       */
# Line 1498 | Line 1727 | public class LinkedBlockingDequeTest ext
1727          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1728          q.add(one);
1729          q.add(two);
1730 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1731 <        executor.execute(new CheckedRunnable() {
1732 <            public void realRun() throws InterruptedException {
1733 <                assertFalse(q.offer(three));
1734 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1735 <                assertEquals(0, q.remainingCapacity());
1736 <            }});
1737 <
1738 <        executor.execute(new CheckedRunnable() {
1739 <            public void realRun() throws InterruptedException {
1740 <                Thread.sleep(SMALL_DELAY_MS);
1741 <                assertSame(one, q.take());
1742 <            }});
1743 <
1744 <        joinPool(executor);
1730 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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      /**
1750 <     * poll retrieves elements across Executor threads
1750 >     * timed poll retrieves elements across Executor threads
1751       */
1752      public void testPollInExecutor() {
1753          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1754 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1755 <        executor.execute(new CheckedRunnable() {
1756 <            public void realRun() throws InterruptedException {
1757 <                assertNull(q.poll());
1758 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1759 <                assertTrue(q.isEmpty());
1760 <            }});
1761 <
1762 <        executor.execute(new CheckedRunnable() {
1763 <            public void realRun() throws InterruptedException {
1764 <                Thread.sleep(SMALL_DELAY_MS);
1765 <                q.put(one);
1766 <            }});
1767 <
1768 <        joinPool(executor);
1754 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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);
1778 <
1546 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1547 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1548 <        out.writeObject(q);
1549 <        out.close();
1550 <
1551 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1552 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1553 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1554 <        assertEquals(q.size(), r.size());
1555 <        while (!q.isEmpty())
1556 <            assertEquals(q.remove(), r.remove());
1557 <    }
1558 <
1559 <    /**
1560 <     * drainTo(null) throws NPE
1561 <     */
1562 <    public void testDrainToNull() {
1563 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1564 <        try {
1565 <            q.drainTo(null);
1566 <            shouldThrow();
1567 <        } catch (NullPointerException success) {}
1568 <    }
1777 >        Queue x = populatedDeque(SIZE);
1778 >        Queue y = serialClone(x);
1779  
1780 <    /**
1781 <     * drainTo(this) throws IAE
1782 <     */
1783 <    public void testDrainToSelf() {
1784 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1785 <        try {
1786 <            q.drainTo(q);
1787 <            shouldThrow();
1788 <        } 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 1585 | 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 1596 | 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 1609 | 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 1623 | Line 1833 | public class LinkedBlockingDequeTest ext
1833      }
1834  
1835      /**
1626     * drainTo(null, n) throws NPE
1627     */
1628    public void testDrainToNullN() {
1629        LinkedBlockingDeque q = populatedDeque(SIZE);
1630        try {
1631            q.drainTo(null, 0);
1632            shouldThrow();
1633        } catch (NullPointerException success) {}
1634    }
1635
1636    /**
1637     * drainTo(this, n) throws IAE
1638     */
1639    public void testDrainToSelfN() {
1640        LinkedBlockingDeque q = populatedDeque(SIZE);
1641        try {
1642            q.drainTo(q, 0);
1643            shouldThrow();
1644        } catch (IllegalArgumentException success) {}
1645    }
1646
1647    /**
1836       * drainTo(c, n) empties first min(n, size) elements of queue into c
1837       */
1838      public void testDrainToN() {
# Line 1655 | 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