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.36 by jsr166, Thu Apr 14 22:55:08 2011 UTC vs.
Revision 1.85 by jsr166, Thu Sep 5 20:54:24 2019 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 import junit.framework.*;
8 import java.util.*;
9 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 < import java.io.*;
8 >
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Deque;
13 > import java.util.Iterator;
14 > import java.util.NoSuchElementException;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingDeque;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedBlockingDeque;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingDequeTest extends JSR166TestCase {
26  
# Line 20 | Line 32 | public class LinkedBlockingDequeTest ext
32  
33      public static class Bounded extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new LinkedBlockingDeque(20);
35 >            return new LinkedBlockingDeque(SIZE);
36          }
37      }
38  
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run(suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
44 +        class Implementation implements CollectionImplementation {
45 +            public Class<?> klazz() { return LinkedBlockingDeque.class; }
46 +            public Collection emptyCollection() { return new LinkedBlockingDeque(); }
47 +            public Object makeElement(int i) { return i; }
48 +            public boolean isConcurrent() { return true; }
49 +            public boolean permitsNulls() { return false; }
50 +        }
51          return newTestSuite(LinkedBlockingDequeTest.class,
52                              new Unbounded().testSuite(),
53 <                            new Bounded().testSuite());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58 <     * Create a deque of given size containing consecutive
59 <     * Integers 0 ... n.
58 >     * Returns a new deque of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingDeque<Integer> populatedDeque(int n) {
61 >    private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62          LinkedBlockingDeque<Integer> q =
63              new LinkedBlockingDeque<Integer>(n);
64          assertTrue(q.isEmpty());
# Line 47 | Line 67 | public class LinkedBlockingDequeTest ext
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peekFirst());
71 +        assertEquals((Integer) (n - 1), q.peekLast());
72          return q;
73      }
74  
# Line 70 | Line 92 | public class LinkedBlockingDequeTest ext
92      public void testSize() {
93          LinkedBlockingDeque q = populatedDeque(SIZE);
94          for (int i = 0; i < SIZE; ++i) {
95 <            assertEquals(SIZE-i, q.size());
95 >            assertEquals(SIZE - i, q.size());
96              q.removeFirst();
97          }
98          for (int i = 0; i < SIZE; ++i) {
# Line 80 | Line 102 | public class LinkedBlockingDequeTest ext
102      }
103  
104      /**
105 <     * offer(null) throws NPE
105 >     * offerFirst(null) throws NullPointerException
106       */
107      public void testOfferFirstNull() {
108 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
109          try {
87            LinkedBlockingDeque q = new LinkedBlockingDeque();
110              q.offerFirst(null);
111              shouldThrow();
112          } catch (NullPointerException success) {}
113      }
114  
115      /**
116 +     * offerLast(null) throws NullPointerException
117 +     */
118 +    public void testOfferLastNull() {
119 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
120 +        try {
121 +            q.offerLast(null);
122 +            shouldThrow();
123 +        } catch (NullPointerException success) {}
124 +    }
125 +
126 +    /**
127       * OfferFirst succeeds
128       */
129      public void testOfferFirst() {
# Line 124 | Line 157 | public class LinkedBlockingDequeTest ext
157       */
158      public void testPollLast() {
159          LinkedBlockingDeque q = populatedDeque(SIZE);
160 <        for (int i = SIZE-1; i >= 0; --i) {
160 >        for (int i = SIZE - 1; i >= 0; --i) {
161              assertEquals(i, q.pollLast());
162          }
163          assertNull(q.pollLast());
# Line 163 | Line 196 | public class LinkedBlockingDequeTest ext
196       */
197      public void testPeekLast() {
198          LinkedBlockingDeque q = populatedDeque(SIZE);
199 <        for (int i = SIZE-1; i >= 0; --i) {
199 >        for (int i = SIZE - 1; i >= 0; --i) {
200              assertEquals(i, q.peekLast());
201              assertEquals(i, q.pollLast());
202              assertTrue(q.peekLast() == null ||
# Line 193 | Line 226 | public class LinkedBlockingDequeTest ext
226       */
227      public void testLastElement() {
228          LinkedBlockingDeque q = populatedDeque(SIZE);
229 <        for (int i = SIZE-1; i >= 0; --i) {
229 >        for (int i = SIZE - 1; i >= 0; --i) {
230              assertEquals(i, q.getLast());
231              assertEquals(i, q.pollLast());
232          }
# Line 253 | Line 286 | public class LinkedBlockingDequeTest ext
286       */
287      public void testRemoveFirstOccurrence() {
288          LinkedBlockingDeque q = populatedDeque(SIZE);
289 <        for (int i = 1; i < SIZE; i+=2) {
289 >        for (int i = 1; i < SIZE; i += 2) {
290              assertTrue(q.removeFirstOccurrence(new Integer(i)));
291          }
292 <        for (int i = 0; i < SIZE; i+=2) {
292 >        for (int i = 0; i < SIZE; i += 2) {
293              assertTrue(q.removeFirstOccurrence(new Integer(i)));
294 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
294 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
295          }
296          assertTrue(q.isEmpty());
297      }
# Line 268 | Line 301 | public class LinkedBlockingDequeTest ext
301       */
302      public void testRemoveLastOccurrence() {
303          LinkedBlockingDeque q = populatedDeque(SIZE);
304 <        for (int i = 1; i < SIZE; i+=2) {
304 >        for (int i = 1; i < SIZE; i += 2) {
305              assertTrue(q.removeLastOccurrence(new Integer(i)));
306          }
307 <        for (int i = 0; i < SIZE; i+=2) {
307 >        for (int i = 0; i < SIZE; i += 2) {
308              assertTrue(q.removeLastOccurrence(new Integer(i)));
309 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
309 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
310          }
311          assertTrue(q.isEmpty());
312      }
# Line 298 | Line 331 | public class LinkedBlockingDequeTest ext
331          assertSame(four, q.peekLast());
332      }
333  
301
334      /**
335       * A new deque has the indicated capacity, or Integer.MAX_VALUE if
336       * none given
# Line 309 | 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];
337 <            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];
348 <            for (int i = 0; i < SIZE-1; ++i)
349 <                ints[i] = new Integer(i);
350 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
384 >            new LinkedBlockingDeque(elements);
385              shouldThrow();
386          } catch (NullPointerException success) {}
387      }
# Line 358 | 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 383 | 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      /**
400     * offer(null) throws NPE
401     */
402    public void testOfferNull() {
403        try {
404            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
405            q.offer(null);
406            shouldThrow();
407        } catch (NullPointerException success) {}
408    }
409
410    /**
411     * add(null) throws NPE
412     */
413    public void testAddNull() {
414        try {
415            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
416            q.add(null);
417            shouldThrow();
418        } catch (NullPointerException success) {}
419    }
420
421    /**
434       * push(null) throws NPE
435       */
436      public void testPushNull() {
437 +        LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438          try {
426            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 {
437            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
438            for (int i = 0; i < SIZE; ++i) {
439                Integer I = new Integer(i);
440                q.push(I);
441                assertEquals(I, q.peek());
442            }
443            assertEquals(0, q.remainingCapacity());
456              q.push(new Integer(SIZE));
457              shouldThrow();
458          } catch (IllegalStateException success) {}
# Line 456 | Line 468 | public class LinkedBlockingDequeTest ext
468          assertSame(four, q.peekFirst());
469      }
470  
459
471      /**
472       * pop removes next element, or throws NSEE if empty
473       */
# Line 471 | Line 482 | public class LinkedBlockingDequeTest ext
482          } catch (NoSuchElementException success) {}
483      }
484  
474
485      /**
486       * Offer succeeds if not full; fails if full
487       */
# Line 482 | 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 {
489            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
490            for (int i = 0; i < SIZE; ++i) {
491                assertTrue(q.add(new Integer(i)));
492            }
493            assertEquals(0, q.remainingCapacity());
503              q.add(new Integer(SIZE));
504              shouldThrow();
505          } catch (IllegalStateException success) {}
506      }
507  
508      /**
509 <     * addAll(null) throws NPE
501 <     */
502 <    public void testAddAll1() {
503 <        try {
504 <            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
505 <            q.addAll(null);
506 <            shouldThrow();
507 <        } catch (NullPointerException success) {}
508 <    }
509 <
510 <    /**
511 <     * addAll(this) throws IAE
509 >     * addAll(this) throws IllegalArgumentException
510       */
511      public void testAddAllSelf() {
512 +        LinkedBlockingDeque q = populatedDeque(SIZE);
513          try {
515            LinkedBlockingDeque q = populatedDeque(SIZE);
514              q.addAll(q);
515              shouldThrow();
516          } catch (IllegalArgumentException success) {}
517      }
518  
519      /**
522     * addAll of a collection with null elements throws NPE
523     */
524    public void testAddAll2() {
525        try {
526            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
527            Integer[] ints = new Integer[SIZE];
528            q.addAll(Arrays.asList(ints));
529            shouldThrow();
530        } catch (NullPointerException success) {}
531    }
532
533    /**
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);
540 <            Integer[] ints = new Integer[SIZE];
541 <            for (int i = 0; i < SIZE-1; ++i)
542 <                ints[i] = new Integer(i);
543 <            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);
554 <            Integer[] ints = new Integer[SIZE];
555 <            for (int i = 0; i < SIZE; ++i)
556 <                ints[i] = new Integer(i);
557 <            q.addAll(Arrays.asList(ints));
545 >            q.addAll(elements);
546              shouldThrow();
547          } catch (IllegalStateException success) {}
548      }
# Line 574 | Line 562 | public class LinkedBlockingDequeTest ext
562              assertEquals(ints[i], q.poll());
563      }
564  
577
578    /**
579     * put(null) throws NPE
580     */
581    public void testPutNull() throws InterruptedException {
582        try {
583            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
584            q.put(null);
585            shouldThrow();
586        } catch (NullPointerException success) {}
587    }
588
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 604 | 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);
645 <        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 683 | Line 699 | public class LinkedBlockingDequeTest ext
699      }
700  
701      /**
702 <     * 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  
707
732      /**
733       * poll succeeds unless empty
734       */
# Line 733 | 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 744 | Line 773 | public class LinkedBlockingDequeTest ext
773       */
774      public void testInterruptedTimedPoll() throws InterruptedException {
775          final BlockingQueue<Integer> q = populatedDeque(SIZE);
776 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
776 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
777          Thread t = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                for (int i = 0; i < SIZE; ++i) {
780 <                    long t0 = System.nanoTime();
779 >                long startTime = System.nanoTime();
780 >                for (int i = 0; i < SIZE; i++)
781                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
782 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
783 <                }
755 <                long t0 = System.nanoTime();
756 <                aboutToWait.countDown();
782 >
783 >                Thread.currentThread().interrupt();
784                  try {
785 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
785 >                    q.poll(randomTimeout(), randomTimeUnit());
786                      shouldThrow();
787 <                } catch (InterruptedException success) {
788 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
789 <                }
787 >                } catch (InterruptedException success) {}
788 >                assertFalse(Thread.interrupted());
789 >
790 >                pleaseInterrupt.countDown();
791 >                try {
792 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
793 >                    shouldThrow();
794 >                } catch (InterruptedException success) {}
795 >                assertFalse(Thread.interrupted());
796 >
797 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
798              }});
799  
800 <        aboutToWait.await();
801 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
800 >        await(pleaseInterrupt);
801 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
802          t.interrupt();
803 <        awaitTermination(t, MEDIUM_DELAY_MS);
803 >        awaitTermination(t);
804          checkEmpty(q);
805      }
806  
# Line 773 | Line 808 | public class LinkedBlockingDequeTest ext
808       * putFirst(null) throws NPE
809       */
810      public void testPutFirstNull() throws InterruptedException {
811 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
812          try {
777            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
813              q.putFirst(null);
814              shouldThrow();
815          } catch (NullPointerException success) {}
# Line 786 | Line 821 | public class LinkedBlockingDequeTest ext
821      public void testPutFirst() throws InterruptedException {
822          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
823          for (int i = 0; i < SIZE; ++i) {
824 <            Integer I = new Integer(i);
825 <            q.putFirst(I);
826 <            assertTrue(q.contains(I));
824 >            Integer x = new Integer(i);
825 >            q.putFirst(x);
826 >            assertTrue(q.contains(x));
827          }
828          assertEquals(0, q.remainingCapacity());
829      }
# Line 798 | Line 833 | public class LinkedBlockingDequeTest ext
833       */
834      public void testBlockingPutFirst() throws InterruptedException {
835          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
836 <        Thread t = new Thread(new CheckedRunnable() {
836 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
837 >        Thread t = newStartedThread(new CheckedRunnable() {
838              public void realRun() throws InterruptedException {
839                  for (int i = 0; i < SIZE; ++i)
840                      q.putFirst(i);
841                  assertEquals(SIZE, q.size());
842                  assertEquals(0, q.remainingCapacity());
843 +
844 +                Thread.currentThread().interrupt();
845                  try {
846                      q.putFirst(99);
847                      shouldThrow();
848                  } catch (InterruptedException success) {}
849 +                assertFalse(Thread.interrupted());
850 +
851 +                pleaseInterrupt.countDown();
852 +                try {
853 +                    q.putFirst(99);
854 +                    shouldThrow();
855 +                } catch (InterruptedException success) {}
856 +                assertFalse(Thread.interrupted());
857              }});
858  
859 <        t.start();
860 <        Thread.sleep(SHORT_DELAY_MS);
859 >        await(pleaseInterrupt);
860 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
861          t.interrupt();
862 <        t.join();
862 >        awaitTermination(t);
863          assertEquals(SIZE, q.size());
864          assertEquals(0, q.remainingCapacity());
865      }
866  
867      /**
868 <     * putFirst blocks waiting for take when full
868 >     * putFirst blocks interruptibly waiting for take when full
869       */
870      public void testPutFirstWithTake() throws InterruptedException {
871          final int capacity = 2;
872          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
873 <        Thread t = new Thread(new CheckedRunnable() {
873 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
874 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
875 >        Thread t = newStartedThread(new CheckedRunnable() {
876              public void realRun() throws InterruptedException {
877 <                for (int i = 0; i < capacity + 1; i++)
877 >                for (int i = 0; i < capacity; i++)
878                      q.putFirst(i);
879 +                pleaseTake.countDown();
880 +                q.putFirst(86);
881 +
882 +                pleaseInterrupt.countDown();
883                  try {
884                      q.putFirst(99);
885                      shouldThrow();
886                  } catch (InterruptedException success) {}
887 +                assertFalse(Thread.interrupted());
888              }});
889  
890 <        t.start();
891 <        Thread.sleep(SHORT_DELAY_MS);
839 <        assertEquals(q.remainingCapacity(), 0);
890 >        await(pleaseTake);
891 >        assertEquals(0, q.remainingCapacity());
892          assertEquals(capacity - 1, q.take());
893 <        Thread.sleep(SHORT_DELAY_MS);
893 >
894 >        await(pleaseInterrupt);
895 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
896          t.interrupt();
897 <        t.join();
898 <        assertEquals(q.remainingCapacity(), 0);
897 >        awaitTermination(t);
898 >        assertEquals(0, q.remainingCapacity());
899      }
900  
901      /**
902       * timed offerFirst times out if full and elements not taken
903       */
904 <    public void testTimedOfferFirst() throws InterruptedException {
904 >    public void testTimedOfferFirst() {
905          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
906 <        Thread t = new Thread(new CheckedRunnable() {
906 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
907 >        Thread t = newStartedThread(new CheckedRunnable() {
908              public void realRun() throws InterruptedException {
909                  q.putFirst(new Object());
910                  q.putFirst(new Object());
911 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
911 >                long startTime = System.nanoTime();
912 >
913 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
914 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
915 >
916 >                Thread.currentThread().interrupt();
917 >                try {
918 >                    q.offerFirst(new Object(), randomTimeout(), randomTimeUnit());
919 >                    shouldThrow();
920 >                } catch (InterruptedException success) {}
921 >                assertFalse(Thread.interrupted());
922 >
923 >                pleaseInterrupt.countDown();
924                  try {
925                      q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
926                      shouldThrow();
927                  } catch (InterruptedException success) {}
928 +                assertFalse(Thread.interrupted());
929 +
930 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
931              }});
932  
933 <        t.start();
934 <        Thread.sleep(SMALL_DELAY_MS);
933 >        await(pleaseInterrupt);
934 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
935          t.interrupt();
936 <        t.join();
936 >        awaitTermination(t);
937      }
938  
939      /**
# Line 877 | Line 947 | public class LinkedBlockingDequeTest ext
947      }
948  
949      /**
950 <     * takeFirst blocks interruptibly when empty
950 >     * takeFirst() blocks interruptibly when empty
951       */
952 <    public void testTakeFirstFromEmpty() throws InterruptedException {
953 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
954 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
955 <            public void realRun() throws InterruptedException {
956 <                q.takeFirst();
957 <            }};
952 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
953 >        final BlockingDeque q = new LinkedBlockingDeque();
954 >        final CountDownLatch threadStarted = new CountDownLatch(1);
955 >        Thread t = newStartedThread(new CheckedRunnable() {
956 >            public void realRun() {
957 >                threadStarted.countDown();
958 >                try {
959 >                    q.takeFirst();
960 >                    shouldThrow();
961 >                } catch (InterruptedException success) {}
962 >                assertFalse(Thread.interrupted());
963 >            }});
964  
965 <        t.start();
966 <        Thread.sleep(SHORT_DELAY_MS);
965 >        await(threadStarted);
966 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
967          t.interrupt();
968 <        t.join();
968 >        awaitTermination(t);
969 >    }
970 >
971 >    /**
972 >     * takeFirst() throws InterruptedException immediately if interrupted
973 >     * before waiting
974 >     */
975 >    public void testTakeFirstFromEmptyAfterInterrupt() {
976 >        final BlockingDeque q = new LinkedBlockingDeque();
977 >        Thread t = newStartedThread(new CheckedRunnable() {
978 >            public void realRun() {
979 >                Thread.currentThread().interrupt();
980 >                try {
981 >                    q.takeFirst();
982 >                    shouldThrow();
983 >                } catch (InterruptedException success) {}
984 >                assertFalse(Thread.interrupted());
985 >            }});
986 >
987 >        awaitTermination(t);
988      }
989  
990      /**
991 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
991 >     * takeLast() blocks interruptibly when empty
992 >     */
993 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
994 >        final BlockingDeque q = new LinkedBlockingDeque();
995 >        final CountDownLatch threadStarted = new CountDownLatch(1);
996 >        Thread t = newStartedThread(new CheckedRunnable() {
997 >            public void realRun() {
998 >                threadStarted.countDown();
999 >                try {
1000 >                    q.takeLast();
1001 >                    shouldThrow();
1002 >                } catch (InterruptedException success) {}
1003 >                assertFalse(Thread.interrupted());
1004 >            }});
1005 >
1006 >        await(threadStarted);
1007 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1008 >        t.interrupt();
1009 >        awaitTermination(t);
1010 >    }
1011 >
1012 >    /**
1013 >     * takeLast() throws InterruptedException immediately if interrupted
1014 >     * before waiting
1015 >     */
1016 >    public void testTakeLastFromEmptyAfterInterrupt() {
1017 >        final BlockingDeque q = new LinkedBlockingDeque();
1018 >        Thread t = newStartedThread(new CheckedRunnable() {
1019 >            public void realRun() {
1020 >                Thread.currentThread().interrupt();
1021 >                try {
1022 >                    q.takeLast();
1023 >                    shouldThrow();
1024 >                } catch (InterruptedException success) {}
1025 >                assertFalse(Thread.interrupted());
1026 >            }});
1027 >
1028 >        awaitTermination(t);
1029 >    }
1030 >
1031 >    /**
1032 >     * takeFirst removes existing elements until empty, then blocks interruptibly
1033       */
1034      public void testBlockingTakeFirst() throws InterruptedException {
1035          final LinkedBlockingDeque q = populatedDeque(SIZE);
1036 <        Thread t = new Thread(new CheckedRunnable() {
1036 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1037 >        Thread t = newStartedThread(new CheckedRunnable() {
1038              public void realRun() throws InterruptedException {
1039 <                for (int i = 0; i < SIZE; ++i)
1040 <                    assertEquals(i, q.takeFirst());
1039 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1040 >
1041 >                Thread.currentThread().interrupt();
1042                  try {
1043                      q.takeFirst();
1044                      shouldThrow();
1045                  } catch (InterruptedException success) {}
1046 +                assertFalse(Thread.interrupted());
1047 +
1048 +                pleaseInterrupt.countDown();
1049 +                try {
1050 +                    q.takeFirst();
1051 +                    shouldThrow();
1052 +                } catch (InterruptedException success) {}
1053 +                assertFalse(Thread.interrupted());
1054              }});
1055  
1056 <        t.start();
1057 <        Thread.sleep(SHORT_DELAY_MS);
1056 >        await(pleaseInterrupt);
1057 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1058          t.interrupt();
1059 <        t.join();
1059 >        awaitTermination(t);
1060      }
1061  
916
1062      /**
1063       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1064       */
# Line 931 | Line 1076 | public class LinkedBlockingDequeTest ext
1076      public void testTimedPollFirst() throws InterruptedException {
1077          LinkedBlockingDeque q = populatedDeque(SIZE);
1078          for (int i = 0; i < SIZE; ++i) {
1079 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1080 <        }
1081 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1079 >            long startTime = System.nanoTime();
1080 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1081 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1082 >        }
1083 >        long startTime = System.nanoTime();
1084 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1085 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1086 >        checkEmpty(q);
1087      }
1088  
1089      /**
# Line 941 | Line 1091 | public class LinkedBlockingDequeTest ext
1091       * returning timeout status
1092       */
1093      public void testInterruptedTimedPollFirst() throws InterruptedException {
1094 <        Thread t = new Thread(new CheckedRunnable() {
1094 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1095 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1096 >        Thread t = newStartedThread(new CheckedRunnable() {
1097              public void realRun() throws InterruptedException {
1098 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1099 <                for (int i = 0; i < SIZE; ++i) {
1100 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1101 <                }
1098 >                long startTime = System.nanoTime();
1099 >                for (int i = 0; i < SIZE; i++)
1100 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1101 >
1102 >                Thread.currentThread().interrupt();
1103                  try {
1104 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1104 >                    q.pollFirst(randomTimeout(), randomTimeUnit());
1105                      shouldThrow();
1106                  } catch (InterruptedException success) {}
1107 +                assertFalse(Thread.interrupted());
1108 +
1109 +                pleaseInterrupt.countDown();
1110 +                try {
1111 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1112 +                    shouldThrow();
1113 +                } catch (InterruptedException success) {}
1114 +                assertFalse(Thread.interrupted());
1115 +
1116 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1117              }});
1118  
1119 <        t.start();
1120 <        Thread.sleep(SHORT_DELAY_MS);
1119 >        await(pleaseInterrupt);
1120 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1121          t.interrupt();
1122 <        t.join();
1122 >        awaitTermination(t);
1123      }
1124  
1125      /**
# Line 965 | Line 1128 | public class LinkedBlockingDequeTest ext
1128       */
1129      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1130          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1131 <        Thread t = new Thread(new CheckedRunnable() {
1131 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1132 >        Thread t = newStartedThread(new CheckedRunnable() {
1133              public void realRun() throws InterruptedException {
1134 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1134 >                long startTime = System.nanoTime();
1135 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1136 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1137 >
1138 >                barrier.await();
1139 >
1140                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1141 +
1142 +                Thread.currentThread().interrupt();
1143 +                try {
1144 +                    q.pollFirst(randomTimeout(), randomTimeUnit());
1145 +                    shouldThrow();
1146 +                } catch (InterruptedException success) {}
1147 +
1148 +                barrier.await();
1149                  try {
1150                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1151                      shouldThrow();
1152                  } catch (InterruptedException success) {}
1153 +                assertFalse(Thread.interrupted());
1154 +
1155 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1156              }});
1157  
1158 <        t.start();
1159 <        Thread.sleep(SMALL_DELAY_MS);
1160 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1158 >        barrier.await();
1159 >        long startTime = System.nanoTime();
1160 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1161 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1162 >        barrier.await();
1163 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1164          t.interrupt();
1165 <        t.join();
1165 >        awaitTermination(t);
1166      }
1167  
1168      /**
1169       * putLast(null) throws NPE
1170       */
1171      public void testPutLastNull() throws InterruptedException {
1172 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1173          try {
990            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1174              q.putLast(null);
1175              shouldThrow();
1176          } catch (NullPointerException success) {}
# Line 999 | Line 1182 | public class LinkedBlockingDequeTest ext
1182      public void testPutLast() throws InterruptedException {
1183          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1184          for (int i = 0; i < SIZE; ++i) {
1185 <            Integer I = new Integer(i);
1186 <            q.putLast(I);
1187 <            assertTrue(q.contains(I));
1185 >            Integer x = new Integer(i);
1186 >            q.putLast(x);
1187 >            assertTrue(q.contains(x));
1188          }
1189          assertEquals(0, q.remainingCapacity());
1190      }
# Line 1011 | Line 1194 | public class LinkedBlockingDequeTest ext
1194       */
1195      public void testBlockingPutLast() throws InterruptedException {
1196          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1197 <        Thread t = new Thread(new CheckedRunnable() {
1197 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1198 >        Thread t = newStartedThread(new CheckedRunnable() {
1199              public void realRun() throws InterruptedException {
1200                  for (int i = 0; i < SIZE; ++i)
1201                      q.putLast(i);
1202                  assertEquals(SIZE, q.size());
1203                  assertEquals(0, q.remainingCapacity());
1204 +
1205 +                Thread.currentThread().interrupt();
1206 +                try {
1207 +                    q.putLast(99);
1208 +                    shouldThrow();
1209 +                } catch (InterruptedException success) {}
1210 +                assertFalse(Thread.interrupted());
1211 +
1212 +                pleaseInterrupt.countDown();
1213                  try {
1214                      q.putLast(99);
1215                      shouldThrow();
1216                  } catch (InterruptedException success) {}
1217 +                assertFalse(Thread.interrupted());
1218              }});
1219  
1220 <        t.start();
1221 <        Thread.sleep(SHORT_DELAY_MS);
1220 >        await(pleaseInterrupt);
1221 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1222          t.interrupt();
1223 <        t.join();
1223 >        awaitTermination(t);
1224          assertEquals(SIZE, q.size());
1225          assertEquals(0, q.remainingCapacity());
1226      }
1227  
1228      /**
1229 <     * putLast blocks waiting for take when full
1229 >     * putLast blocks interruptibly waiting for take when full
1230       */
1231      public void testPutLastWithTake() throws InterruptedException {
1232          final int capacity = 2;
1233          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1234 <        Thread t = new Thread(new CheckedRunnable() {
1234 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1235 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1236 >        Thread t = newStartedThread(new CheckedRunnable() {
1237              public void realRun() throws InterruptedException {
1238 <                for (int i = 0; i < capacity + 1; i++)
1238 >                for (int i = 0; i < capacity; i++)
1239                      q.putLast(i);
1240 +                pleaseTake.countDown();
1241 +                q.putLast(86);
1242 +
1243 +                Thread.currentThread().interrupt();
1244                  try {
1245                      q.putLast(99);
1246                      shouldThrow();
1247                  } catch (InterruptedException success) {}
1248 +                assertFalse(Thread.interrupted());
1249 +
1250 +                pleaseInterrupt.countDown();
1251 +                try {
1252 +                    q.putLast(99);
1253 +                    shouldThrow();
1254 +                } catch (InterruptedException success) {}
1255 +                assertFalse(Thread.interrupted());
1256              }});
1257  
1258 <        t.start();
1259 <        Thread.sleep(SHORT_DELAY_MS);
1052 <        assertEquals(q.remainingCapacity(), 0);
1258 >        await(pleaseTake);
1259 >        assertEquals(0, q.remainingCapacity());
1260          assertEquals(0, q.take());
1261 <        Thread.sleep(SHORT_DELAY_MS);
1261 >
1262 >        await(pleaseInterrupt);
1263 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1264          t.interrupt();
1265 <        t.join();
1266 <        assertEquals(q.remainingCapacity(), 0);
1265 >        awaitTermination(t);
1266 >        assertEquals(0, q.remainingCapacity());
1267      }
1268  
1269      /**
1270       * timed offerLast times out if full and elements not taken
1271       */
1272 <    public void testTimedOfferLast() throws InterruptedException {
1272 >    public void testTimedOfferLast() {
1273          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1274 <        Thread t = new Thread(new CheckedRunnable() {
1274 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1275 >        Thread t = newStartedThread(new CheckedRunnable() {
1276              public void realRun() throws InterruptedException {
1277                  q.putLast(new Object());
1278                  q.putLast(new Object());
1279 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1279 >                long startTime = System.nanoTime();
1280 >
1281 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1282 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1283 >
1284 >                Thread.currentThread().interrupt();
1285 >                try {
1286 >                    q.offerLast(new Object(), randomTimeout(), randomTimeUnit());
1287 >                    shouldThrow();
1288 >                } catch (InterruptedException success) {}
1289 >
1290 >                pleaseInterrupt.countDown();
1291                  try {
1292                      q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1293                      shouldThrow();
1294                  } catch (InterruptedException success) {}
1295 +
1296 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1297              }});
1298  
1299 <        t.start();
1300 <        Thread.sleep(SMALL_DELAY_MS);
1299 >        await(pleaseInterrupt);
1300 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1301          t.interrupt();
1302 <        t.join();
1302 >        awaitTermination(t);
1303      }
1304  
1305      /**
# Line 1085 | Line 1308 | public class LinkedBlockingDequeTest ext
1308      public void testTakeLast() throws InterruptedException {
1309          LinkedBlockingDeque q = populatedDeque(SIZE);
1310          for (int i = 0; i < SIZE; ++i) {
1311 <            assertEquals(SIZE-i-1, q.takeLast());
1311 >            assertEquals(SIZE - i - 1, q.takeLast());
1312          }
1313      }
1314  
1315      /**
1316 <     * takeLast blocks interruptibly when empty
1094 <     */
1095 <    public void testTakeLastFromEmpty() throws InterruptedException {
1096 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1097 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1098 <            public void realRun() throws InterruptedException {
1099 <                q.takeLast();
1100 <            }};
1101 <
1102 <        t.start();
1103 <        Thread.sleep(SHORT_DELAY_MS);
1104 <        t.interrupt();
1105 <        t.join();
1106 <    }
1107 <
1108 <    /**
1109 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1316 >     * takeLast removes existing elements until empty, then blocks interruptibly
1317       */
1318      public void testBlockingTakeLast() throws InterruptedException {
1319          final LinkedBlockingDeque q = populatedDeque(SIZE);
1320 <        Thread t = new Thread(new CheckedRunnable() {
1320 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1321 >        Thread t = newStartedThread(new CheckedRunnable() {
1322              public void realRun() throws InterruptedException {
1323 <                for (int i = 0; i < SIZE; ++i)
1324 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1323 >                for (int i = 0; i < SIZE; i++)
1324 >                    assertEquals(SIZE - i - 1, q.takeLast());
1325 >
1326 >                Thread.currentThread().interrupt();
1327                  try {
1328                      q.takeLast();
1329                      shouldThrow();
1330                  } catch (InterruptedException success) {}
1331 +                assertFalse(Thread.interrupted());
1332 +
1333 +                pleaseInterrupt.countDown();
1334 +                try {
1335 +                    q.takeLast();
1336 +                    shouldThrow();
1337 +                } catch (InterruptedException success) {}
1338 +                assertFalse(Thread.interrupted());
1339              }});
1340  
1341 <        t.start();
1342 <        Thread.sleep(SHORT_DELAY_MS);
1341 >        await(pleaseInterrupt);
1342 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1343          t.interrupt();
1344 <        t.join();
1344 >        awaitTermination(t);
1345      }
1346  
1347      /**
# Line 1132 | Line 1350 | public class LinkedBlockingDequeTest ext
1350      public void testTimedPollLast0() throws InterruptedException {
1351          LinkedBlockingDeque q = populatedDeque(SIZE);
1352          for (int i = 0; i < SIZE; ++i) {
1353 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1353 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1354          }
1355          assertNull(q.pollLast(0, MILLISECONDS));
1356      }
# Line 1143 | Line 1361 | public class LinkedBlockingDequeTest ext
1361      public void testTimedPollLast() throws InterruptedException {
1362          LinkedBlockingDeque q = populatedDeque(SIZE);
1363          for (int i = 0; i < SIZE; ++i) {
1364 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1365 <        }
1366 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1364 >            long startTime = System.nanoTime();
1365 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1366 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1367 >        }
1368 >        long startTime = System.nanoTime();
1369 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1370 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1371 >        checkEmpty(q);
1372      }
1373  
1374      /**
# Line 1153 | Line 1376 | public class LinkedBlockingDequeTest ext
1376       * returning timeout status
1377       */
1378      public void testInterruptedTimedPollLast() throws InterruptedException {
1379 <        Thread t = new Thread(new CheckedRunnable() {
1379 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1380 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1381 >        Thread t = newStartedThread(new CheckedRunnable() {
1382              public void realRun() throws InterruptedException {
1383 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1384 <                for (int i = 0; i < SIZE; ++i) {
1385 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1386 <                }
1383 >                long startTime = System.nanoTime();
1384 >                for (int i = 0; i < SIZE; i++)
1385 >                    assertEquals(SIZE - i - 1,
1386 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1387 >
1388 >                Thread.currentThread().interrupt();
1389                  try {
1390 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1390 >                    q.pollLast(randomTimeout(), randomTimeUnit());
1391                      shouldThrow();
1392                  } catch (InterruptedException success) {}
1393 +                assertFalse(Thread.interrupted());
1394 +
1395 +                pleaseInterrupt.countDown();
1396 +                try {
1397 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1398 +                    shouldThrow();
1399 +                } catch (InterruptedException success) {}
1400 +                assertFalse(Thread.interrupted());
1401 +
1402 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1403              }});
1404  
1405 <        t.start();
1406 <        Thread.sleep(SHORT_DELAY_MS);
1405 >        await(pleaseInterrupt);
1406 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1407          t.interrupt();
1408 <        t.join();
1408 >        awaitTermination(t);
1409 >        checkEmpty(q);
1410      }
1411  
1412      /**
# Line 1177 | Line 1415 | public class LinkedBlockingDequeTest ext
1415       */
1416      public void testTimedPollWithOfferLast() throws InterruptedException {
1417          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1418 <        Thread t = new Thread(new CheckedRunnable() {
1418 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1419 >        Thread t = newStartedThread(new CheckedRunnable() {
1420              public void realRun() throws InterruptedException {
1421 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1421 >                long startTime = System.nanoTime();
1422 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1423 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1424 >
1425 >                barrier.await();
1426 >
1427                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1428 +
1429 +                Thread.currentThread().interrupt();
1430 +                try {
1431 +                    q.poll(randomTimeout(), randomTimeUnit());
1432 +                    shouldThrow();
1433 +                } catch (InterruptedException success) {}
1434 +                assertFalse(Thread.interrupted());
1435 +
1436 +                barrier.await();
1437                  try {
1438                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1439                      shouldThrow();
1440                  } catch (InterruptedException success) {}
1441 +                assertFalse(Thread.interrupted());
1442 +
1443 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1444              }});
1445  
1446 <        t.start();
1447 <        Thread.sleep(SMALL_DELAY_MS);
1448 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1446 >        barrier.await();
1447 >        long startTime = System.nanoTime();
1448 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1449 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1450 >
1451 >        barrier.await();
1452 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1453          t.interrupt();
1454 <        t.join();
1454 >        awaitTermination(t);
1455      }
1456  
1197
1457      /**
1458       * element returns next element, or throws NSEE if empty
1459       */
# Line 1211 | Line 1470 | public class LinkedBlockingDequeTest ext
1470      }
1471  
1472      /**
1214     * remove(x) removes x and returns true if present
1215     */
1216    public void testRemoveElement() {
1217        LinkedBlockingDeque q = populatedDeque(SIZE);
1218        for (int i = 1; i < SIZE; i+=2) {
1219            assertTrue(q.contains(i));
1220            assertTrue(q.remove(i));
1221            assertFalse(q.contains(i));
1222            assertTrue(q.contains(i-1));
1223        }
1224        for (int i = 0; i < SIZE; i+=2) {
1225            assertTrue(q.contains(i));
1226            assertTrue(q.remove(i));
1227            assertFalse(q.contains(i));
1228            assertFalse(q.remove(i+1));
1229            assertFalse(q.contains(i+1));
1230        }
1231        assertTrue(q.isEmpty());
1232    }
1233
1234    /**
1473       * contains(x) reports true when elements added but not yet removed
1474       */
1475      public void testContains() {
# Line 1287 | Line 1525 | public class LinkedBlockingDequeTest ext
1525                  assertTrue(changed);
1526  
1527              assertTrue(q.containsAll(p));
1528 <            assertEquals(SIZE-i, q.size());
1528 >            assertEquals(SIZE - i, q.size());
1529              p.remove();
1530          }
1531      }
# Line 1300 | Line 1538 | public class LinkedBlockingDequeTest ext
1538              LinkedBlockingDeque q = populatedDeque(SIZE);
1539              LinkedBlockingDeque p = populatedDeque(i);
1540              assertTrue(q.removeAll(p));
1541 <            assertEquals(SIZE-i, q.size());
1541 >            assertEquals(SIZE - i, q.size());
1542              for (int j = 0; j < i; ++j) {
1543 <                Integer I = (Integer)(p.remove());
1544 <                assertFalse(q.contains(I));
1543 >                Integer x = (Integer)(p.remove());
1544 >                assertFalse(q.contains(x));
1545              }
1546          }
1547      }
# Line 1311 | Line 1549 | public class LinkedBlockingDequeTest ext
1549      /**
1550       * toArray contains all elements in FIFO order
1551       */
1552 <    public void testToArray() throws InterruptedException{
1552 >    public void testToArray() throws InterruptedException {
1553          LinkedBlockingDeque q = populatedDeque(SIZE);
1554 <        Object[] o = q.toArray();
1555 <        for (int i = 0; i < o.length; i++)
1556 <            assertSame(o[i], q.poll());
1554 >        Object[] a = q.toArray();
1555 >        assertSame(Object[].class, a.getClass());
1556 >        for (Object o : a)
1557 >            assertSame(o, q.poll());
1558 >        assertTrue(q.isEmpty());
1559      }
1560  
1561      /**
# Line 1326 | Line 1566 | public class LinkedBlockingDequeTest ext
1566          Integer[] ints = new Integer[SIZE];
1567          Integer[] array = q.toArray(ints);
1568          assertSame(ints, array);
1569 <        for (int i = 0; i < ints.length; i++)
1570 <            assertSame(ints[i], q.remove());
1571 <    }
1332 <
1333 <    /**
1334 <     * toArray(null) throws NullPointerException
1335 <     */
1336 <    public void testToArray_NullArg() {
1337 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1338 <        try {
1339 <            q.toArray(null);
1340 <            shouldThrow();
1341 <        } catch (NullPointerException success) {}
1569 >        for (Integer o : ints)
1570 >            assertSame(o, q.remove());
1571 >        assertTrue(q.isEmpty());
1572      }
1573  
1574      /**
# Line 1352 | Line 1582 | public class LinkedBlockingDequeTest ext
1582          } catch (ArrayStoreException success) {}
1583      }
1584  
1355
1585      /**
1586       * iterator iterates through all elements
1587       */
1588      public void testIterator() throws InterruptedException {
1589          LinkedBlockingDeque q = populatedDeque(SIZE);
1590          Iterator it = q.iterator();
1591 <        while (it.hasNext()) {
1591 >        int i;
1592 >        for (i = 0; it.hasNext(); i++)
1593 >            assertTrue(q.contains(it.next()));
1594 >        assertEquals(i, SIZE);
1595 >        assertIteratorExhausted(it);
1596 >
1597 >        it = q.iterator();
1598 >        for (i = 0; it.hasNext(); i++)
1599              assertEquals(it.next(), q.take());
1600 <        }
1600 >        assertEquals(i, SIZE);
1601 >        assertIteratorExhausted(it);
1602 >    }
1603 >
1604 >    /**
1605 >     * iterator of empty collection has no elements
1606 >     */
1607 >    public void testEmptyIterator() {
1608 >        Deque c = new LinkedBlockingDeque();
1609 >        assertIteratorExhausted(c.iterator());
1610 >        assertIteratorExhausted(c.descendingIterator());
1611      }
1612  
1613      /**
# Line 1383 | Line 1629 | public class LinkedBlockingDequeTest ext
1629          assertFalse(it.hasNext());
1630      }
1631  
1386
1632      /**
1633       * iterator ordering is FIFO
1634       */
# Line 1415 | Line 1660 | public class LinkedBlockingDequeTest ext
1660          assertEquals(0, q.size());
1661      }
1662  
1418
1663      /**
1664       * Descending iterator iterates through all elements
1665       */
# Line 1478 | Line 1722 | public class LinkedBlockingDequeTest ext
1722          }
1723      }
1724  
1481
1725      /**
1726       * toString contains toStrings of elements
1727       */
# Line 1486 | Line 1729 | public class LinkedBlockingDequeTest ext
1729          LinkedBlockingDeque q = populatedDeque(SIZE);
1730          String s = q.toString();
1731          for (int i = 0; i < SIZE; ++i) {
1732 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1732 >            assertTrue(s.contains(String.valueOf(i)));
1733          }
1734      }
1735  
1493
1736      /**
1737       * offer transfers elements across Executor tasks
1738       */
# Line 1498 | Line 1740 | public class LinkedBlockingDequeTest ext
1740          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1741          q.add(one);
1742          q.add(two);
1743 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1744 <        executor.execute(new CheckedRunnable() {
1745 <            public void realRun() throws InterruptedException {
1746 <                assertFalse(q.offer(three));
1747 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1748 <                assertEquals(0, q.remainingCapacity());
1749 <            }});
1750 <
1751 <        executor.execute(new CheckedRunnable() {
1752 <            public void realRun() throws InterruptedException {
1753 <                Thread.sleep(SMALL_DELAY_MS);
1754 <                assertSame(one, q.take());
1755 <            }});
1756 <
1757 <        joinPool(executor);
1743 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1744 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1745 >        try (PoolCleaner cleaner = cleaner(executor)) {
1746 >            executor.execute(new CheckedRunnable() {
1747 >                public void realRun() throws InterruptedException {
1748 >                    assertFalse(q.offer(three));
1749 >                    threadsStarted.await();
1750 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1751 >                    assertEquals(0, q.remainingCapacity());
1752 >                }});
1753 >
1754 >            executor.execute(new CheckedRunnable() {
1755 >                public void realRun() throws InterruptedException {
1756 >                    threadsStarted.await();
1757 >                    assertSame(one, q.take());
1758 >                }});
1759 >        }
1760      }
1761  
1762      /**
1763 <     * poll retrieves elements across Executor threads
1763 >     * timed poll retrieves elements across Executor threads
1764       */
1765      public void testPollInExecutor() {
1766          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1767 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1768 <        executor.execute(new CheckedRunnable() {
1769 <            public void realRun() throws InterruptedException {
1770 <                assertNull(q.poll());
1771 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1772 <                assertTrue(q.isEmpty());
1773 <            }});
1774 <
1775 <        executor.execute(new CheckedRunnable() {
1776 <            public void realRun() throws InterruptedException {
1777 <                Thread.sleep(SMALL_DELAY_MS);
1778 <                q.put(one);
1779 <            }});
1780 <
1781 <        joinPool(executor);
1767 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1768 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1769 >        try (PoolCleaner cleaner = cleaner(executor)) {
1770 >            executor.execute(new CheckedRunnable() {
1771 >                public void realRun() throws InterruptedException {
1772 >                    assertNull(q.poll());
1773 >                    threadsStarted.await();
1774 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1775 >                    checkEmpty(q);
1776 >                }});
1777 >
1778 >            executor.execute(new CheckedRunnable() {
1779 >                public void realRun() throws InterruptedException {
1780 >                    threadsStarted.await();
1781 >                    q.put(one);
1782 >                }});
1783 >        }
1784      }
1785  
1786      /**
1787 <     * A deserialized serialized deque has same elements in same order
1787 >     * A deserialized/reserialized deque has same elements in same order
1788       */
1789      public void testSerialization() throws Exception {
1790 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1791 <
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 <    }
1790 >        Queue x = populatedDeque(SIZE);
1791 >        Queue y = serialClone(x);
1792  
1793 <    /**
1794 <     * drainTo(null) throws NPE
1795 <     */
1796 <    public void testDrainToNull() {
1797 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1798 <        try {
1799 <            q.drainTo(null);
1800 <            shouldThrow();
1801 <        } catch (NullPointerException success) {}
1568 <    }
1569 <
1570 <    /**
1571 <     * drainTo(this) throws IAE
1572 <     */
1573 <    public void testDrainToSelf() {
1574 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1575 <        try {
1576 <            q.drainTo(q);
1577 <            shouldThrow();
1578 <        } catch (IllegalArgumentException success) {}
1793 >        assertNotSame(y, x);
1794 >        assertEquals(x.size(), y.size());
1795 >        assertEquals(x.toString(), y.toString());
1796 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1797 >        while (!x.isEmpty()) {
1798 >            assertFalse(y.isEmpty());
1799 >            assertEquals(x.remove(), y.remove());
1800 >        }
1801 >        assertTrue(y.isEmpty());
1802      }
1803  
1804      /**
# Line 1585 | Line 1808 | public class LinkedBlockingDequeTest ext
1808          LinkedBlockingDeque q = populatedDeque(SIZE);
1809          ArrayList l = new ArrayList();
1810          q.drainTo(l);
1811 <        assertEquals(q.size(), 0);
1812 <        assertEquals(l.size(), SIZE);
1811 >        assertEquals(0, q.size());
1812 >        assertEquals(SIZE, l.size());
1813          for (int i = 0; i < SIZE; ++i)
1814              assertEquals(l.get(i), new Integer(i));
1815          q.add(zero);
# Line 1596 | Line 1819 | public class LinkedBlockingDequeTest ext
1819          assertTrue(q.contains(one));
1820          l.clear();
1821          q.drainTo(l);
1822 <        assertEquals(q.size(), 0);
1823 <        assertEquals(l.size(), 2);
1822 >        assertEquals(0, q.size());
1823 >        assertEquals(2, l.size());
1824          for (int i = 0; i < 2; ++i)
1825              assertEquals(l.get(i), new Integer(i));
1826      }
# Line 1609 | Line 1832 | public class LinkedBlockingDequeTest ext
1832          final LinkedBlockingDeque q = populatedDeque(SIZE);
1833          Thread t = new Thread(new CheckedRunnable() {
1834              public void realRun() throws InterruptedException {
1835 <                q.put(new Integer(SIZE+1));
1835 >                q.put(new Integer(SIZE + 1));
1836              }});
1837  
1838          t.start();
# Line 1623 | Line 1846 | public class LinkedBlockingDequeTest ext
1846      }
1847  
1848      /**
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    /**
1849       * drainTo(c, n) empties first min(n, size) elements of queue into c
1850       */
1851      public void testDrainToN() {
# Line 1655 | Line 1856 | public class LinkedBlockingDequeTest ext
1856              ArrayList l = new ArrayList();
1857              q.drainTo(l, i);
1858              int k = (i < SIZE) ? i : SIZE;
1859 <            assertEquals(l.size(), k);
1860 <            assertEquals(q.size(), SIZE-k);
1859 >            assertEquals(k, l.size());
1860 >            assertEquals(SIZE - k, q.size());
1861              for (int j = 0; j < k; ++j)
1862                  assertEquals(l.get(j), new Integer(j));
1863 <            while (q.poll() != null) ;
1863 >            do {} while (q.poll() != null);
1864 >        }
1865 >    }
1866 >
1867 >    /**
1868 >     * remove(null), contains(null) always return false
1869 >     */
1870 >    public void testNeverContainsNull() {
1871 >        Deque<?>[] qs = {
1872 >            new LinkedBlockingDeque<Object>(),
1873 >            populatedDeque(2),
1874 >        };
1875 >
1876 >        for (Deque<?> q : qs) {
1877 >            assertFalse(q.contains(null));
1878 >            assertFalse(q.remove(null));
1879 >            assertFalse(q.removeFirstOccurrence(null));
1880 >            assertFalse(q.removeLastOccurrence(null));
1881          }
1882      }
1883  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines