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.30 by jsr166, Wed Nov 3 16:46:34 2010 UTC vs.
Revision 1.84 by jsr166, Sun Aug 11 22:29:27 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(), randomTimeout(), randomTimeUnit());
673 >                    shouldThrow();
674 >                } catch (InterruptedException success) {}
675 >                assertFalse(Thread.interrupted());
676 >
677 >                pleaseInterrupt.countDown();
678                  try {
679                      q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
680                      shouldThrow();
681                  } catch (InterruptedException success) {}
682 +                assertFalse(Thread.interrupted());
683 +
684 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
685              }});
686  
687 <        t.start();
688 <        Thread.sleep(SMALL_DELAY_MS);
687 >        await(pleaseInterrupt);
688 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
689          t.interrupt();
690 <        t.join();
690 >        awaitTermination(t);
691      }
692  
693      /**
# Line 682 | Line 701 | public class LinkedBlockingDequeTest ext
701      }
702  
703      /**
704 <     * Take removes existing elements until empty, then blocks interruptibly
704 >     * take removes existing elements until empty, then blocks interruptibly
705       */
706      public void testBlockingTake() throws InterruptedException {
707          final LinkedBlockingDeque q = populatedDeque(SIZE);
708 <        Thread t = new Thread(new CheckedRunnable() {
708 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
709 >        Thread t = newStartedThread(new CheckedRunnable() {
710              public void realRun() throws InterruptedException {
711 <                for (int i = 0; i < SIZE; ++i) {
712 <                    assertEquals(i, q.take());
713 <                }
711 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
712 >
713 >                Thread.currentThread().interrupt();
714 >                try {
715 >                    q.take();
716 >                    shouldThrow();
717 >                } catch (InterruptedException success) {}
718 >                assertFalse(Thread.interrupted());
719 >
720 >                pleaseInterrupt.countDown();
721                  try {
722                      q.take();
723                      shouldThrow();
724                  } catch (InterruptedException success) {}
725 +                assertFalse(Thread.interrupted());
726              }});
727  
728 <        t.start();
729 <        Thread.sleep(SHORT_DELAY_MS);
728 >        await(pleaseInterrupt);
729 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
730          t.interrupt();
731 <        t.join();
731 >        awaitTermination(t);
732      }
733  
706
734      /**
735       * poll succeeds unless empty
736       */
# Line 732 | Line 759 | public class LinkedBlockingDequeTest ext
759      public void testTimedPoll() throws InterruptedException {
760          LinkedBlockingDeque q = populatedDeque(SIZE);
761          for (int i = 0; i < SIZE; ++i) {
762 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
763 <        }
764 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
762 >            long startTime = System.nanoTime();
763 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
764 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
765 >        }
766 >        long startTime = System.nanoTime();
767 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
768 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
769 >        checkEmpty(q);
770      }
771  
772      /**
# Line 742 | Line 774 | public class LinkedBlockingDequeTest ext
774       * returning timeout status
775       */
776      public void testInterruptedTimedPoll() throws InterruptedException {
777 <        Thread t = new Thread(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 <                }
777 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
778 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
779 >        Thread t = newStartedThread(new CheckedRunnable() {
780 >            public void realRun() throws InterruptedException {
781 >                long startTime = System.nanoTime();
782 >                for (int i = 0; i < SIZE; i++)
783 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
784 >
785 >                Thread.currentThread().interrupt();
786 >                try {
787 >                    q.poll(randomTimeout(), randomTimeUnit());
788 >                    shouldThrow();
789 >                } catch (InterruptedException success) {}
790 >                assertFalse(Thread.interrupted());
791 >
792 >                pleaseInterrupt.countDown();
793                  try {
794 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
794 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
795                      shouldThrow();
796                  } catch (InterruptedException success) {}
797 +                assertFalse(Thread.interrupted());
798 +
799 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
800              }});
801  
802 <        t.start();
803 <        Thread.sleep(SHORT_DELAY_MS);
802 >        await(pleaseInterrupt);
803 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
804          t.interrupt();
805 <        t.join();
805 >        awaitTermination(t);
806 >        checkEmpty(q);
807      }
808  
809      /**
810       * putFirst(null) throws NPE
811       */
812 <     public void testPutFirstNull() throws InterruptedException {
812 >    public void testPutFirstNull() throws InterruptedException {
813 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
814          try {
768            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
815              q.putFirst(null);
816              shouldThrow();
817          } catch (NullPointerException success) {}
818 <     }
818 >    }
819  
820      /**
821       * all elements successfully putFirst are contained
822       */
823 <     public void testPutFirst() throws InterruptedException {
824 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
825 <         for (int i = 0; i < SIZE; ++i) {
826 <             Integer I = new Integer(i);
827 <             q.putFirst(I);
828 <             assertTrue(q.contains(I));
829 <         }
830 <         assertEquals(0, q.remainingCapacity());
823 >    public void testPutFirst() throws InterruptedException {
824 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
825 >        for (int i = 0; i < SIZE; ++i) {
826 >            Integer x = new Integer(i);
827 >            q.putFirst(x);
828 >            assertTrue(q.contains(x));
829 >        }
830 >        assertEquals(0, q.remainingCapacity());
831      }
832  
833      /**
# Line 789 | Line 835 | public class LinkedBlockingDequeTest ext
835       */
836      public void testBlockingPutFirst() throws InterruptedException {
837          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
838 <        Thread t = new Thread(new CheckedRunnable() {
838 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
839 >        Thread t = newStartedThread(new CheckedRunnable() {
840              public void realRun() throws InterruptedException {
841                  for (int i = 0; i < SIZE; ++i)
842                      q.putFirst(i);
843                  assertEquals(SIZE, q.size());
844                  assertEquals(0, q.remainingCapacity());
845 +
846 +                Thread.currentThread().interrupt();
847 +                try {
848 +                    q.putFirst(99);
849 +                    shouldThrow();
850 +                } catch (InterruptedException success) {}
851 +                assertFalse(Thread.interrupted());
852 +
853 +                pleaseInterrupt.countDown();
854                  try {
855                      q.putFirst(99);
856                      shouldThrow();
857                  } catch (InterruptedException success) {}
858 +                assertFalse(Thread.interrupted());
859              }});
860  
861 <        t.start();
862 <        Thread.sleep(SHORT_DELAY_MS);
861 >        await(pleaseInterrupt);
862 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
863          t.interrupt();
864 <        t.join();
864 >        awaitTermination(t);
865          assertEquals(SIZE, q.size());
866          assertEquals(0, q.remainingCapacity());
867      }
868  
869      /**
870 <     * putFirst blocks waiting for take when full
870 >     * putFirst blocks interruptibly waiting for take when full
871       */
872      public void testPutFirstWithTake() throws InterruptedException {
873          final int capacity = 2;
874          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
875 <        Thread t = new Thread(new CheckedRunnable() {
875 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
876 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
877 >        Thread t = newStartedThread(new CheckedRunnable() {
878              public void realRun() throws InterruptedException {
879 <                for (int i = 0; i < capacity + 1; i++)
879 >                for (int i = 0; i < capacity; i++)
880                      q.putFirst(i);
881 +                pleaseTake.countDown();
882 +                q.putFirst(86);
883 +
884 +                pleaseInterrupt.countDown();
885                  try {
886                      q.putFirst(99);
887                      shouldThrow();
888                  } catch (InterruptedException success) {}
889 +                assertFalse(Thread.interrupted());
890              }});
891  
892 <        t.start();
893 <        Thread.sleep(SHORT_DELAY_MS);
830 <        assertEquals(q.remainingCapacity(), 0);
892 >        await(pleaseTake);
893 >        assertEquals(0, q.remainingCapacity());
894          assertEquals(capacity - 1, q.take());
895 <        Thread.sleep(SHORT_DELAY_MS);
895 >
896 >        await(pleaseInterrupt);
897 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
898          t.interrupt();
899 <        t.join();
900 <        assertEquals(q.remainingCapacity(), 0);
899 >        awaitTermination(t);
900 >        assertEquals(0, q.remainingCapacity());
901      }
902  
903      /**
904       * timed offerFirst times out if full and elements not taken
905       */
906 <    public void testTimedOfferFirst() throws InterruptedException {
906 >    public void testTimedOfferFirst() {
907          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
908 <        Thread t = new Thread(new CheckedRunnable() {
908 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
909 >        Thread t = newStartedThread(new CheckedRunnable() {
910              public void realRun() throws InterruptedException {
911                  q.putFirst(new Object());
912                  q.putFirst(new Object());
913 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
913 >                long startTime = System.nanoTime();
914 >
915 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
916 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
917 >
918 >                Thread.currentThread().interrupt();
919 >                try {
920 >                    q.offerFirst(new Object(), randomTimeout(), randomTimeUnit());
921 >                    shouldThrow();
922 >                } catch (InterruptedException success) {}
923 >                assertFalse(Thread.interrupted());
924 >
925 >                pleaseInterrupt.countDown();
926                  try {
927                      q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
928                      shouldThrow();
929                  } catch (InterruptedException success) {}
930 +                assertFalse(Thread.interrupted());
931 +
932 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
933              }});
934  
935 <        t.start();
936 <        Thread.sleep(SMALL_DELAY_MS);
935 >        await(pleaseInterrupt);
936 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
937          t.interrupt();
938 <        t.join();
938 >        awaitTermination(t);
939      }
940  
941      /**
# Line 868 | Line 949 | public class LinkedBlockingDequeTest ext
949      }
950  
951      /**
952 <     * takeFirst blocks interruptibly when empty
952 >     * takeFirst() blocks interruptibly when empty
953       */
954 <    public void testTakeFirstFromEmpty() throws InterruptedException {
955 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
956 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
957 <            public void realRun() throws InterruptedException {
958 <                q.takeFirst();
959 <            }};
954 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
955 >        final BlockingDeque q = new LinkedBlockingDeque();
956 >        final CountDownLatch threadStarted = new CountDownLatch(1);
957 >        Thread t = newStartedThread(new CheckedRunnable() {
958 >            public void realRun() {
959 >                threadStarted.countDown();
960 >                try {
961 >                    q.takeFirst();
962 >                    shouldThrow();
963 >                } catch (InterruptedException success) {}
964 >                assertFalse(Thread.interrupted());
965 >            }});
966  
967 <        t.start();
968 <        Thread.sleep(SHORT_DELAY_MS);
967 >        await(threadStarted);
968 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
969          t.interrupt();
970 <        t.join();
970 >        awaitTermination(t);
971      }
972  
973      /**
974 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
974 >     * takeFirst() throws InterruptedException immediately if interrupted
975 >     * before waiting
976 >     */
977 >    public void testTakeFirstFromEmptyAfterInterrupt() {
978 >        final BlockingDeque q = new LinkedBlockingDeque();
979 >        Thread t = newStartedThread(new CheckedRunnable() {
980 >            public void realRun() {
981 >                Thread.currentThread().interrupt();
982 >                try {
983 >                    q.takeFirst();
984 >                    shouldThrow();
985 >                } catch (InterruptedException success) {}
986 >                assertFalse(Thread.interrupted());
987 >            }});
988 >
989 >        awaitTermination(t);
990 >    }
991 >
992 >    /**
993 >     * takeLast() blocks interruptibly when empty
994 >     */
995 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
996 >        final BlockingDeque q = new LinkedBlockingDeque();
997 >        final CountDownLatch threadStarted = new CountDownLatch(1);
998 >        Thread t = newStartedThread(new CheckedRunnable() {
999 >            public void realRun() {
1000 >                threadStarted.countDown();
1001 >                try {
1002 >                    q.takeLast();
1003 >                    shouldThrow();
1004 >                } catch (InterruptedException success) {}
1005 >                assertFalse(Thread.interrupted());
1006 >            }});
1007 >
1008 >        await(threadStarted);
1009 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1010 >        t.interrupt();
1011 >        awaitTermination(t);
1012 >    }
1013 >
1014 >    /**
1015 >     * takeLast() throws InterruptedException immediately if interrupted
1016 >     * before waiting
1017 >     */
1018 >    public void testTakeLastFromEmptyAfterInterrupt() {
1019 >        final BlockingDeque q = new LinkedBlockingDeque();
1020 >        Thread t = newStartedThread(new CheckedRunnable() {
1021 >            public void realRun() {
1022 >                Thread.currentThread().interrupt();
1023 >                try {
1024 >                    q.takeLast();
1025 >                    shouldThrow();
1026 >                } catch (InterruptedException success) {}
1027 >                assertFalse(Thread.interrupted());
1028 >            }});
1029 >
1030 >        awaitTermination(t);
1031 >    }
1032 >
1033 >    /**
1034 >     * takeFirst removes existing elements until empty, then blocks interruptibly
1035       */
1036      public void testBlockingTakeFirst() throws InterruptedException {
1037          final LinkedBlockingDeque q = populatedDeque(SIZE);
1038 <        Thread t = new Thread(new CheckedRunnable() {
1038 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1039 >        Thread t = newStartedThread(new CheckedRunnable() {
1040              public void realRun() throws InterruptedException {
1041 <                for (int i = 0; i < SIZE; ++i)
1042 <                    assertEquals(i, q.takeFirst());
1041 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1042 >
1043 >                Thread.currentThread().interrupt();
1044                  try {
1045                      q.takeFirst();
1046                      shouldThrow();
1047                  } catch (InterruptedException success) {}
1048 +                assertFalse(Thread.interrupted());
1049 +
1050 +                pleaseInterrupt.countDown();
1051 +                try {
1052 +                    q.takeFirst();
1053 +                    shouldThrow();
1054 +                } catch (InterruptedException success) {}
1055 +                assertFalse(Thread.interrupted());
1056              }});
1057  
1058 <        t.start();
1059 <        Thread.sleep(SHORT_DELAY_MS);
1058 >        await(pleaseInterrupt);
1059 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1060          t.interrupt();
1061 <        t.join();
1061 >        awaitTermination(t);
1062      }
1063  
907
1064      /**
1065       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1066       */
# Line 922 | Line 1078 | public class LinkedBlockingDequeTest ext
1078      public void testTimedPollFirst() throws InterruptedException {
1079          LinkedBlockingDeque q = populatedDeque(SIZE);
1080          for (int i = 0; i < SIZE; ++i) {
1081 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1082 <        }
1083 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1081 >            long startTime = System.nanoTime();
1082 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1083 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1084 >        }
1085 >        long startTime = System.nanoTime();
1086 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1087 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1088 >        checkEmpty(q);
1089      }
1090  
1091      /**
# Line 932 | Line 1093 | public class LinkedBlockingDequeTest ext
1093       * returning timeout status
1094       */
1095      public void testInterruptedTimedPollFirst() throws InterruptedException {
1096 <        Thread t = new Thread(new CheckedRunnable() {
1096 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1097 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1098 >        Thread t = newStartedThread(new CheckedRunnable() {
1099              public void realRun() throws InterruptedException {
1100 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1101 <                for (int i = 0; i < SIZE; ++i) {
1102 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1103 <                }
1100 >                long startTime = System.nanoTime();
1101 >                for (int i = 0; i < SIZE; i++)
1102 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1103 >
1104 >                Thread.currentThread().interrupt();
1105                  try {
1106 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1106 >                    q.pollFirst(randomTimeout(), randomTimeUnit());
1107                      shouldThrow();
1108                  } catch (InterruptedException success) {}
1109 +                assertFalse(Thread.interrupted());
1110 +
1111 +                pleaseInterrupt.countDown();
1112 +                try {
1113 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1114 +                    shouldThrow();
1115 +                } catch (InterruptedException success) {}
1116 +                assertFalse(Thread.interrupted());
1117 +
1118 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1119              }});
1120  
1121 <        t.start();
1122 <        Thread.sleep(SHORT_DELAY_MS);
1121 >        await(pleaseInterrupt);
1122 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1123          t.interrupt();
1124 <        t.join();
1124 >        awaitTermination(t);
1125      }
1126  
1127      /**
# Line 956 | Line 1130 | public class LinkedBlockingDequeTest ext
1130       */
1131      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1132          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1133 <        Thread t = new Thread(new CheckedRunnable() {
1133 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1134 >        Thread t = newStartedThread(new CheckedRunnable() {
1135              public void realRun() throws InterruptedException {
1136 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1136 >                long startTime = System.nanoTime();
1137 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1138 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1139 >
1140 >                barrier.await();
1141 >
1142                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1143 +
1144 +                Thread.currentThread().interrupt();
1145 +                try {
1146 +                    q.pollFirst(randomTimeout(), randomTimeUnit());
1147 +                    shouldThrow();
1148 +                } catch (InterruptedException success) {}
1149 +
1150 +                barrier.await();
1151                  try {
1152                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1153                      shouldThrow();
1154                  } catch (InterruptedException success) {}
1155 +                assertFalse(Thread.interrupted());
1156 +
1157 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1158              }});
1159  
1160 <        t.start();
1161 <        Thread.sleep(SMALL_DELAY_MS);
1162 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1160 >        barrier.await();
1161 >        long startTime = System.nanoTime();
1162 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1163 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1164 >        barrier.await();
1165 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1166          t.interrupt();
1167 <        t.join();
1167 >        awaitTermination(t);
1168      }
1169  
1170      /**
1171       * putLast(null) throws NPE
1172       */
1173 <     public void testPutLastNull() throws InterruptedException {
1173 >    public void testPutLastNull() throws InterruptedException {
1174 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1175          try {
981            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1176              q.putLast(null);
1177              shouldThrow();
1178          } catch (NullPointerException success) {}
1179 <     }
1179 >    }
1180  
1181      /**
1182       * all elements successfully putLast are contained
1183       */
1184 <     public void testPutLast() throws InterruptedException {
1185 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1186 <         for (int i = 0; i < SIZE; ++i) {
1187 <             Integer I = new Integer(i);
1188 <             q.putLast(I);
1189 <             assertTrue(q.contains(I));
1190 <         }
1191 <         assertEquals(0, q.remainingCapacity());
1184 >    public void testPutLast() throws InterruptedException {
1185 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1186 >        for (int i = 0; i < SIZE; ++i) {
1187 >            Integer x = new Integer(i);
1188 >            q.putLast(x);
1189 >            assertTrue(q.contains(x));
1190 >        }
1191 >        assertEquals(0, q.remainingCapacity());
1192      }
1193  
1194      /**
# Line 1002 | Line 1196 | public class LinkedBlockingDequeTest ext
1196       */
1197      public void testBlockingPutLast() throws InterruptedException {
1198          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1199 <        Thread t = new Thread(new CheckedRunnable() {
1199 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1200 >        Thread t = newStartedThread(new CheckedRunnable() {
1201              public void realRun() throws InterruptedException {
1202                  for (int i = 0; i < SIZE; ++i)
1203                      q.putLast(i);
1204                  assertEquals(SIZE, q.size());
1205                  assertEquals(0, q.remainingCapacity());
1206 +
1207 +                Thread.currentThread().interrupt();
1208                  try {
1209                      q.putLast(99);
1210                      shouldThrow();
1211                  } catch (InterruptedException success) {}
1212 +                assertFalse(Thread.interrupted());
1213 +
1214 +                pleaseInterrupt.countDown();
1215 +                try {
1216 +                    q.putLast(99);
1217 +                    shouldThrow();
1218 +                } catch (InterruptedException success) {}
1219 +                assertFalse(Thread.interrupted());
1220              }});
1221  
1222 <        t.start();
1223 <        Thread.sleep(SHORT_DELAY_MS);
1222 >        await(pleaseInterrupt);
1223 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1224          t.interrupt();
1225 <        t.join();
1225 >        awaitTermination(t);
1226          assertEquals(SIZE, q.size());
1227          assertEquals(0, q.remainingCapacity());
1228      }
1229  
1230      /**
1231 <     * putLast blocks waiting for take when full
1231 >     * putLast blocks interruptibly waiting for take when full
1232       */
1233      public void testPutLastWithTake() throws InterruptedException {
1234          final int capacity = 2;
1235          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1236 <        Thread t = new Thread(new CheckedRunnable() {
1236 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1237 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1238 >        Thread t = newStartedThread(new CheckedRunnable() {
1239              public void realRun() throws InterruptedException {
1240 <                for (int i = 0; i < capacity + 1; i++)
1240 >                for (int i = 0; i < capacity; i++)
1241                      q.putLast(i);
1242 +                pleaseTake.countDown();
1243 +                q.putLast(86);
1244 +
1245 +                Thread.currentThread().interrupt();
1246                  try {
1247                      q.putLast(99);
1248                      shouldThrow();
1249                  } catch (InterruptedException success) {}
1250 +                assertFalse(Thread.interrupted());
1251 +
1252 +                pleaseInterrupt.countDown();
1253 +                try {
1254 +                    q.putLast(99);
1255 +                    shouldThrow();
1256 +                } catch (InterruptedException success) {}
1257 +                assertFalse(Thread.interrupted());
1258              }});
1259  
1260 <        t.start();
1261 <        Thread.sleep(SHORT_DELAY_MS);
1043 <        assertEquals(q.remainingCapacity(), 0);
1260 >        await(pleaseTake);
1261 >        assertEquals(0, q.remainingCapacity());
1262          assertEquals(0, q.take());
1263 <        Thread.sleep(SHORT_DELAY_MS);
1263 >
1264 >        await(pleaseInterrupt);
1265 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1266          t.interrupt();
1267 <        t.join();
1268 <        assertEquals(q.remainingCapacity(), 0);
1267 >        awaitTermination(t);
1268 >        assertEquals(0, q.remainingCapacity());
1269      }
1270  
1271      /**
1272       * timed offerLast times out if full and elements not taken
1273       */
1274 <    public void testTimedOfferLast() throws InterruptedException {
1274 >    public void testTimedOfferLast() {
1275          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1276 <        Thread t = new Thread(new CheckedRunnable() {
1276 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1277 >        Thread t = newStartedThread(new CheckedRunnable() {
1278              public void realRun() throws InterruptedException {
1279                  q.putLast(new Object());
1280                  q.putLast(new Object());
1281 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1281 >                long startTime = System.nanoTime();
1282 >
1283 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1284 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1285 >
1286 >                Thread.currentThread().interrupt();
1287 >                try {
1288 >                    q.offerLast(new Object(), randomTimeout(), randomTimeUnit());
1289 >                    shouldThrow();
1290 >                } catch (InterruptedException success) {}
1291 >
1292 >                pleaseInterrupt.countDown();
1293                  try {
1294                      q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1295                      shouldThrow();
1296                  } catch (InterruptedException success) {}
1297 +
1298 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1299              }});
1300  
1301 <        t.start();
1302 <        Thread.sleep(SMALL_DELAY_MS);
1301 >        await(pleaseInterrupt);
1302 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1303          t.interrupt();
1304 <        t.join();
1304 >        awaitTermination(t);
1305      }
1306  
1307      /**
# Line 1076 | Line 1310 | public class LinkedBlockingDequeTest ext
1310      public void testTakeLast() throws InterruptedException {
1311          LinkedBlockingDeque q = populatedDeque(SIZE);
1312          for (int i = 0; i < SIZE; ++i) {
1313 <            assertEquals(SIZE-i-1, q.takeLast());
1313 >            assertEquals(SIZE - i - 1, q.takeLast());
1314          }
1315      }
1316  
1317      /**
1318 <     * takeLast blocks interruptibly when empty
1085 <     */
1086 <    public void testTakeLastFromEmpty() throws InterruptedException {
1087 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1088 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1089 <            public void realRun() throws InterruptedException {
1090 <                q.takeLast();
1091 <            }};
1092 <
1093 <        t.start();
1094 <        Thread.sleep(SHORT_DELAY_MS);
1095 <        t.interrupt();
1096 <        t.join();
1097 <    }
1098 <
1099 <    /**
1100 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1318 >     * takeLast removes existing elements until empty, then blocks interruptibly
1319       */
1320      public void testBlockingTakeLast() throws InterruptedException {
1321          final LinkedBlockingDeque q = populatedDeque(SIZE);
1322 <        Thread t = new Thread(new CheckedRunnable() {
1322 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1323 >        Thread t = newStartedThread(new CheckedRunnable() {
1324              public void realRun() throws InterruptedException {
1325 <                for (int i = 0; i < SIZE; ++i)
1326 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1325 >                for (int i = 0; i < SIZE; i++)
1326 >                    assertEquals(SIZE - i - 1, q.takeLast());
1327 >
1328 >                Thread.currentThread().interrupt();
1329                  try {
1330                      q.takeLast();
1331                      shouldThrow();
1332                  } catch (InterruptedException success) {}
1333 +                assertFalse(Thread.interrupted());
1334 +
1335 +                pleaseInterrupt.countDown();
1336 +                try {
1337 +                    q.takeLast();
1338 +                    shouldThrow();
1339 +                } catch (InterruptedException success) {}
1340 +                assertFalse(Thread.interrupted());
1341              }});
1342  
1343 <        t.start();
1344 <        Thread.sleep(SHORT_DELAY_MS);
1343 >        await(pleaseInterrupt);
1344 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1345          t.interrupt();
1346 <        t.join();
1346 >        awaitTermination(t);
1347      }
1348  
1349      /**
# Line 1123 | Line 1352 | public class LinkedBlockingDequeTest ext
1352      public void testTimedPollLast0() throws InterruptedException {
1353          LinkedBlockingDeque q = populatedDeque(SIZE);
1354          for (int i = 0; i < SIZE; ++i) {
1355 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1355 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1356          }
1357          assertNull(q.pollLast(0, MILLISECONDS));
1358      }
# Line 1134 | Line 1363 | public class LinkedBlockingDequeTest ext
1363      public void testTimedPollLast() throws InterruptedException {
1364          LinkedBlockingDeque q = populatedDeque(SIZE);
1365          for (int i = 0; i < SIZE; ++i) {
1366 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1367 <        }
1368 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1366 >            long startTime = System.nanoTime();
1367 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1368 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1369 >        }
1370 >        long startTime = System.nanoTime();
1371 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1372 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1373 >        checkEmpty(q);
1374      }
1375  
1376      /**
# Line 1144 | Line 1378 | public class LinkedBlockingDequeTest ext
1378       * returning timeout status
1379       */
1380      public void testInterruptedTimedPollLast() throws InterruptedException {
1381 <        Thread t = new Thread(new CheckedRunnable() {
1381 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1382 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1383 >        Thread t = newStartedThread(new CheckedRunnable() {
1384              public void realRun() throws InterruptedException {
1385 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1386 <                for (int i = 0; i < SIZE; ++i) {
1387 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1388 <                }
1385 >                long startTime = System.nanoTime();
1386 >                for (int i = 0; i < SIZE; i++)
1387 >                    assertEquals(SIZE - i - 1,
1388 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1389 >
1390 >                Thread.currentThread().interrupt();
1391 >                try {
1392 >                    q.pollLast(randomTimeout(), randomTimeUnit());
1393 >                    shouldThrow();
1394 >                } catch (InterruptedException success) {}
1395 >                assertFalse(Thread.interrupted());
1396 >
1397 >                pleaseInterrupt.countDown();
1398                  try {
1399 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1399 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1400                      shouldThrow();
1401                  } catch (InterruptedException success) {}
1402 +                assertFalse(Thread.interrupted());
1403 +
1404 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1405              }});
1406  
1407 <        t.start();
1408 <        Thread.sleep(SHORT_DELAY_MS);
1407 >        await(pleaseInterrupt);
1408 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1409          t.interrupt();
1410 <        t.join();
1410 >        awaitTermination(t);
1411 >        checkEmpty(q);
1412      }
1413  
1414      /**
# Line 1168 | Line 1417 | public class LinkedBlockingDequeTest ext
1417       */
1418      public void testTimedPollWithOfferLast() throws InterruptedException {
1419          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1420 <        Thread t = new Thread(new CheckedRunnable() {
1420 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1421 >        Thread t = newStartedThread(new CheckedRunnable() {
1422              public void realRun() throws InterruptedException {
1423 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1423 >                long startTime = System.nanoTime();
1424 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1425 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1426 >
1427 >                barrier.await();
1428 >
1429                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1430 +
1431 +                Thread.currentThread().interrupt();
1432 +                try {
1433 +                    q.poll(randomTimeout(), randomTimeUnit());
1434 +                    shouldThrow();
1435 +                } catch (InterruptedException success) {}
1436 +                assertFalse(Thread.interrupted());
1437 +
1438 +                barrier.await();
1439                  try {
1440                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1441                      shouldThrow();
1442                  } catch (InterruptedException success) {}
1443 +                assertFalse(Thread.interrupted());
1444 +
1445 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1446              }});
1447  
1448 <        t.start();
1449 <        Thread.sleep(SMALL_DELAY_MS);
1450 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1448 >        barrier.await();
1449 >        long startTime = System.nanoTime();
1450 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1451 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1452 >
1453 >        barrier.await();
1454 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1455          t.interrupt();
1456 <        t.join();
1456 >        awaitTermination(t);
1457      }
1458  
1188
1459      /**
1460       * element returns next element, or throws NSEE if empty
1461       */
# Line 1202 | Line 1472 | public class LinkedBlockingDequeTest ext
1472      }
1473  
1474      /**
1205     * remove(x) removes x and returns true if present
1206     */
1207    public void testRemoveElement() {
1208        LinkedBlockingDeque q = populatedDeque(SIZE);
1209        for (int i = 1; i < SIZE; i+=2) {
1210            assertTrue(q.remove(new Integer(i)));
1211        }
1212        for (int i = 0; i < SIZE; i+=2) {
1213            assertTrue(q.remove(new Integer(i)));
1214            assertFalse(q.remove(new Integer(i+1)));
1215        }
1216        assertTrue(q.isEmpty());
1217    }
1218
1219    /**
1475       * contains(x) reports true when elements added but not yet removed
1476       */
1477      public void testContains() {
# Line 1272 | Line 1527 | public class LinkedBlockingDequeTest ext
1527                  assertTrue(changed);
1528  
1529              assertTrue(q.containsAll(p));
1530 <            assertEquals(SIZE-i, q.size());
1530 >            assertEquals(SIZE - i, q.size());
1531              p.remove();
1532          }
1533      }
# Line 1285 | Line 1540 | public class LinkedBlockingDequeTest ext
1540              LinkedBlockingDeque q = populatedDeque(SIZE);
1541              LinkedBlockingDeque p = populatedDeque(i);
1542              assertTrue(q.removeAll(p));
1543 <            assertEquals(SIZE-i, q.size());
1543 >            assertEquals(SIZE - i, q.size());
1544              for (int j = 0; j < i; ++j) {
1545 <                Integer I = (Integer)(p.remove());
1546 <                assertFalse(q.contains(I));
1545 >                Integer x = (Integer)(p.remove());
1546 >                assertFalse(q.contains(x));
1547              }
1548          }
1549      }
1550  
1551      /**
1552 <     * toArray contains all elements
1552 >     * toArray contains all elements in FIFO order
1553       */
1554 <    public void testToArray() throws InterruptedException{
1554 >    public void testToArray() throws InterruptedException {
1555          LinkedBlockingDeque q = populatedDeque(SIZE);
1556 <        Object[] o = q.toArray();
1557 <        for (int i = 0; i < o.length; i++)
1558 <            assertEquals(o[i], q.take());
1556 >        Object[] a = q.toArray();
1557 >        assertSame(Object[].class, a.getClass());
1558 >        for (Object o : a)
1559 >            assertSame(o, q.poll());
1560 >        assertTrue(q.isEmpty());
1561      }
1562  
1563      /**
1564 <     * toArray(a) contains all elements
1564 >     * toArray(a) contains all elements in FIFO order
1565       */
1566 <    public void testToArray2() throws InterruptedException {
1567 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1566 >    public void testToArray2() {
1567 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1568          Integer[] ints = new Integer[SIZE];
1569 <        ints = (Integer[])q.toArray(ints);
1570 <        for (int i = 0; i < ints.length; i++)
1571 <            assertEquals(ints[i], q.take());
1572 <    }
1573 <
1317 <    /**
1318 <     * toArray(null) throws NullPointerException
1319 <     */
1320 <    public void testToArray_NullArg() {
1321 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1322 <        try {
1323 <            q.toArray(null);
1324 <            shouldThrow();
1325 <        } catch (NullPointerException success) {}
1569 >        Integer[] array = q.toArray(ints);
1570 >        assertSame(ints, array);
1571 >        for (Integer o : ints)
1572 >            assertSame(o, q.remove());
1573 >        assertTrue(q.isEmpty());
1574      }
1575  
1576      /**
# Line 1336 | Line 1584 | public class LinkedBlockingDequeTest ext
1584          } catch (ArrayStoreException success) {}
1585      }
1586  
1339
1587      /**
1588       * iterator iterates through all elements
1589       */
1590      public void testIterator() throws InterruptedException {
1591          LinkedBlockingDeque q = populatedDeque(SIZE);
1592          Iterator it = q.iterator();
1593 <        while (it.hasNext()) {
1593 >        int i;
1594 >        for (i = 0; it.hasNext(); i++)
1595 >            assertTrue(q.contains(it.next()));
1596 >        assertEquals(i, SIZE);
1597 >        assertIteratorExhausted(it);
1598 >
1599 >        it = q.iterator();
1600 >        for (i = 0; it.hasNext(); i++)
1601              assertEquals(it.next(), q.take());
1602 <        }
1602 >        assertEquals(i, SIZE);
1603 >        assertIteratorExhausted(it);
1604 >    }
1605 >
1606 >    /**
1607 >     * iterator of empty collection has no elements
1608 >     */
1609 >    public void testEmptyIterator() {
1610 >        Deque c = new LinkedBlockingDeque();
1611 >        assertIteratorExhausted(c.iterator());
1612 >        assertIteratorExhausted(c.descendingIterator());
1613      }
1614  
1615      /**
# Line 1367 | Line 1631 | public class LinkedBlockingDequeTest ext
1631          assertFalse(it.hasNext());
1632      }
1633  
1370
1634      /**
1635       * iterator ordering is FIFO
1636       */
# Line 1399 | Line 1662 | public class LinkedBlockingDequeTest ext
1662          assertEquals(0, q.size());
1663      }
1664  
1402
1665      /**
1666       * Descending iterator iterates through all elements
1667       */
# Line 1462 | Line 1724 | public class LinkedBlockingDequeTest ext
1724          }
1725      }
1726  
1465
1727      /**
1728       * toString contains toStrings of elements
1729       */
# Line 1470 | Line 1731 | public class LinkedBlockingDequeTest ext
1731          LinkedBlockingDeque q = populatedDeque(SIZE);
1732          String s = q.toString();
1733          for (int i = 0; i < SIZE; ++i) {
1734 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1734 >            assertTrue(s.contains(String.valueOf(i)));
1735          }
1736      }
1737  
1477
1738      /**
1739       * offer transfers elements across Executor tasks
1740       */
# Line 1482 | Line 1742 | public class LinkedBlockingDequeTest ext
1742          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1743          q.add(one);
1744          q.add(two);
1745 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1746 <        executor.execute(new CheckedRunnable() {
1747 <            public void realRun() throws InterruptedException {
1748 <                assertFalse(q.offer(three));
1749 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1750 <                assertEquals(0, q.remainingCapacity());
1751 <            }});
1752 <
1753 <        executor.execute(new CheckedRunnable() {
1754 <            public void realRun() throws InterruptedException {
1755 <                Thread.sleep(SMALL_DELAY_MS);
1756 <                assertSame(one, q.take());
1757 <            }});
1758 <
1759 <        joinPool(executor);
1745 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1746 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1747 >        try (PoolCleaner cleaner = cleaner(executor)) {
1748 >            executor.execute(new CheckedRunnable() {
1749 >                public void realRun() throws InterruptedException {
1750 >                    assertFalse(q.offer(three));
1751 >                    threadsStarted.await();
1752 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1753 >                    assertEquals(0, q.remainingCapacity());
1754 >                }});
1755 >
1756 >            executor.execute(new CheckedRunnable() {
1757 >                public void realRun() throws InterruptedException {
1758 >                    threadsStarted.await();
1759 >                    assertSame(one, q.take());
1760 >                }});
1761 >        }
1762      }
1763  
1764      /**
1765 <     * poll retrieves elements across Executor threads
1765 >     * timed poll retrieves elements across Executor threads
1766       */
1767      public void testPollInExecutor() {
1768          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1769 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1770 <        executor.execute(new CheckedRunnable() {
1771 <            public void realRun() throws InterruptedException {
1772 <                assertNull(q.poll());
1773 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1774 <                assertTrue(q.isEmpty());
1775 <            }});
1776 <
1777 <        executor.execute(new CheckedRunnable() {
1778 <            public void realRun() throws InterruptedException {
1779 <                Thread.sleep(SMALL_DELAY_MS);
1780 <                q.put(one);
1781 <            }});
1782 <
1783 <        joinPool(executor);
1769 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1770 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1771 >        try (PoolCleaner cleaner = cleaner(executor)) {
1772 >            executor.execute(new CheckedRunnable() {
1773 >                public void realRun() throws InterruptedException {
1774 >                    assertNull(q.poll());
1775 >                    threadsStarted.await();
1776 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1777 >                    checkEmpty(q);
1778 >                }});
1779 >
1780 >            executor.execute(new CheckedRunnable() {
1781 >                public void realRun() throws InterruptedException {
1782 >                    threadsStarted.await();
1783 >                    q.put(one);
1784 >                }});
1785 >        }
1786      }
1787  
1788      /**
1789 <     * A deserialized serialized deque has same elements in same order
1789 >     * A deserialized/reserialized deque has same elements in same order
1790       */
1791      public void testSerialization() throws Exception {
1792 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1793 <
1530 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1531 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1532 <        out.writeObject(q);
1533 <        out.close();
1534 <
1535 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1536 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1537 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1538 <        assertEquals(q.size(), r.size());
1539 <        while (!q.isEmpty())
1540 <            assertEquals(q.remove(), r.remove());
1541 <    }
1542 <
1543 <    /**
1544 <     * drainTo(null) throws NPE
1545 <     */
1546 <    public void testDrainToNull() {
1547 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1548 <        try {
1549 <            q.drainTo(null);
1550 <            shouldThrow();
1551 <        } catch (NullPointerException success) {}
1552 <    }
1792 >        Queue x = populatedDeque(SIZE);
1793 >        Queue y = serialClone(x);
1794  
1795 <    /**
1796 <     * drainTo(this) throws IAE
1797 <     */
1798 <    public void testDrainToSelf() {
1799 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1800 <        try {
1801 <            q.drainTo(q);
1802 <            shouldThrow();
1803 <        } catch (IllegalArgumentException success) {}
1795 >        assertNotSame(y, x);
1796 >        assertEquals(x.size(), y.size());
1797 >        assertEquals(x.toString(), y.toString());
1798 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1799 >        while (!x.isEmpty()) {
1800 >            assertFalse(y.isEmpty());
1801 >            assertEquals(x.remove(), y.remove());
1802 >        }
1803 >        assertTrue(y.isEmpty());
1804      }
1805  
1806      /**
# Line 1569 | Line 1810 | public class LinkedBlockingDequeTest ext
1810          LinkedBlockingDeque q = populatedDeque(SIZE);
1811          ArrayList l = new ArrayList();
1812          q.drainTo(l);
1813 <        assertEquals(q.size(), 0);
1814 <        assertEquals(l.size(), SIZE);
1813 >        assertEquals(0, q.size());
1814 >        assertEquals(SIZE, l.size());
1815          for (int i = 0; i < SIZE; ++i)
1816              assertEquals(l.get(i), new Integer(i));
1817          q.add(zero);
# Line 1580 | Line 1821 | public class LinkedBlockingDequeTest ext
1821          assertTrue(q.contains(one));
1822          l.clear();
1823          q.drainTo(l);
1824 <        assertEquals(q.size(), 0);
1825 <        assertEquals(l.size(), 2);
1824 >        assertEquals(0, q.size());
1825 >        assertEquals(2, l.size());
1826          for (int i = 0; i < 2; ++i)
1827              assertEquals(l.get(i), new Integer(i));
1828      }
# Line 1593 | Line 1834 | public class LinkedBlockingDequeTest ext
1834          final LinkedBlockingDeque q = populatedDeque(SIZE);
1835          Thread t = new Thread(new CheckedRunnable() {
1836              public void realRun() throws InterruptedException {
1837 <                q.put(new Integer(SIZE+1));
1837 >                q.put(new Integer(SIZE + 1));
1838              }});
1839  
1840          t.start();
# Line 1607 | Line 1848 | public class LinkedBlockingDequeTest ext
1848      }
1849  
1850      /**
1610     * drainTo(null, n) throws NPE
1611     */
1612    public void testDrainToNullN() {
1613        LinkedBlockingDeque q = populatedDeque(SIZE);
1614        try {
1615            q.drainTo(null, 0);
1616            shouldThrow();
1617        } catch (NullPointerException success) {}
1618    }
1619
1620    /**
1621     * drainTo(this, n) throws IAE
1622     */
1623    public void testDrainToSelfN() {
1624        LinkedBlockingDeque q = populatedDeque(SIZE);
1625        try {
1626            q.drainTo(q, 0);
1627            shouldThrow();
1628        } catch (IllegalArgumentException success) {}
1629    }
1630
1631    /**
1851       * drainTo(c, n) empties first min(n, size) elements of queue into c
1852       */
1853      public void testDrainToN() {
# Line 1639 | Line 1858 | public class LinkedBlockingDequeTest ext
1858              ArrayList l = new ArrayList();
1859              q.drainTo(l, i);
1860              int k = (i < SIZE) ? i : SIZE;
1861 <            assertEquals(l.size(), k);
1862 <            assertEquals(q.size(), SIZE-k);
1861 >            assertEquals(k, l.size());
1862 >            assertEquals(SIZE - k, q.size());
1863              for (int j = 0; j < k; ++j)
1864                  assertEquals(l.get(j), new Integer(j));
1865 <            while (q.poll() != null) ;
1865 >            do {} while (q.poll() != null);
1866 >        }
1867 >    }
1868 >
1869 >    /**
1870 >     * remove(null), contains(null) always return false
1871 >     */
1872 >    public void testNeverContainsNull() {
1873 >        Deque<?>[] qs = {
1874 >            new LinkedBlockingDeque<Object>(),
1875 >            populatedDeque(2),
1876 >        };
1877 >
1878 >        for (Deque<?> q : qs) {
1879 >            assertFalse(q.contains(null));
1880 >            assertFalse(q.remove(null));
1881 >            assertFalse(q.removeFirstOccurrence(null));
1882 >            assertFalse(q.removeLastOccurrence(null));
1883          }
1884      }
1885  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines