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.34 by jsr166, Sun Nov 28 08:43:53 2010 UTC vs.
Revision 1.58 by jsr166, Fri May 15 18:21:19 2015 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() {
# Line 35 | Line 47 | public class LinkedBlockingDequeTest ext
47      }
48  
49      /**
50 <     * Create a deque of given size containing consecutive
50 >     * Returns a new deque of given size containing consecutive
51       * Integers 0 ... n.
52       */
53      private LinkedBlockingDeque<Integer> populatedDeque(int n) {
# Line 80 | Line 92 | public class LinkedBlockingDequeTest ext
92      }
93  
94      /**
95 <     * offer(null) throws NPE
95 >     * offerFirst(null) throws NullPointerException
96       */
97      public void testOfferFirstNull() {
98 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
99          try {
87            LinkedBlockingDeque q = new LinkedBlockingDeque();
100              q.offerFirst(null);
101              shouldThrow();
102          } catch (NullPointerException success) {}
103      }
104  
105      /**
106 +     * offerLast(null) throws NullPointerException
107 +     */
108 +    public void testOfferLastNull() {
109 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
110 +        try {
111 +            q.offerLast(null);
112 +            shouldThrow();
113 +        } catch (NullPointerException success) {}
114 +    }
115 +
116 +    /**
117       * OfferFirst succeeds
118       */
119      public void testOfferFirst() {
# Line 253 | Line 276 | public class LinkedBlockingDequeTest ext
276       */
277      public void testRemoveFirstOccurrence() {
278          LinkedBlockingDeque q = populatedDeque(SIZE);
279 <        for (int i = 1; i < SIZE; i+=2) {
279 >        for (int i = 1; i < SIZE; i += 2) {
280              assertTrue(q.removeFirstOccurrence(new Integer(i)));
281          }
282 <        for (int i = 0; i < SIZE; i+=2) {
282 >        for (int i = 0; i < SIZE; i += 2) {
283              assertTrue(q.removeFirstOccurrence(new Integer(i)));
284              assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
285          }
# Line 268 | Line 291 | public class LinkedBlockingDequeTest ext
291       */
292      public void testRemoveLastOccurrence() {
293          LinkedBlockingDeque q = populatedDeque(SIZE);
294 <        for (int i = 1; i < SIZE; i+=2) {
294 >        for (int i = 1; i < SIZE; i += 2) {
295              assertTrue(q.removeLastOccurrence(new Integer(i)));
296          }
297 <        for (int i = 0; i < SIZE; i+=2) {
297 >        for (int i = 0; i < SIZE; i += 2) {
298              assertTrue(q.removeLastOccurrence(new Integer(i)));
299              assertFalse(q.removeLastOccurrence(new Integer(i+1)));
300          }
# Line 298 | Line 321 | public class LinkedBlockingDequeTest ext
321          assertSame(four, q.peekLast());
322      }
323  
301
324      /**
325       * A new deque has the indicated capacity, or Integer.MAX_VALUE if
326       * none given
# Line 309 | Line 331 | public class LinkedBlockingDequeTest ext
331      }
332  
333      /**
334 <     * Constructor throws IAE if capacity argument nonpositive
334 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
335       */
336      public void testConstructor2() {
337          try {
338 <            LinkedBlockingDeque q = new LinkedBlockingDeque(0);
338 >            new LinkedBlockingDeque(0);
339              shouldThrow();
340          } catch (IllegalArgumentException success) {}
341      }
342  
343      /**
344 <     * Initializing from null Collection throws NPE
344 >     * Initializing from null Collection throws NullPointerException
345       */
346      public void testConstructor3() {
347          try {
348 <            LinkedBlockingDeque q = new LinkedBlockingDeque(null);
348 >            new LinkedBlockingDeque(null);
349              shouldThrow();
350          } catch (NullPointerException success) {}
351      }
352  
353      /**
354 <     * Initializing from Collection of null elements throws NPE
354 >     * Initializing from Collection of null elements throws NullPointerException
355       */
356      public void testConstructor4() {
357 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
358          try {
359 <            Integer[] ints = new Integer[SIZE];
337 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
359 >            new LinkedBlockingDeque(elements);
360              shouldThrow();
361          } catch (NullPointerException success) {}
362      }
363  
364      /**
365 <     * Initializing from Collection with some null elements throws NPE
365 >     * Initializing from Collection with some null elements throws
366 >     * NullPointerException
367       */
368      public void testConstructor5() {
369 +        Integer[] ints = new Integer[SIZE];
370 +        for (int i = 0; i < SIZE-1; ++i)
371 +            ints[i] = i;
372 +        Collection<Integer> elements = Arrays.asList(ints);
373          try {
374 <            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));
374 >            new LinkedBlockingDeque(elements);
375              shouldThrow();
376          } catch (NullPointerException success) {}
377      }
# Line 358 | Line 382 | public class LinkedBlockingDequeTest ext
382      public void testConstructor6() {
383          Integer[] ints = new Integer[SIZE];
384          for (int i = 0; i < SIZE; ++i)
385 <            ints[i] = new Integer(i);
385 >            ints[i] = i;
386          LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
387          for (int i = 0; i < SIZE; ++i)
388              assertEquals(ints[i], q.poll());
# Line 383 | Line 407 | public class LinkedBlockingDequeTest ext
407       * remainingCapacity decreases on add, increases on remove
408       */
409      public void testRemainingCapacity() {
410 <        LinkedBlockingDeque q = populatedDeque(SIZE);
410 >        BlockingQueue q = populatedDeque(SIZE);
411          for (int i = 0; i < SIZE; ++i) {
412              assertEquals(i, q.remainingCapacity());
413 <            assertEquals(SIZE-i, q.size());
414 <            q.remove();
413 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
414 >            assertEquals(i, q.remove());
415          }
416          for (int i = 0; i < SIZE; ++i) {
417              assertEquals(SIZE-i, q.remainingCapacity());
418 <            assertEquals(i, q.size());
419 <            q.add(new Integer(i));
418 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
419 >            assertTrue(q.add(i));
420          }
421      }
422  
423      /**
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    /**
424       * push(null) throws NPE
425       */
426      public void testPushNull() {
427 +        LinkedBlockingDeque q = new LinkedBlockingDeque(1);
428          try {
426            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
429              q.push(null);
430              shouldThrow();
431          } catch (NullPointerException success) {}
# Line 433 | Line 435 | public class LinkedBlockingDequeTest ext
435       * push succeeds if not full; throws ISE if full
436       */
437      public void testPush() {
438 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
439 +        for (int i = 0; i < SIZE; ++i) {
440 +            Integer x = new Integer(i);
441 +            q.push(x);
442 +            assertEquals(x, q.peek());
443 +        }
444 +        assertEquals(0, q.remainingCapacity());
445          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());
446              q.push(new Integer(SIZE));
447              shouldThrow();
448          } catch (IllegalStateException success) {}
# Line 456 | Line 458 | public class LinkedBlockingDequeTest ext
458          assertSame(four, q.peekFirst());
459      }
460  
459
461      /**
462       * pop removes next element, or throws NSEE if empty
463       */
# Line 471 | Line 472 | public class LinkedBlockingDequeTest ext
472          } catch (NoSuchElementException success) {}
473      }
474  
474
475      /**
476       * Offer succeeds if not full; fails if full
477       */
# Line 485 | Line 485 | public class LinkedBlockingDequeTest ext
485       * add succeeds if not full; throws ISE if full
486       */
487      public void testAdd() {
488 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
489 +        for (int i = 0; i < SIZE; ++i)
490 +            assertTrue(q.add(new Integer(i)));
491 +        assertEquals(0, q.remainingCapacity());
492          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());
493              q.add(new Integer(SIZE));
494              shouldThrow();
495          } catch (IllegalStateException success) {}
496      }
497  
498      /**
500     * 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    /**
499       * addAll(this) throws IAE
500       */
501      public void testAddAllSelf() {
502 +        LinkedBlockingDeque q = populatedDeque(SIZE);
503          try {
515            LinkedBlockingDeque q = populatedDeque(SIZE);
504              q.addAll(q);
505              shouldThrow();
506          } catch (IllegalArgumentException success) {}
507      }
508  
509      /**
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    /**
510       * addAll of a collection with any null elements throws NPE after
511       * possibly adding some elements
512       */
513      public void testAddAll3() {
514 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
515 +        Integer[] ints = new Integer[SIZE];
516 +        for (int i = 0; i < SIZE-1; ++i)
517 +            ints[i] = new Integer(i);
518 +        Collection<Integer> elements = Arrays.asList(ints);
519          try {
520 <            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));
520 >            q.addAll(elements);
521              shouldThrow();
522          } catch (NullPointerException success) {}
523      }
524  
525      /**
526 <     * addAll throws ISE if not enough room
526 >     * addAll throws IllegalStateException if not enough room
527       */
528      public void testAddAll4() {
529 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE - 1);
530 +        Integer[] ints = new Integer[SIZE];
531 +        for (int i = 0; i < SIZE; ++i)
532 +            ints[i] = new Integer(i);
533 +        Collection<Integer> elements = Arrays.asList(ints);
534          try {
535 <            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));
535 >            q.addAll(elements);
536              shouldThrow();
537          } catch (IllegalStateException success) {}
538      }
# Line 574 | Line 552 | public class LinkedBlockingDequeTest ext
552              assertEquals(ints[i], q.poll());
553      }
554  
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
555      /**
556       * all elements successfully put are contained
557       */
558      public void testPut() throws InterruptedException {
559          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
560          for (int i = 0; i < SIZE; ++i) {
561 <            Integer I = new Integer(i);
562 <            q.put(I);
563 <            assertTrue(q.contains(I));
561 >            Integer x = new Integer(i);
562 >            q.put(x);
563 >            assertTrue(q.contains(x));
564          }
565          assertEquals(0, q.remainingCapacity());
566      }
# Line 604 | Line 570 | public class LinkedBlockingDequeTest ext
570       */
571      public void testBlockingPut() throws InterruptedException {
572          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
573 <        Thread t = new Thread(new CheckedRunnable() {
573 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
574 >        Thread t = newStartedThread(new CheckedRunnable() {
575              public void realRun() throws InterruptedException {
576                  for (int i = 0; i < SIZE; ++i)
577                      q.put(i);
578                  assertEquals(SIZE, q.size());
579                  assertEquals(0, q.remainingCapacity());
580 +
581 +                Thread.currentThread().interrupt();
582                  try {
583                      q.put(99);
584                      shouldThrow();
585                  } catch (InterruptedException success) {}
586 +                assertFalse(Thread.interrupted());
587 +
588 +                pleaseInterrupt.countDown();
589 +                try {
590 +                    q.put(99);
591 +                    shouldThrow();
592 +                } catch (InterruptedException success) {}
593 +                assertFalse(Thread.interrupted());
594              }});
595  
596 <        t.start();
597 <        Thread.sleep(SHORT_DELAY_MS);
596 >        await(pleaseInterrupt);
597 >        assertThreadStaysAlive(t);
598          t.interrupt();
599 <        t.join();
599 >        awaitTermination(t);
600          assertEquals(SIZE, q.size());
601          assertEquals(0, q.remainingCapacity());
602      }
603  
604      /**
605 <     * put blocks waiting for take when full
605 >     * put blocks interruptibly waiting for take when full
606       */
607      public void testPutWithTake() throws InterruptedException {
608          final int capacity = 2;
609          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
610 <        Thread t = new Thread(new CheckedRunnable() {
610 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
611 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
612 >        Thread t = newStartedThread(new CheckedRunnable() {
613              public void realRun() throws InterruptedException {
614 <                for (int i = 0; i < capacity + 1; i++)
614 >                for (int i = 0; i < capacity; i++)
615                      q.put(i);
616 +                pleaseTake.countDown();
617 +                q.put(86);
618 +
619 +                pleaseInterrupt.countDown();
620                  try {
621                      q.put(99);
622                      shouldThrow();
623                  } catch (InterruptedException success) {}
624 +                assertFalse(Thread.interrupted());
625              }});
626  
627 <        t.start();
628 <        Thread.sleep(SHORT_DELAY_MS);
645 <        assertEquals(q.remainingCapacity(), 0);
627 >        await(pleaseTake);
628 >        assertEquals(0, q.remainingCapacity());
629          assertEquals(0, q.take());
630 <        Thread.sleep(SHORT_DELAY_MS);
630 >
631 >        await(pleaseInterrupt);
632 >        assertThreadStaysAlive(t);
633          t.interrupt();
634 <        t.join();
635 <        assertEquals(q.remainingCapacity(), 0);
634 >        awaitTermination(t);
635 >        assertEquals(0, q.remainingCapacity());
636      }
637  
638      /**
# Line 655 | Line 640 | public class LinkedBlockingDequeTest ext
640       */
641      public void testTimedOffer() throws InterruptedException {
642          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
643 <        Thread t = new Thread(new CheckedRunnable() {
643 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
644 >        Thread t = newStartedThread(new CheckedRunnable() {
645              public void realRun() throws InterruptedException {
646                  q.put(new Object());
647                  q.put(new Object());
648 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
648 >                long startTime = System.nanoTime();
649 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
650 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
651 >                pleaseInterrupt.countDown();
652                  try {
653 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
653 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
654                      shouldThrow();
655                  } catch (InterruptedException success) {}
656              }});
657  
658 <        t.start();
659 <        Thread.sleep(SMALL_DELAY_MS);
658 >        await(pleaseInterrupt);
659 >        assertThreadStaysAlive(t);
660          t.interrupt();
661 <        t.join();
661 >        awaitTermination(t);
662      }
663  
664      /**
# Line 683 | Line 672 | public class LinkedBlockingDequeTest ext
672      }
673  
674      /**
675 <     * Take removes existing elements until empty, then blocks interruptibly
675 >     * take removes existing elements until empty, then blocks interruptibly
676       */
677      public void testBlockingTake() throws InterruptedException {
678          final LinkedBlockingDeque q = populatedDeque(SIZE);
679 <        Thread t = new Thread(new CheckedRunnable() {
679 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
680 >        Thread t = newStartedThread(new CheckedRunnable() {
681              public void realRun() throws InterruptedException {
682                  for (int i = 0; i < SIZE; ++i) {
683                      assertEquals(i, q.take());
684                  }
685 +
686 +                Thread.currentThread().interrupt();
687 +                try {
688 +                    q.take();
689 +                    shouldThrow();
690 +                } catch (InterruptedException success) {}
691 +                assertFalse(Thread.interrupted());
692 +
693 +                pleaseInterrupt.countDown();
694                  try {
695                      q.take();
696                      shouldThrow();
697                  } catch (InterruptedException success) {}
698 +                assertFalse(Thread.interrupted());
699              }});
700  
701 <        t.start();
702 <        Thread.sleep(SHORT_DELAY_MS);
701 >        await(pleaseInterrupt);
702 >        assertThreadStaysAlive(t);
703          t.interrupt();
704 <        t.join();
704 >        awaitTermination(t);
705      }
706  
707
707      /**
708       * poll succeeds unless empty
709       */
# Line 733 | Line 732 | public class LinkedBlockingDequeTest ext
732      public void testTimedPoll() throws InterruptedException {
733          LinkedBlockingDeque q = populatedDeque(SIZE);
734          for (int i = 0; i < SIZE; ++i) {
735 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
736 <        }
737 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
735 >            long startTime = System.nanoTime();
736 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
737 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
738 >        }
739 >        long startTime = System.nanoTime();
740 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
741 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
742 >        checkEmpty(q);
743      }
744  
745      /**
# Line 772 | Line 776 | public class LinkedBlockingDequeTest ext
776      /**
777       * putFirst(null) throws NPE
778       */
779 <     public void testPutFirstNull() throws InterruptedException {
779 >    public void testPutFirstNull() throws InterruptedException {
780 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
781          try {
777            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
782              q.putFirst(null);
783              shouldThrow();
784          } catch (NullPointerException success) {}
785 <     }
785 >    }
786  
787      /**
788       * all elements successfully putFirst are contained
789       */
790 <     public void testPutFirst() throws InterruptedException {
791 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
792 <         for (int i = 0; i < SIZE; ++i) {
793 <             Integer I = new Integer(i);
794 <             q.putFirst(I);
795 <             assertTrue(q.contains(I));
796 <         }
797 <         assertEquals(0, q.remainingCapacity());
790 >    public void testPutFirst() throws InterruptedException {
791 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
792 >        for (int i = 0; i < SIZE; ++i) {
793 >            Integer x = new Integer(i);
794 >            q.putFirst(x);
795 >            assertTrue(q.contains(x));
796 >        }
797 >        assertEquals(0, q.remainingCapacity());
798      }
799  
800      /**
# Line 798 | Line 802 | public class LinkedBlockingDequeTest ext
802       */
803      public void testBlockingPutFirst() throws InterruptedException {
804          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
805 <        Thread t = new Thread(new CheckedRunnable() {
805 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
806 >        Thread t = newStartedThread(new CheckedRunnable() {
807              public void realRun() throws InterruptedException {
808                  for (int i = 0; i < SIZE; ++i)
809                      q.putFirst(i);
810                  assertEquals(SIZE, q.size());
811                  assertEquals(0, q.remainingCapacity());
812 +
813 +                Thread.currentThread().interrupt();
814 +                try {
815 +                    q.putFirst(99);
816 +                    shouldThrow();
817 +                } catch (InterruptedException success) {}
818 +                assertFalse(Thread.interrupted());
819 +
820 +                pleaseInterrupt.countDown();
821                  try {
822                      q.putFirst(99);
823                      shouldThrow();
824                  } catch (InterruptedException success) {}
825 +                assertFalse(Thread.interrupted());
826              }});
827  
828 <        t.start();
829 <        Thread.sleep(SHORT_DELAY_MS);
828 >        await(pleaseInterrupt);
829 >        assertThreadStaysAlive(t);
830          t.interrupt();
831 <        t.join();
831 >        awaitTermination(t);
832          assertEquals(SIZE, q.size());
833          assertEquals(0, q.remainingCapacity());
834      }
835  
836      /**
837 <     * putFirst blocks waiting for take when full
837 >     * putFirst blocks interruptibly waiting for take when full
838       */
839      public void testPutFirstWithTake() throws InterruptedException {
840          final int capacity = 2;
841          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
842 <        Thread t = new Thread(new CheckedRunnable() {
842 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
843 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
844 >        Thread t = newStartedThread(new CheckedRunnable() {
845              public void realRun() throws InterruptedException {
846 <                for (int i = 0; i < capacity + 1; i++)
846 >                for (int i = 0; i < capacity; i++)
847                      q.putFirst(i);
848 +                pleaseTake.countDown();
849 +                q.putFirst(86);
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);
839 <        assertEquals(q.remainingCapacity(), 0);
859 >        await(pleaseTake);
860 >        assertEquals(0, q.remainingCapacity());
861          assertEquals(capacity - 1, q.take());
862 <        Thread.sleep(SHORT_DELAY_MS);
862 >
863 >        await(pleaseInterrupt);
864 >        assertThreadStaysAlive(t);
865          t.interrupt();
866 <        t.join();
867 <        assertEquals(q.remainingCapacity(), 0);
866 >        awaitTermination(t);
867 >        assertEquals(0, q.remainingCapacity());
868      }
869  
870      /**
# Line 849 | Line 872 | public class LinkedBlockingDequeTest ext
872       */
873      public void testTimedOfferFirst() throws InterruptedException {
874          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
875 <        Thread t = new Thread(new CheckedRunnable() {
875 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
876 >        Thread t = newStartedThread(new CheckedRunnable() {
877              public void realRun() throws InterruptedException {
878                  q.putFirst(new Object());
879                  q.putFirst(new Object());
880 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
880 >                long startTime = System.nanoTime();
881 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
882 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
883 >                pleaseInterrupt.countDown();
884                  try {
885 <                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
885 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
886                      shouldThrow();
887                  } catch (InterruptedException success) {}
888              }});
889  
890 <        t.start();
891 <        Thread.sleep(SMALL_DELAY_MS);
890 >        await(pleaseInterrupt);
891 >        assertThreadStaysAlive(t);
892          t.interrupt();
893 <        t.join();
893 >        awaitTermination(t);
894      }
895  
896      /**
# Line 877 | Line 904 | public class LinkedBlockingDequeTest ext
904      }
905  
906      /**
907 <     * takeFirst blocks interruptibly when empty
907 >     * takeFirst() blocks interruptibly when empty
908       */
909 <    public void testTakeFirstFromEmpty() throws InterruptedException {
910 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
911 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
912 <            public void realRun() throws InterruptedException {
913 <                q.takeFirst();
914 <            }};
909 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
910 >        final BlockingDeque q = new LinkedBlockingDeque();
911 >        final CountDownLatch threadStarted = new CountDownLatch(1);
912 >        Thread t = newStartedThread(new CheckedRunnable() {
913 >            public void realRun() {
914 >                threadStarted.countDown();
915 >                try {
916 >                    q.takeFirst();
917 >                    shouldThrow();
918 >                } catch (InterruptedException success) {}
919 >                assertFalse(Thread.interrupted());
920 >            }});
921  
922 <        t.start();
923 <        Thread.sleep(SHORT_DELAY_MS);
922 >        await(threadStarted);
923 >        assertThreadStaysAlive(t);
924          t.interrupt();
925 <        t.join();
925 >        awaitTermination(t);
926 >    }
927 >
928 >    /**
929 >     * takeFirst() throws InterruptedException immediately if interrupted
930 >     * before waiting
931 >     */
932 >    public void testTakeFirstFromEmptyAfterInterrupt() {
933 >        final BlockingDeque q = new LinkedBlockingDeque();
934 >        Thread t = newStartedThread(new CheckedRunnable() {
935 >            public void realRun() {
936 >                Thread.currentThread().interrupt();
937 >                try {
938 >                    q.takeFirst();
939 >                    shouldThrow();
940 >                } catch (InterruptedException success) {}
941 >                assertFalse(Thread.interrupted());
942 >            }});
943 >
944 >        awaitTermination(t);
945 >    }
946 >
947 >    /**
948 >     * takeLast() blocks interruptibly when empty
949 >     */
950 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
951 >        final BlockingDeque q = new LinkedBlockingDeque();
952 >        final CountDownLatch threadStarted = new CountDownLatch(1);
953 >        Thread t = newStartedThread(new CheckedRunnable() {
954 >            public void realRun() {
955 >                threadStarted.countDown();
956 >                try {
957 >                    q.takeLast();
958 >                    shouldThrow();
959 >                } catch (InterruptedException success) {}
960 >                assertFalse(Thread.interrupted());
961 >            }});
962 >
963 >        await(threadStarted);
964 >        assertThreadStaysAlive(t);
965 >        t.interrupt();
966 >        awaitTermination(t);
967      }
968  
969      /**
970 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
970 >     * takeLast() throws InterruptedException immediately if interrupted
971 >     * before waiting
972 >     */
973 >    public void testTakeLastFromEmptyAfterInterrupt() {
974 >        final BlockingDeque q = new LinkedBlockingDeque();
975 >        Thread t = newStartedThread(new CheckedRunnable() {
976 >            public void realRun() {
977 >                Thread.currentThread().interrupt();
978 >                try {
979 >                    q.takeLast();
980 >                    shouldThrow();
981 >                } catch (InterruptedException success) {}
982 >                assertFalse(Thread.interrupted());
983 >            }});
984 >
985 >        awaitTermination(t);
986 >    }
987 >
988 >    /**
989 >     * takeFirst removes existing elements until empty, then blocks interruptibly
990       */
991      public void testBlockingTakeFirst() throws InterruptedException {
992          final LinkedBlockingDeque q = populatedDeque(SIZE);
993 <        Thread t = new Thread(new CheckedRunnable() {
993 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
994 >        Thread t = newStartedThread(new CheckedRunnable() {
995              public void realRun() throws InterruptedException {
996 <                for (int i = 0; i < SIZE; ++i)
996 >                for (int i = 0; i < SIZE; ++i) {
997                      assertEquals(i, q.takeFirst());
998 +                }
999 +
1000 +                Thread.currentThread().interrupt();
1001 +                try {
1002 +                    q.takeFirst();
1003 +                    shouldThrow();
1004 +                } catch (InterruptedException success) {}
1005 +                assertFalse(Thread.interrupted());
1006 +
1007 +                pleaseInterrupt.countDown();
1008                  try {
1009                      q.takeFirst();
1010                      shouldThrow();
1011                  } catch (InterruptedException success) {}
1012 +                assertFalse(Thread.interrupted());
1013              }});
1014  
1015 <        t.start();
1016 <        Thread.sleep(SHORT_DELAY_MS);
1015 >        await(pleaseInterrupt);
1016 >        assertThreadStaysAlive(t);
1017          t.interrupt();
1018 <        t.join();
1018 >        awaitTermination(t);
1019      }
1020  
916
1021      /**
1022       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1023       */
# Line 931 | Line 1035 | public class LinkedBlockingDequeTest ext
1035      public void testTimedPollFirst() throws InterruptedException {
1036          LinkedBlockingDeque q = populatedDeque(SIZE);
1037          for (int i = 0; i < SIZE; ++i) {
1038 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1039 <        }
1040 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1038 >            long startTime = System.nanoTime();
1039 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1040 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1041 >        }
1042 >        long startTime = System.nanoTime();
1043 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1044 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1045 >        checkEmpty(q);
1046      }
1047  
1048      /**
# Line 941 | Line 1050 | public class LinkedBlockingDequeTest ext
1050       * returning timeout status
1051       */
1052      public void testInterruptedTimedPollFirst() throws InterruptedException {
1053 <        Thread t = new Thread(new CheckedRunnable() {
1053 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1054 >        Thread t = newStartedThread(new CheckedRunnable() {
1055              public void realRun() throws InterruptedException {
1056                  LinkedBlockingDeque q = populatedDeque(SIZE);
1057                  for (int i = 0; i < SIZE; ++i) {
1058 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1058 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1059                  }
1060 +
1061 +                Thread.currentThread().interrupt();
1062                  try {
1063                      q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1064                      shouldThrow();
1065                  } catch (InterruptedException success) {}
1066 +                assertFalse(Thread.interrupted());
1067 +
1068 +                pleaseInterrupt.countDown();
1069 +                try {
1070 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1071 +                    shouldThrow();
1072 +                } catch (InterruptedException success) {}
1073 +                assertFalse(Thread.interrupted());
1074              }});
1075  
1076 <        t.start();
1077 <        Thread.sleep(SHORT_DELAY_MS);
1076 >        await(pleaseInterrupt);
1077 >        assertThreadStaysAlive(t);
1078          t.interrupt();
1079 <        t.join();
1079 >        awaitTermination(t);
1080      }
1081  
1082      /**
# Line 965 | Line 1085 | public class LinkedBlockingDequeTest ext
1085       */
1086      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1087          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1088 <        Thread t = new Thread(new CheckedRunnable() {
1088 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1089 >        Thread t = newStartedThread(new CheckedRunnable() {
1090              public void realRun() throws InterruptedException {
1091 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1091 >                long startTime = System.nanoTime();
1092 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1093 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1094 >
1095 >                barrier.await();
1096 >
1097                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1098 +
1099 +                Thread.currentThread().interrupt();
1100 +                try {
1101 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1102 +                    shouldThrow();
1103 +                } catch (InterruptedException success) {}
1104 +
1105 +                barrier.await();
1106                  try {
1107                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1108                      shouldThrow();
1109                  } catch (InterruptedException success) {}
1110 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1111              }});
1112  
1113 <        t.start();
1114 <        Thread.sleep(SMALL_DELAY_MS);
1115 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1113 >        barrier.await();
1114 >        long startTime = System.nanoTime();
1115 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1116 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1117 >        barrier.await();
1118 >        assertThreadStaysAlive(t);
1119          t.interrupt();
1120 <        t.join();
1120 >        awaitTermination(t);
1121      }
1122  
1123      /**
1124       * putLast(null) throws NPE
1125       */
1126 <     public void testPutLastNull() throws InterruptedException {
1126 >    public void testPutLastNull() throws InterruptedException {
1127 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1128          try {
990            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1129              q.putLast(null);
1130              shouldThrow();
1131          } catch (NullPointerException success) {}
1132 <     }
1132 >    }
1133  
1134      /**
1135       * all elements successfully putLast are contained
1136       */
1137 <     public void testPutLast() throws InterruptedException {
1138 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1139 <         for (int i = 0; i < SIZE; ++i) {
1140 <             Integer I = new Integer(i);
1141 <             q.putLast(I);
1142 <             assertTrue(q.contains(I));
1143 <         }
1144 <         assertEquals(0, q.remainingCapacity());
1137 >    public void testPutLast() throws InterruptedException {
1138 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1139 >        for (int i = 0; i < SIZE; ++i) {
1140 >            Integer x = new Integer(i);
1141 >            q.putLast(x);
1142 >            assertTrue(q.contains(x));
1143 >        }
1144 >        assertEquals(0, q.remainingCapacity());
1145      }
1146  
1147      /**
# Line 1011 | Line 1149 | public class LinkedBlockingDequeTest ext
1149       */
1150      public void testBlockingPutLast() throws InterruptedException {
1151          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1152 <        Thread t = new Thread(new CheckedRunnable() {
1152 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1153 >        Thread t = newStartedThread(new CheckedRunnable() {
1154              public void realRun() throws InterruptedException {
1155                  for (int i = 0; i < SIZE; ++i)
1156                      q.putLast(i);
1157                  assertEquals(SIZE, q.size());
1158                  assertEquals(0, q.remainingCapacity());
1159 +
1160 +                Thread.currentThread().interrupt();
1161                  try {
1162                      q.putLast(99);
1163                      shouldThrow();
1164                  } catch (InterruptedException success) {}
1165 +                assertFalse(Thread.interrupted());
1166 +
1167 +                pleaseInterrupt.countDown();
1168 +                try {
1169 +                    q.putLast(99);
1170 +                    shouldThrow();
1171 +                } catch (InterruptedException success) {}
1172 +                assertFalse(Thread.interrupted());
1173              }});
1174  
1175 <        t.start();
1176 <        Thread.sleep(SHORT_DELAY_MS);
1175 >        await(pleaseInterrupt);
1176 >        assertThreadStaysAlive(t);
1177          t.interrupt();
1178 <        t.join();
1178 >        awaitTermination(t);
1179          assertEquals(SIZE, q.size());
1180          assertEquals(0, q.remainingCapacity());
1181      }
1182  
1183      /**
1184 <     * putLast blocks waiting for take when full
1184 >     * putLast blocks interruptibly waiting for take when full
1185       */
1186      public void testPutLastWithTake() throws InterruptedException {
1187          final int capacity = 2;
1188          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1189 <        Thread t = new Thread(new CheckedRunnable() {
1189 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1190 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1191 >        Thread t = newStartedThread(new CheckedRunnable() {
1192              public void realRun() throws InterruptedException {
1193 <                for (int i = 0; i < capacity + 1; i++)
1193 >                for (int i = 0; i < capacity; i++)
1194                      q.putLast(i);
1195 +                pleaseTake.countDown();
1196 +                q.putLast(86);
1197 +
1198 +                pleaseInterrupt.countDown();
1199                  try {
1200                      q.putLast(99);
1201                      shouldThrow();
1202                  } catch (InterruptedException success) {}
1203 +                assertFalse(Thread.interrupted());
1204              }});
1205  
1206 <        t.start();
1207 <        Thread.sleep(SHORT_DELAY_MS);
1052 <        assertEquals(q.remainingCapacity(), 0);
1206 >        await(pleaseTake);
1207 >        assertEquals(0, q.remainingCapacity());
1208          assertEquals(0, q.take());
1209 <        Thread.sleep(SHORT_DELAY_MS);
1209 >
1210 >        await(pleaseInterrupt);
1211 >        assertThreadStaysAlive(t);
1212          t.interrupt();
1213 <        t.join();
1214 <        assertEquals(q.remainingCapacity(), 0);
1213 >        awaitTermination(t);
1214 >        assertEquals(0, q.remainingCapacity());
1215      }
1216  
1217      /**
# Line 1062 | Line 1219 | public class LinkedBlockingDequeTest ext
1219       */
1220      public void testTimedOfferLast() throws InterruptedException {
1221          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1222 <        Thread t = new Thread(new CheckedRunnable() {
1222 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1223 >        Thread t = newStartedThread(new CheckedRunnable() {
1224              public void realRun() throws InterruptedException {
1225                  q.putLast(new Object());
1226                  q.putLast(new Object());
1227 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1227 >                long startTime = System.nanoTime();
1228 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1229 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1230 >                pleaseInterrupt.countDown();
1231                  try {
1232 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1232 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1233                      shouldThrow();
1234                  } catch (InterruptedException success) {}
1235              }});
1236  
1237 <        t.start();
1238 <        Thread.sleep(SMALL_DELAY_MS);
1237 >        await(pleaseInterrupt);
1238 >        assertThreadStaysAlive(t);
1239          t.interrupt();
1240 <        t.join();
1240 >        awaitTermination(t);
1241      }
1242  
1243      /**
# Line 1090 | Line 1251 | public class LinkedBlockingDequeTest ext
1251      }
1252  
1253      /**
1254 <     * 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
1254 >     * takeLast removes existing elements until empty, then blocks interruptibly
1255       */
1256      public void testBlockingTakeLast() throws InterruptedException {
1257          final LinkedBlockingDeque q = populatedDeque(SIZE);
1258 <        Thread t = new Thread(new CheckedRunnable() {
1258 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1259 >        Thread t = newStartedThread(new CheckedRunnable() {
1260              public void realRun() throws InterruptedException {
1261 <                for (int i = 0; i < SIZE; ++i)
1262 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1261 >                for (int i = 0; i < SIZE; ++i) {
1262 >                    assertEquals(SIZE-i-1, q.takeLast());
1263 >                }
1264 >
1265 >                Thread.currentThread().interrupt();
1266                  try {
1267                      q.takeLast();
1268                      shouldThrow();
1269                  } catch (InterruptedException success) {}
1270 +                assertFalse(Thread.interrupted());
1271 +
1272 +                pleaseInterrupt.countDown();
1273 +                try {
1274 +                    q.takeLast();
1275 +                    shouldThrow();
1276 +                } catch (InterruptedException success) {}
1277 +                assertFalse(Thread.interrupted());
1278              }});
1279  
1280 <        t.start();
1281 <        Thread.sleep(SHORT_DELAY_MS);
1280 >        await(pleaseInterrupt);
1281 >        assertThreadStaysAlive(t);
1282          t.interrupt();
1283 <        t.join();
1283 >        awaitTermination(t);
1284      }
1285  
1286      /**
# Line 1143 | Line 1300 | public class LinkedBlockingDequeTest ext
1300      public void testTimedPollLast() throws InterruptedException {
1301          LinkedBlockingDeque q = populatedDeque(SIZE);
1302          for (int i = 0; i < SIZE; ++i) {
1303 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1304 <        }
1305 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1303 >            long startTime = System.nanoTime();
1304 >            assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1305 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1306 >        }
1307 >        long startTime = System.nanoTime();
1308 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1309 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1310 >        checkEmpty(q);
1311      }
1312  
1313      /**
# Line 1153 | Line 1315 | public class LinkedBlockingDequeTest ext
1315       * returning timeout status
1316       */
1317      public void testInterruptedTimedPollLast() throws InterruptedException {
1318 <        Thread t = new Thread(new CheckedRunnable() {
1318 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1319 >        Thread t = newStartedThread(new CheckedRunnable() {
1320              public void realRun() throws InterruptedException {
1321                  LinkedBlockingDeque q = populatedDeque(SIZE);
1322                  for (int i = 0; i < SIZE; ++i) {
1323 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1323 >                    assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1324                  }
1325 +
1326 +                Thread.currentThread().interrupt();
1327                  try {
1328 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1328 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1329                      shouldThrow();
1330                  } catch (InterruptedException success) {}
1331 +                assertFalse(Thread.interrupted());
1332 +
1333 +                pleaseInterrupt.countDown();
1334 +                try {
1335 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
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 >        assertThreadStaysAlive(t);
1343          t.interrupt();
1344 <        t.join();
1344 >        awaitTermination(t);
1345      }
1346  
1347      /**
# Line 1177 | Line 1350 | public class LinkedBlockingDequeTest ext
1350       */
1351      public void testTimedPollWithOfferLast() throws InterruptedException {
1352          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1353 <        Thread t = new Thread(new CheckedRunnable() {
1353 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1354 >        Thread t = newStartedThread(new CheckedRunnable() {
1355              public void realRun() throws InterruptedException {
1356 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1356 >                long startTime = System.nanoTime();
1357 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1358 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1359 >
1360 >                barrier.await();
1361 >
1362                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1363 +
1364 +                Thread.currentThread().interrupt();
1365                  try {
1366                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1367                      shouldThrow();
1368                  } catch (InterruptedException success) {}
1369 +                assertFalse(Thread.interrupted());
1370 +
1371 +                barrier.await();
1372 +                try {
1373 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1374 +                    shouldThrow();
1375 +                } catch (InterruptedException success) {}
1376 +                assertFalse(Thread.interrupted());
1377              }});
1378  
1379 <        t.start();
1380 <        Thread.sleep(SMALL_DELAY_MS);
1381 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1379 >        barrier.await();
1380 >        long startTime = System.nanoTime();
1381 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1382 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1383 >
1384 >        barrier.await();
1385 >        assertThreadStaysAlive(t);
1386          t.interrupt();
1387 <        t.join();
1387 >        awaitTermination(t);
1388      }
1389  
1197
1390      /**
1391       * element returns next element, or throws NSEE if empty
1392       */
# Line 1211 | Line 1403 | public class LinkedBlockingDequeTest ext
1403      }
1404  
1405      /**
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    /**
1406       * contains(x) reports true when elements added but not yet removed
1407       */
1408      public void testContains() {
# Line 1302 | Line 1473 | public class LinkedBlockingDequeTest ext
1473              assertTrue(q.removeAll(p));
1474              assertEquals(SIZE-i, q.size());
1475              for (int j = 0; j < i; ++j) {
1476 <                Integer I = (Integer)(p.remove());
1477 <                assertFalse(q.contains(I));
1476 >                Integer x = (Integer)(p.remove());
1477 >                assertFalse(q.contains(x));
1478              }
1479          }
1480      }
# Line 1311 | Line 1482 | public class LinkedBlockingDequeTest ext
1482      /**
1483       * toArray contains all elements in FIFO order
1484       */
1485 <    public void testToArray() throws InterruptedException{
1485 >    public void testToArray() throws InterruptedException {
1486          LinkedBlockingDeque q = populatedDeque(SIZE);
1487          Object[] o = q.toArray();
1488          for (int i = 0; i < o.length; i++)
# Line 1331 | Line 1502 | public class LinkedBlockingDequeTest ext
1502      }
1503  
1504      /**
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) {}
1342    }
1343
1344    /**
1505       * toArray(incompatible array type) throws ArrayStoreException
1506       */
1507      public void testToArray1_BadArg() {
# Line 1352 | Line 1512 | public class LinkedBlockingDequeTest ext
1512          } catch (ArrayStoreException success) {}
1513      }
1514  
1355
1515      /**
1516       * iterator iterates through all elements
1517       */
1518      public void testIterator() throws InterruptedException {
1519          LinkedBlockingDeque q = populatedDeque(SIZE);
1520          Iterator it = q.iterator();
1521 <        while (it.hasNext()) {
1521 >        int i;
1522 >        for (i = 0; it.hasNext(); i++)
1523 >            assertTrue(q.contains(it.next()));
1524 >        assertEquals(i, SIZE);
1525 >        assertIteratorExhausted(it);
1526 >
1527 >        it = q.iterator();
1528 >        for (i = 0; it.hasNext(); i++)
1529              assertEquals(it.next(), q.take());
1530 <        }
1530 >        assertEquals(i, SIZE);
1531 >        assertIteratorExhausted(it);
1532 >    }
1533 >
1534 >    /**
1535 >     * iterator of empty collection has no elements
1536 >     */
1537 >    public void testEmptyIterator() {
1538 >        Deque c = new LinkedBlockingDeque();
1539 >        assertIteratorExhausted(c.iterator());
1540 >        assertIteratorExhausted(c.descendingIterator());
1541      }
1542  
1543      /**
# Line 1383 | Line 1559 | public class LinkedBlockingDequeTest ext
1559          assertFalse(it.hasNext());
1560      }
1561  
1386
1562      /**
1563       * iterator ordering is FIFO
1564       */
# Line 1415 | Line 1590 | public class LinkedBlockingDequeTest ext
1590          assertEquals(0, q.size());
1591      }
1592  
1418
1593      /**
1594       * Descending iterator iterates through all elements
1595       */
# Line 1478 | Line 1652 | public class LinkedBlockingDequeTest ext
1652          }
1653      }
1654  
1481
1655      /**
1656       * toString contains toStrings of elements
1657       */
# Line 1486 | Line 1659 | public class LinkedBlockingDequeTest ext
1659          LinkedBlockingDeque q = populatedDeque(SIZE);
1660          String s = q.toString();
1661          for (int i = 0; i < SIZE; ++i) {
1662 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1662 >            assertTrue(s.contains(String.valueOf(i)));
1663          }
1664      }
1665  
1493
1666      /**
1667       * offer transfers elements across Executor tasks
1668       */
# Line 1499 | Line 1671 | public class LinkedBlockingDequeTest ext
1671          q.add(one);
1672          q.add(two);
1673          ExecutorService executor = Executors.newFixedThreadPool(2);
1674 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1675          executor.execute(new CheckedRunnable() {
1676              public void realRun() throws InterruptedException {
1677                  assertFalse(q.offer(three));
1678 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1678 >                threadsStarted.await();
1679 >                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1680                  assertEquals(0, q.remainingCapacity());
1681              }});
1682  
1683          executor.execute(new CheckedRunnable() {
1684              public void realRun() throws InterruptedException {
1685 <                Thread.sleep(SMALL_DELAY_MS);
1685 >                threadsStarted.await();
1686                  assertSame(one, q.take());
1687              }});
1688  
# Line 1516 | Line 1690 | public class LinkedBlockingDequeTest ext
1690      }
1691  
1692      /**
1693 <     * poll retrieves elements across Executor threads
1693 >     * timed poll retrieves elements across Executor threads
1694       */
1695      public void testPollInExecutor() {
1696          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1697 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1698          ExecutorService executor = Executors.newFixedThreadPool(2);
1699          executor.execute(new CheckedRunnable() {
1700              public void realRun() throws InterruptedException {
1701                  assertNull(q.poll());
1702 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1703 <                assertTrue(q.isEmpty());
1702 >                threadsStarted.await();
1703 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1704 >                checkEmpty(q);
1705              }});
1706  
1707          executor.execute(new CheckedRunnable() {
1708              public void realRun() throws InterruptedException {
1709 <                Thread.sleep(SMALL_DELAY_MS);
1709 >                threadsStarted.await();
1710                  q.put(one);
1711              }});
1712  
# Line 1541 | Line 1717 | public class LinkedBlockingDequeTest ext
1717       * A deserialized serialized deque has same elements in same order
1718       */
1719      public void testSerialization() throws Exception {
1720 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1721 <
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 <    }
1720 >        Queue x = populatedDeque(SIZE);
1721 >        Queue y = serialClone(x);
1722  
1723 <    /**
1724 <     * drainTo(null) throws NPE
1725 <     */
1726 <    public void testDrainToNull() {
1727 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1728 <        try {
1729 <            q.drainTo(null);
1730 <            shouldThrow();
1731 <        } 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) {}
1723 >        assertNotSame(y, x);
1724 >        assertEquals(x.size(), y.size());
1725 >        assertEquals(x.toString(), y.toString());
1726 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1727 >        while (!x.isEmpty()) {
1728 >            assertFalse(y.isEmpty());
1729 >            assertEquals(x.remove(), y.remove());
1730 >        }
1731 >        assertTrue(y.isEmpty());
1732      }
1733  
1734      /**
# Line 1585 | Line 1738 | public class LinkedBlockingDequeTest ext
1738          LinkedBlockingDeque q = populatedDeque(SIZE);
1739          ArrayList l = new ArrayList();
1740          q.drainTo(l);
1741 <        assertEquals(q.size(), 0);
1742 <        assertEquals(l.size(), SIZE);
1741 >        assertEquals(0, q.size());
1742 >        assertEquals(SIZE, l.size());
1743          for (int i = 0; i < SIZE; ++i)
1744              assertEquals(l.get(i), new Integer(i));
1745          q.add(zero);
# Line 1596 | Line 1749 | public class LinkedBlockingDequeTest ext
1749          assertTrue(q.contains(one));
1750          l.clear();
1751          q.drainTo(l);
1752 <        assertEquals(q.size(), 0);
1753 <        assertEquals(l.size(), 2);
1752 >        assertEquals(0, q.size());
1753 >        assertEquals(2, l.size());
1754          for (int i = 0; i < 2; ++i)
1755              assertEquals(l.get(i), new Integer(i));
1756      }
# Line 1623 | Line 1776 | public class LinkedBlockingDequeTest ext
1776      }
1777  
1778      /**
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    /**
1779       * drainTo(c, n) empties first min(n, size) elements of queue into c
1780       */
1781      public void testDrainToN() {
# Line 1655 | Line 1786 | public class LinkedBlockingDequeTest ext
1786              ArrayList l = new ArrayList();
1787              q.drainTo(l, i);
1788              int k = (i < SIZE) ? i : SIZE;
1789 <            assertEquals(l.size(), k);
1790 <            assertEquals(q.size(), SIZE-k);
1789 >            assertEquals(k, l.size());
1790 >            assertEquals(SIZE-k, q.size());
1791              for (int j = 0; j < k; ++j)
1792                  assertEquals(l.get(j), new Integer(j));
1793 <            while (q.poll() != null) ;
1793 >            do {} while (q.poll() != null);
1794 >        }
1795 >    }
1796 >
1797 >    /**
1798 >     * remove(null), contains(null) always return false
1799 >     */
1800 >    public void testNeverContainsNull() {
1801 >        Deque<?>[] qs = {
1802 >            new LinkedBlockingDeque<Object>(),
1803 >            populatedDeque(2),
1804 >        };
1805 >
1806 >        for (Deque<?> q : qs) {
1807 >            assertFalse(q.contains(null));
1808 >            assertFalse(q.remove(null));
1809 >            assertFalse(q.removeFirstOccurrence(null));
1810 >            assertFalse(q.removeLastOccurrence(null));
1811          }
1812      }
1813  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines