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.71 by jsr166, Sat May 13 21:52:59 2017 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 import junit.framework.*;
8 import java.util.*;
9 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 < import java.io.*;
8 >
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Deque;
13 > import java.util.Iterator;
14 > import java.util.NoSuchElementException;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingDeque;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedBlockingDeque;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingDequeTest extends JSR166TestCase {
26  
# Line 20 | Line 32 | public class LinkedBlockingDequeTest ext
32  
33      public static class Bounded extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new LinkedBlockingDeque(20);
35 >            return new LinkedBlockingDeque(SIZE);
36          }
37      }
38  
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run(suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
44 +        class Implementation implements CollectionImplementation {
45 +            public Class<?> klazz() { return LinkedBlockingDeque.class; }
46 +            public Collection emptyCollection() { return new LinkedBlockingDeque(); }
47 +            public Object makeElement(int i) { return i; }
48 +            public boolean isConcurrent() { return true; }
49 +            public boolean permitsNulls() { return false; }
50 +        }
51          return newTestSuite(LinkedBlockingDequeTest.class,
52                              new Unbounded().testSuite(),
53 <                            new Bounded().testSuite());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58 <     * Create a deque of given size containing consecutive
59 <     * Integers 0 ... n.
58 >     * Returns a new deque of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingDeque<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) {}
# Line 433 | Line 445 | public class LinkedBlockingDequeTest ext
445       * push succeeds if not full; throws ISE if full
446       */
447      public void testPush() {
448 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
449 +        for (int i = 0; i < SIZE; ++i) {
450 +            Integer x = new Integer(i);
451 +            q.push(x);
452 +            assertEquals(x, q.peek());
453 +        }
454 +        assertEquals(0, q.remainingCapacity());
455          try {
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 485 | Line 495 | public class LinkedBlockingDequeTest ext
495       * add succeeds if not full; throws ISE if full
496       */
497      public void testAdd() {
498 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
499 +        for (int i = 0; i < SIZE; ++i)
500 +            assertTrue(q.add(new Integer(i)));
501 +        assertEquals(0, q.remainingCapacity());
502          try {
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      /**
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    /**
509       * addAll(this) throws IAE
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 >        assertThreadStaysAlive(t);
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 +                pleaseInterrupt.countDown();
630                  try {
631                      q.put(99);
632                      shouldThrow();
633                  } catch (InterruptedException success) {}
634 +                assertFalse(Thread.interrupted());
635              }});
636  
637 <        t.start();
638 <        Thread.sleep(SHORT_DELAY_MS);
645 <        assertEquals(q.remainingCapacity(), 0);
637 >        await(pleaseTake);
638 >        assertEquals(0, q.remainingCapacity());
639          assertEquals(0, q.take());
640 <        Thread.sleep(SHORT_DELAY_MS);
640 >
641 >        await(pleaseInterrupt);
642 >        assertThreadBlocks(t, Thread.State.WAITING);
643          t.interrupt();
644 <        t.join();
645 <        assertEquals(q.remainingCapacity(), 0);
644 >        awaitTermination(t);
645 >        assertEquals(0, q.remainingCapacity());
646      }
647  
648      /**
# Line 655 | Line 650 | public class LinkedBlockingDequeTest ext
650       */
651      public void testTimedOffer() throws InterruptedException {
652          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
653 <        Thread t = new Thread(new CheckedRunnable() {
653 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
654 >        Thread t = newStartedThread(new CheckedRunnable() {
655              public void realRun() throws InterruptedException {
656                  q.put(new Object());
657                  q.put(new Object());
658 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
658 >                long startTime = System.nanoTime();
659 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
660 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
661 >                pleaseInterrupt.countDown();
662                  try {
663 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
663 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
664                      shouldThrow();
665                  } catch (InterruptedException success) {}
666              }});
667  
668 <        t.start();
669 <        Thread.sleep(SMALL_DELAY_MS);
668 >        await(pleaseInterrupt);
669 >        assertThreadStaysAlive(t);
670          t.interrupt();
671 <        t.join();
671 >        awaitTermination(t);
672      }
673  
674      /**
# Line 683 | Line 682 | public class LinkedBlockingDequeTest ext
682      }
683  
684      /**
685 <     * Take removes existing elements until empty, then blocks interruptibly
685 >     * take removes existing elements until empty, then blocks interruptibly
686       */
687      public void testBlockingTake() throws InterruptedException {
688          final LinkedBlockingDeque q = populatedDeque(SIZE);
689 <        Thread t = new Thread(new CheckedRunnable() {
689 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
690 >        Thread t = newStartedThread(new CheckedRunnable() {
691              public void realRun() throws InterruptedException {
692 <                for (int i = 0; i < SIZE; ++i) {
693 <                    assertEquals(i, q.take());
694 <                }
692 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
693 >
694 >                Thread.currentThread().interrupt();
695                  try {
696                      q.take();
697                      shouldThrow();
698                  } catch (InterruptedException success) {}
699 +                assertFalse(Thread.interrupted());
700 +
701 +                pleaseInterrupt.countDown();
702 +                try {
703 +                    q.take();
704 +                    shouldThrow();
705 +                } catch (InterruptedException success) {}
706 +                assertFalse(Thread.interrupted());
707              }});
708  
709 <        t.start();
710 <        Thread.sleep(SHORT_DELAY_MS);
709 >        await(pleaseInterrupt);
710 >        assertThreadBlocks(t, Thread.State.WAITING);
711          t.interrupt();
712 <        t.join();
712 >        awaitTermination(t);
713      }
714  
707
715      /**
716       * poll succeeds unless empty
717       */
# Line 733 | Line 740 | public class LinkedBlockingDequeTest ext
740      public void testTimedPoll() throws InterruptedException {
741          LinkedBlockingDeque q = populatedDeque(SIZE);
742          for (int i = 0; i < SIZE; ++i) {
743 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
744 <        }
745 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
743 >            long startTime = System.nanoTime();
744 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
745 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
746 >        }
747 >        long startTime = System.nanoTime();
748 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
749 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
750 >        checkEmpty(q);
751      }
752  
753      /**
# Line 747 | Line 759 | public class LinkedBlockingDequeTest ext
759          final CountDownLatch aboutToWait = new CountDownLatch(1);
760          Thread t = newStartedThread(new CheckedRunnable() {
761              public void realRun() throws InterruptedException {
762 +                long startTime = System.nanoTime();
763                  for (int i = 0; i < SIZE; ++i) {
751                    long t0 = System.nanoTime();
764                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
753                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
765                  }
755                long t0 = System.nanoTime();
766                  aboutToWait.countDown();
767                  try {
768 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
768 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
769                      shouldThrow();
770                  } catch (InterruptedException success) {
771 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
771 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
772                  }
773              }});
774  
775 <        aboutToWait.await();
776 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
775 >        await(aboutToWait);
776 >        waitForThreadToEnterWaitState(t);
777          t.interrupt();
778 <        awaitTermination(t, MEDIUM_DELAY_MS);
778 >        awaitTermination(t);
779          checkEmpty(q);
780      }
781  
782      /**
783       * putFirst(null) throws NPE
784       */
785 <     public void testPutFirstNull() throws InterruptedException {
785 >    public void testPutFirstNull() throws InterruptedException {
786 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
787          try {
777            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
788              q.putFirst(null);
789              shouldThrow();
790          } catch (NullPointerException success) {}
791 <     }
791 >    }
792  
793      /**
794       * all elements successfully putFirst are contained
795       */
796 <     public void testPutFirst() throws InterruptedException {
797 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
798 <         for (int i = 0; i < SIZE; ++i) {
799 <             Integer I = new Integer(i);
800 <             q.putFirst(I);
801 <             assertTrue(q.contains(I));
802 <         }
803 <         assertEquals(0, q.remainingCapacity());
796 >    public void testPutFirst() throws InterruptedException {
797 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
798 >        for (int i = 0; i < SIZE; ++i) {
799 >            Integer x = new Integer(i);
800 >            q.putFirst(x);
801 >            assertTrue(q.contains(x));
802 >        }
803 >        assertEquals(0, q.remainingCapacity());
804      }
805  
806      /**
# Line 798 | Line 808 | public class LinkedBlockingDequeTest ext
808       */
809      public void testBlockingPutFirst() throws InterruptedException {
810          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
811 <        Thread t = new Thread(new CheckedRunnable() {
811 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
812 >        Thread t = newStartedThread(new CheckedRunnable() {
813              public void realRun() throws InterruptedException {
814                  for (int i = 0; i < SIZE; ++i)
815                      q.putFirst(i);
816                  assertEquals(SIZE, q.size());
817                  assertEquals(0, q.remainingCapacity());
818 +
819 +                Thread.currentThread().interrupt();
820 +                try {
821 +                    q.putFirst(99);
822 +                    shouldThrow();
823 +                } catch (InterruptedException success) {}
824 +                assertFalse(Thread.interrupted());
825 +
826 +                pleaseInterrupt.countDown();
827                  try {
828                      q.putFirst(99);
829                      shouldThrow();
830                  } catch (InterruptedException success) {}
831 +                assertFalse(Thread.interrupted());
832              }});
833  
834 <        t.start();
835 <        Thread.sleep(SHORT_DELAY_MS);
834 >        await(pleaseInterrupt);
835 >        assertThreadStaysAlive(t);
836          t.interrupt();
837 <        t.join();
837 >        awaitTermination(t);
838          assertEquals(SIZE, q.size());
839          assertEquals(0, q.remainingCapacity());
840      }
841  
842      /**
843 <     * putFirst blocks waiting for take when full
843 >     * putFirst blocks interruptibly waiting for take when full
844       */
845      public void testPutFirstWithTake() throws InterruptedException {
846          final int capacity = 2;
847          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
848 <        Thread t = new Thread(new CheckedRunnable() {
848 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
849 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
850 >        Thread t = newStartedThread(new CheckedRunnable() {
851              public void realRun() throws InterruptedException {
852 <                for (int i = 0; i < capacity + 1; i++)
852 >                for (int i = 0; i < capacity; i++)
853                      q.putFirst(i);
854 +                pleaseTake.countDown();
855 +                q.putFirst(86);
856 +
857 +                pleaseInterrupt.countDown();
858                  try {
859                      q.putFirst(99);
860                      shouldThrow();
861                  } catch (InterruptedException success) {}
862 +                assertFalse(Thread.interrupted());
863              }});
864  
865 <        t.start();
866 <        Thread.sleep(SHORT_DELAY_MS);
839 <        assertEquals(q.remainingCapacity(), 0);
865 >        await(pleaseTake);
866 >        assertEquals(0, q.remainingCapacity());
867          assertEquals(capacity - 1, q.take());
868 <        Thread.sleep(SHORT_DELAY_MS);
868 >
869 >        await(pleaseInterrupt);
870 >        assertThreadStaysAlive(t);
871          t.interrupt();
872 <        t.join();
873 <        assertEquals(q.remainingCapacity(), 0);
872 >        awaitTermination(t);
873 >        assertEquals(0, q.remainingCapacity());
874      }
875  
876      /**
# Line 849 | Line 878 | public class LinkedBlockingDequeTest ext
878       */
879      public void testTimedOfferFirst() throws InterruptedException {
880          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
881 <        Thread t = new Thread(new CheckedRunnable() {
881 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
882 >        Thread t = newStartedThread(new CheckedRunnable() {
883              public void realRun() throws InterruptedException {
884                  q.putFirst(new Object());
885                  q.putFirst(new Object());
886 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
886 >                long startTime = System.nanoTime();
887 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
888 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
889 >                pleaseInterrupt.countDown();
890                  try {
891 <                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
891 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
892                      shouldThrow();
893                  } catch (InterruptedException success) {}
894              }});
895  
896 <        t.start();
897 <        Thread.sleep(SMALL_DELAY_MS);
896 >        await(pleaseInterrupt);
897 >        assertThreadStaysAlive(t);
898          t.interrupt();
899 <        t.join();
899 >        awaitTermination(t);
900      }
901  
902      /**
# Line 877 | Line 910 | public class LinkedBlockingDequeTest ext
910      }
911  
912      /**
913 <     * takeFirst blocks interruptibly when empty
913 >     * takeFirst() blocks interruptibly when empty
914       */
915 <    public void testTakeFirstFromEmpty() throws InterruptedException {
916 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
917 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
918 <            public void realRun() throws InterruptedException {
919 <                q.takeFirst();
920 <            }};
915 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
916 >        final BlockingDeque q = new LinkedBlockingDeque();
917 >        final CountDownLatch threadStarted = new CountDownLatch(1);
918 >        Thread t = newStartedThread(new CheckedRunnable() {
919 >            public void realRun() {
920 >                threadStarted.countDown();
921 >                try {
922 >                    q.takeFirst();
923 >                    shouldThrow();
924 >                } catch (InterruptedException success) {}
925 >                assertFalse(Thread.interrupted());
926 >            }});
927  
928 <        t.start();
929 <        Thread.sleep(SHORT_DELAY_MS);
928 >        await(threadStarted);
929 >        assertThreadBlocks(t, Thread.State.WAITING);
930          t.interrupt();
931 <        t.join();
931 >        awaitTermination(t);
932      }
933  
934      /**
935 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
935 >     * takeFirst() throws InterruptedException immediately if interrupted
936 >     * before waiting
937 >     */
938 >    public void testTakeFirstFromEmptyAfterInterrupt() {
939 >        final BlockingDeque q = new LinkedBlockingDeque();
940 >        Thread t = newStartedThread(new CheckedRunnable() {
941 >            public void realRun() {
942 >                Thread.currentThread().interrupt();
943 >                try {
944 >                    q.takeFirst();
945 >                    shouldThrow();
946 >                } catch (InterruptedException success) {}
947 >                assertFalse(Thread.interrupted());
948 >            }});
949 >
950 >        awaitTermination(t);
951 >    }
952 >
953 >    /**
954 >     * takeLast() blocks interruptibly when empty
955 >     */
956 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
957 >        final BlockingDeque q = new LinkedBlockingDeque();
958 >        final CountDownLatch threadStarted = new CountDownLatch(1);
959 >        Thread t = newStartedThread(new CheckedRunnable() {
960 >            public void realRun() {
961 >                threadStarted.countDown();
962 >                try {
963 >                    q.takeLast();
964 >                    shouldThrow();
965 >                } catch (InterruptedException success) {}
966 >                assertFalse(Thread.interrupted());
967 >            }});
968 >
969 >        await(threadStarted);
970 >        assertThreadBlocks(t, Thread.State.WAITING);
971 >        t.interrupt();
972 >        awaitTermination(t);
973 >    }
974 >
975 >    /**
976 >     * takeLast() throws InterruptedException immediately if interrupted
977 >     * before waiting
978 >     */
979 >    public void testTakeLastFromEmptyAfterInterrupt() {
980 >        final BlockingDeque q = new LinkedBlockingDeque();
981 >        Thread t = newStartedThread(new CheckedRunnable() {
982 >            public void realRun() {
983 >                Thread.currentThread().interrupt();
984 >                try {
985 >                    q.takeLast();
986 >                    shouldThrow();
987 >                } catch (InterruptedException success) {}
988 >                assertFalse(Thread.interrupted());
989 >            }});
990 >
991 >        awaitTermination(t);
992 >    }
993 >
994 >    /**
995 >     * takeFirst removes existing elements until empty, then blocks interruptibly
996       */
997      public void testBlockingTakeFirst() throws InterruptedException {
998          final LinkedBlockingDeque q = populatedDeque(SIZE);
999 <        Thread t = new Thread(new CheckedRunnable() {
999 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1000 >        Thread t = newStartedThread(new CheckedRunnable() {
1001              public void realRun() throws InterruptedException {
1002 <                for (int i = 0; i < SIZE; ++i)
1003 <                    assertEquals(i, q.takeFirst());
1002 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1003 >
1004 >                Thread.currentThread().interrupt();
1005 >                try {
1006 >                    q.takeFirst();
1007 >                    shouldThrow();
1008 >                } catch (InterruptedException success) {}
1009 >                assertFalse(Thread.interrupted());
1010 >
1011 >                pleaseInterrupt.countDown();
1012                  try {
1013                      q.takeFirst();
1014                      shouldThrow();
1015                  } catch (InterruptedException success) {}
1016 +                assertFalse(Thread.interrupted());
1017              }});
1018  
1019 <        t.start();
1020 <        Thread.sleep(SHORT_DELAY_MS);
1019 >        await(pleaseInterrupt);
1020 >        assertThreadBlocks(t, Thread.State.WAITING);
1021          t.interrupt();
1022 <        t.join();
1022 >        awaitTermination(t);
1023      }
1024  
916
1025      /**
1026       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1027       */
# Line 931 | Line 1039 | public class LinkedBlockingDequeTest ext
1039      public void testTimedPollFirst() throws InterruptedException {
1040          LinkedBlockingDeque q = populatedDeque(SIZE);
1041          for (int i = 0; i < SIZE; ++i) {
1042 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1043 <        }
1044 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1042 >            long startTime = System.nanoTime();
1043 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1044 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1045 >        }
1046 >        long startTime = System.nanoTime();
1047 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1048 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1049 >        checkEmpty(q);
1050      }
1051  
1052      /**
# Line 941 | Line 1054 | public class LinkedBlockingDequeTest ext
1054       * returning timeout status
1055       */
1056      public void testInterruptedTimedPollFirst() throws InterruptedException {
1057 <        Thread t = new Thread(new CheckedRunnable() {
1057 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1058 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1059 >        Thread t = newStartedThread(new CheckedRunnable() {
1060              public void realRun() throws InterruptedException {
1061 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1061 >                long startTime = System.nanoTime();
1062                  for (int i = 0; i < SIZE; ++i) {
1063 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1063 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1064                  }
1065 +
1066 +                Thread.currentThread().interrupt();
1067                  try {
1068 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1068 >                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1069                      shouldThrow();
1070                  } catch (InterruptedException success) {}
1071 +                assertFalse(Thread.interrupted());
1072 +
1073 +                pleaseInterrupt.countDown();
1074 +                try {
1075 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1076 +                    shouldThrow();
1077 +                } catch (InterruptedException success) {}
1078 +                assertFalse(Thread.interrupted());
1079 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1080              }});
1081  
1082 <        t.start();
1083 <        Thread.sleep(SHORT_DELAY_MS);
1082 >        await(pleaseInterrupt);
1083 >        assertThreadStaysAlive(t);
1084          t.interrupt();
1085 <        t.join();
1085 >        awaitTermination(t);
1086      }
1087  
1088      /**
# Line 965 | Line 1091 | public class LinkedBlockingDequeTest ext
1091       */
1092      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1093          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1094 <        Thread t = new Thread(new CheckedRunnable() {
1094 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1095 >        Thread t = newStartedThread(new CheckedRunnable() {
1096              public void realRun() throws InterruptedException {
1097 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1097 >                long startTime = System.nanoTime();
1098 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1099 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1100 >
1101 >                barrier.await();
1102 >
1103                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1104 +
1105 +                Thread.currentThread().interrupt();
1106 +                try {
1107 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1108 +                    shouldThrow();
1109 +                } catch (InterruptedException success) {}
1110 +
1111 +                barrier.await();
1112                  try {
1113                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1114                      shouldThrow();
1115                  } catch (InterruptedException success) {}
1116 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1117              }});
1118  
1119 <        t.start();
1120 <        Thread.sleep(SMALL_DELAY_MS);
1121 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1119 >        barrier.await();
1120 >        long startTime = System.nanoTime();
1121 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1122 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1123 >        barrier.await();
1124 >        assertThreadStaysAlive(t);
1125          t.interrupt();
1126 <        t.join();
1126 >        awaitTermination(t);
1127      }
1128  
1129      /**
1130       * putLast(null) throws NPE
1131       */
1132 <     public void testPutLastNull() throws InterruptedException {
1132 >    public void testPutLastNull() throws InterruptedException {
1133 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1134          try {
990            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1135              q.putLast(null);
1136              shouldThrow();
1137          } catch (NullPointerException success) {}
1138 <     }
1138 >    }
1139  
1140      /**
1141       * all elements successfully putLast are contained
1142       */
1143 <     public void testPutLast() throws InterruptedException {
1144 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1145 <         for (int i = 0; i < SIZE; ++i) {
1146 <             Integer I = new Integer(i);
1147 <             q.putLast(I);
1148 <             assertTrue(q.contains(I));
1149 <         }
1150 <         assertEquals(0, q.remainingCapacity());
1143 >    public void testPutLast() throws InterruptedException {
1144 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1145 >        for (int i = 0; i < SIZE; ++i) {
1146 >            Integer x = new Integer(i);
1147 >            q.putLast(x);
1148 >            assertTrue(q.contains(x));
1149 >        }
1150 >        assertEquals(0, q.remainingCapacity());
1151      }
1152  
1153      /**
# Line 1011 | Line 1155 | public class LinkedBlockingDequeTest ext
1155       */
1156      public void testBlockingPutLast() throws InterruptedException {
1157          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1158 <        Thread t = new Thread(new CheckedRunnable() {
1158 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1159 >        Thread t = newStartedThread(new CheckedRunnable() {
1160              public void realRun() throws InterruptedException {
1161                  for (int i = 0; i < SIZE; ++i)
1162                      q.putLast(i);
1163                  assertEquals(SIZE, q.size());
1164                  assertEquals(0, q.remainingCapacity());
1165 +
1166 +                Thread.currentThread().interrupt();
1167 +                try {
1168 +                    q.putLast(99);
1169 +                    shouldThrow();
1170 +                } catch (InterruptedException success) {}
1171 +                assertFalse(Thread.interrupted());
1172 +
1173 +                pleaseInterrupt.countDown();
1174                  try {
1175                      q.putLast(99);
1176                      shouldThrow();
1177                  } catch (InterruptedException success) {}
1178 +                assertFalse(Thread.interrupted());
1179              }});
1180  
1181 <        t.start();
1182 <        Thread.sleep(SHORT_DELAY_MS);
1181 >        await(pleaseInterrupt);
1182 >        assertThreadStaysAlive(t);
1183          t.interrupt();
1184 <        t.join();
1184 >        awaitTermination(t);
1185          assertEquals(SIZE, q.size());
1186          assertEquals(0, q.remainingCapacity());
1187      }
1188  
1189      /**
1190 <     * putLast blocks waiting for take when full
1190 >     * putLast blocks interruptibly waiting for take when full
1191       */
1192      public void testPutLastWithTake() throws InterruptedException {
1193          final int capacity = 2;
1194          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1195 <        Thread t = new Thread(new CheckedRunnable() {
1195 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1196 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1197 >        Thread t = newStartedThread(new CheckedRunnable() {
1198              public void realRun() throws InterruptedException {
1199 <                for (int i = 0; i < capacity + 1; i++)
1199 >                for (int i = 0; i < capacity; i++)
1200                      q.putLast(i);
1201 +                pleaseTake.countDown();
1202 +                q.putLast(86);
1203 +
1204 +                pleaseInterrupt.countDown();
1205                  try {
1206                      q.putLast(99);
1207                      shouldThrow();
1208                  } catch (InterruptedException success) {}
1209 +                assertFalse(Thread.interrupted());
1210              }});
1211  
1212 <        t.start();
1213 <        Thread.sleep(SHORT_DELAY_MS);
1052 <        assertEquals(q.remainingCapacity(), 0);
1212 >        await(pleaseTake);
1213 >        assertEquals(0, q.remainingCapacity());
1214          assertEquals(0, q.take());
1215 <        Thread.sleep(SHORT_DELAY_MS);
1215 >
1216 >        await(pleaseInterrupt);
1217 >        assertThreadStaysAlive(t);
1218          t.interrupt();
1219 <        t.join();
1220 <        assertEquals(q.remainingCapacity(), 0);
1219 >        awaitTermination(t);
1220 >        assertEquals(0, q.remainingCapacity());
1221      }
1222  
1223      /**
# Line 1062 | Line 1225 | public class LinkedBlockingDequeTest ext
1225       */
1226      public void testTimedOfferLast() throws InterruptedException {
1227          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1228 <        Thread t = new Thread(new CheckedRunnable() {
1228 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1229 >        Thread t = newStartedThread(new CheckedRunnable() {
1230              public void realRun() throws InterruptedException {
1231                  q.putLast(new Object());
1232                  q.putLast(new Object());
1233 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1233 >                long startTime = System.nanoTime();
1234 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1235 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1236 >                pleaseInterrupt.countDown();
1237                  try {
1238 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1238 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1239                      shouldThrow();
1240                  } catch (InterruptedException success) {}
1241              }});
1242  
1243 <        t.start();
1244 <        Thread.sleep(SMALL_DELAY_MS);
1243 >        await(pleaseInterrupt);
1244 >        assertThreadStaysAlive(t);
1245          t.interrupt();
1246 <        t.join();
1246 >        awaitTermination(t);
1247      }
1248  
1249      /**
# Line 1085 | Line 1252 | public class LinkedBlockingDequeTest ext
1252      public void testTakeLast() throws InterruptedException {
1253          LinkedBlockingDeque q = populatedDeque(SIZE);
1254          for (int i = 0; i < SIZE; ++i) {
1255 <            assertEquals(SIZE-i-1, q.takeLast());
1255 >            assertEquals(SIZE - i - 1, q.takeLast());
1256          }
1257      }
1258  
1259      /**
1260 <     * 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
1260 >     * takeLast removes existing elements until empty, then blocks interruptibly
1261       */
1262      public void testBlockingTakeLast() throws InterruptedException {
1263          final LinkedBlockingDeque q = populatedDeque(SIZE);
1264 <        Thread t = new Thread(new CheckedRunnable() {
1264 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1265 >        Thread t = newStartedThread(new CheckedRunnable() {
1266              public void realRun() throws InterruptedException {
1267 <                for (int i = 0; i < SIZE; ++i)
1268 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1267 >                for (int i = 0; i < SIZE; i++)
1268 >                    assertEquals(SIZE - i - 1, q.takeLast());
1269 >
1270 >                Thread.currentThread().interrupt();
1271                  try {
1272                      q.takeLast();
1273                      shouldThrow();
1274                  } catch (InterruptedException success) {}
1275 +                assertFalse(Thread.interrupted());
1276 +
1277 +                pleaseInterrupt.countDown();
1278 +                try {
1279 +                    q.takeLast();
1280 +                    shouldThrow();
1281 +                } catch (InterruptedException success) {}
1282 +                assertFalse(Thread.interrupted());
1283              }});
1284  
1285 <        t.start();
1286 <        Thread.sleep(SHORT_DELAY_MS);
1285 >        await(pleaseInterrupt);
1286 >        assertThreadBlocks(t, Thread.State.WAITING);
1287          t.interrupt();
1288 <        t.join();
1288 >        awaitTermination(t);
1289      }
1290  
1291      /**
# Line 1132 | Line 1294 | public class LinkedBlockingDequeTest ext
1294      public void testTimedPollLast0() throws InterruptedException {
1295          LinkedBlockingDeque q = populatedDeque(SIZE);
1296          for (int i = 0; i < SIZE; ++i) {
1297 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1297 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1298          }
1299          assertNull(q.pollLast(0, MILLISECONDS));
1300      }
# Line 1143 | Line 1305 | public class LinkedBlockingDequeTest ext
1305      public void testTimedPollLast() throws InterruptedException {
1306          LinkedBlockingDeque q = populatedDeque(SIZE);
1307          for (int i = 0; i < SIZE; ++i) {
1308 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1309 <        }
1310 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1308 >            long startTime = System.nanoTime();
1309 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1310 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1311 >        }
1312 >        long startTime = System.nanoTime();
1313 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1314 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1315 >        checkEmpty(q);
1316      }
1317  
1318      /**
# Line 1153 | Line 1320 | public class LinkedBlockingDequeTest ext
1320       * returning timeout status
1321       */
1322      public void testInterruptedTimedPollLast() throws InterruptedException {
1323 <        Thread t = new Thread(new CheckedRunnable() {
1323 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1324 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1325 >        Thread t = newStartedThread(new CheckedRunnable() {
1326              public void realRun() throws InterruptedException {
1327 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1327 >                long startTime = System.nanoTime();
1328                  for (int i = 0; i < SIZE; ++i) {
1329 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1329 >                    assertEquals(SIZE - i - 1,
1330 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1331                  }
1332 +
1333 +                Thread.currentThread().interrupt();
1334 +                try {
1335 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1336 +                    shouldThrow();
1337 +                } catch (InterruptedException success) {}
1338 +                assertFalse(Thread.interrupted());
1339 +
1340 +                pleaseInterrupt.countDown();
1341                  try {
1342 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1342 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1343                      shouldThrow();
1344                  } catch (InterruptedException success) {}
1345 +                assertFalse(Thread.interrupted());
1346 +
1347 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1348              }});
1349  
1350 <        t.start();
1351 <        Thread.sleep(SHORT_DELAY_MS);
1350 >        await(pleaseInterrupt);
1351 >        assertThreadStaysAlive(t);
1352          t.interrupt();
1353 <        t.join();
1353 >        awaitTermination(t);
1354 >        checkEmpty(q);
1355      }
1356  
1357      /**
# Line 1177 | Line 1360 | public class LinkedBlockingDequeTest ext
1360       */
1361      public void testTimedPollWithOfferLast() throws InterruptedException {
1362          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1363 <        Thread t = new Thread(new CheckedRunnable() {
1363 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1364 >        Thread t = newStartedThread(new CheckedRunnable() {
1365              public void realRun() throws InterruptedException {
1366 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1366 >                long startTime = System.nanoTime();
1367 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1368 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1369 >
1370 >                barrier.await();
1371 >
1372                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1373 +
1374 +                Thread.currentThread().interrupt();
1375                  try {
1376                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1377                      shouldThrow();
1378                  } catch (InterruptedException success) {}
1379 +                assertFalse(Thread.interrupted());
1380 +
1381 +                barrier.await();
1382 +                try {
1383 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1384 +                    shouldThrow();
1385 +                } catch (InterruptedException success) {}
1386 +                assertFalse(Thread.interrupted());
1387 +
1388 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1389              }});
1390  
1391 <        t.start();
1392 <        Thread.sleep(SMALL_DELAY_MS);
1393 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1391 >        barrier.await();
1392 >        long startTime = System.nanoTime();
1393 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1394 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1395 >
1396 >        barrier.await();
1397 >        assertThreadStaysAlive(t);
1398          t.interrupt();
1399 <        t.join();
1399 >        awaitTermination(t);
1400      }
1401  
1197
1402      /**
1403       * element returns next element, or throws NSEE if empty
1404       */
# Line 1211 | Line 1415 | public class LinkedBlockingDequeTest ext
1415      }
1416  
1417      /**
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    /**
1418       * contains(x) reports true when elements added but not yet removed
1419       */
1420      public void testContains() {
# Line 1287 | Line 1470 | public class LinkedBlockingDequeTest ext
1470                  assertTrue(changed);
1471  
1472              assertTrue(q.containsAll(p));
1473 <            assertEquals(SIZE-i, q.size());
1473 >            assertEquals(SIZE - i, q.size());
1474              p.remove();
1475          }
1476      }
# Line 1300 | Line 1483 | public class LinkedBlockingDequeTest ext
1483              LinkedBlockingDeque q = populatedDeque(SIZE);
1484              LinkedBlockingDeque p = populatedDeque(i);
1485              assertTrue(q.removeAll(p));
1486 <            assertEquals(SIZE-i, q.size());
1486 >            assertEquals(SIZE - i, q.size());
1487              for (int j = 0; j < i; ++j) {
1488 <                Integer I = (Integer)(p.remove());
1489 <                assertFalse(q.contains(I));
1488 >                Integer x = (Integer)(p.remove());
1489 >                assertFalse(q.contains(x));
1490              }
1491          }
1492      }
# Line 1311 | Line 1494 | public class LinkedBlockingDequeTest ext
1494      /**
1495       * toArray contains all elements in FIFO order
1496       */
1497 <    public void testToArray() throws InterruptedException{
1497 >    public void testToArray() throws InterruptedException {
1498          LinkedBlockingDeque q = populatedDeque(SIZE);
1499          Object[] o = q.toArray();
1500          for (int i = 0; i < o.length; i++)
# Line 1331 | Line 1514 | public class LinkedBlockingDequeTest ext
1514      }
1515  
1516      /**
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    /**
1517       * toArray(incompatible array type) throws ArrayStoreException
1518       */
1519      public void testToArray1_BadArg() {
# Line 1352 | Line 1524 | public class LinkedBlockingDequeTest ext
1524          } catch (ArrayStoreException success) {}
1525      }
1526  
1355
1527      /**
1528       * iterator iterates through all elements
1529       */
1530      public void testIterator() throws InterruptedException {
1531          LinkedBlockingDeque q = populatedDeque(SIZE);
1532          Iterator it = q.iterator();
1533 <        while (it.hasNext()) {
1533 >        int i;
1534 >        for (i = 0; it.hasNext(); i++)
1535 >            assertTrue(q.contains(it.next()));
1536 >        assertEquals(i, SIZE);
1537 >        assertIteratorExhausted(it);
1538 >
1539 >        it = q.iterator();
1540 >        for (i = 0; it.hasNext(); i++)
1541              assertEquals(it.next(), q.take());
1542 <        }
1542 >        assertEquals(i, SIZE);
1543 >        assertIteratorExhausted(it);
1544 >    }
1545 >
1546 >    /**
1547 >     * iterator of empty collection has no elements
1548 >     */
1549 >    public void testEmptyIterator() {
1550 >        Deque c = new LinkedBlockingDeque();
1551 >        assertIteratorExhausted(c.iterator());
1552 >        assertIteratorExhausted(c.descendingIterator());
1553      }
1554  
1555      /**
# Line 1383 | Line 1571 | public class LinkedBlockingDequeTest ext
1571          assertFalse(it.hasNext());
1572      }
1573  
1386
1574      /**
1575       * iterator ordering is FIFO
1576       */
# Line 1415 | Line 1602 | public class LinkedBlockingDequeTest ext
1602          assertEquals(0, q.size());
1603      }
1604  
1418
1605      /**
1606       * Descending iterator iterates through all elements
1607       */
# Line 1478 | Line 1664 | public class LinkedBlockingDequeTest ext
1664          }
1665      }
1666  
1481
1667      /**
1668       * toString contains toStrings of elements
1669       */
# Line 1486 | Line 1671 | public class LinkedBlockingDequeTest ext
1671          LinkedBlockingDeque q = populatedDeque(SIZE);
1672          String s = q.toString();
1673          for (int i = 0; i < SIZE; ++i) {
1674 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1674 >            assertTrue(s.contains(String.valueOf(i)));
1675          }
1676      }
1677  
1493
1678      /**
1679       * offer transfers elements across Executor tasks
1680       */
# Line 1498 | Line 1682 | public class LinkedBlockingDequeTest ext
1682          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1683          q.add(one);
1684          q.add(two);
1685 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1686 <        executor.execute(new CheckedRunnable() {
1687 <            public void realRun() throws InterruptedException {
1688 <                assertFalse(q.offer(three));
1689 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1690 <                assertEquals(0, q.remainingCapacity());
1691 <            }});
1692 <
1693 <        executor.execute(new CheckedRunnable() {
1694 <            public void realRun() throws InterruptedException {
1695 <                Thread.sleep(SMALL_DELAY_MS);
1696 <                assertSame(one, q.take());
1697 <            }});
1698 <
1699 <        joinPool(executor);
1685 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1686 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1687 >        try (PoolCleaner cleaner = cleaner(executor)) {
1688 >            executor.execute(new CheckedRunnable() {
1689 >                public void realRun() throws InterruptedException {
1690 >                    assertFalse(q.offer(three));
1691 >                    threadsStarted.await();
1692 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1693 >                    assertEquals(0, q.remainingCapacity());
1694 >                }});
1695 >
1696 >            executor.execute(new CheckedRunnable() {
1697 >                public void realRun() throws InterruptedException {
1698 >                    threadsStarted.await();
1699 >                    assertSame(one, q.take());
1700 >                }});
1701 >        }
1702      }
1703  
1704      /**
1705 <     * poll retrieves elements across Executor threads
1705 >     * timed poll retrieves elements across Executor threads
1706       */
1707      public void testPollInExecutor() {
1708          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1709 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1710 <        executor.execute(new CheckedRunnable() {
1711 <            public void realRun() throws InterruptedException {
1712 <                assertNull(q.poll());
1713 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1714 <                assertTrue(q.isEmpty());
1715 <            }});
1716 <
1717 <        executor.execute(new CheckedRunnable() {
1718 <            public void realRun() throws InterruptedException {
1719 <                Thread.sleep(SMALL_DELAY_MS);
1720 <                q.put(one);
1721 <            }});
1722 <
1723 <        joinPool(executor);
1709 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1710 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1711 >        try (PoolCleaner cleaner = cleaner(executor)) {
1712 >            executor.execute(new CheckedRunnable() {
1713 >                public void realRun() throws InterruptedException {
1714 >                    assertNull(q.poll());
1715 >                    threadsStarted.await();
1716 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1717 >                    checkEmpty(q);
1718 >                }});
1719 >
1720 >            executor.execute(new CheckedRunnable() {
1721 >                public void realRun() throws InterruptedException {
1722 >                    threadsStarted.await();
1723 >                    q.put(one);
1724 >                }});
1725 >        }
1726      }
1727  
1728      /**
1729       * A deserialized serialized deque has same elements in same order
1730       */
1731      public void testSerialization() throws Exception {
1732 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1732 >        Queue x = populatedDeque(SIZE);
1733 >        Queue y = serialClone(x);
1734  
1735 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1736 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1737 <        out.writeObject(q);
1738 <        out.close();
1739 <
1740 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1741 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1742 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1743 <        assertEquals(q.size(), r.size());
1555 <        while (!q.isEmpty())
1556 <            assertEquals(q.remove(), r.remove());
1557 <    }
1558 <
1559 <    /**
1560 <     * drainTo(null) throws NPE
1561 <     */
1562 <    public void testDrainToNull() {
1563 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1564 <        try {
1565 <            q.drainTo(null);
1566 <            shouldThrow();
1567 <        } catch (NullPointerException success) {}
1568 <    }
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) {}
1735 >        assertNotSame(y, x);
1736 >        assertEquals(x.size(), y.size());
1737 >        assertEquals(x.toString(), y.toString());
1738 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1739 >        while (!x.isEmpty()) {
1740 >            assertFalse(y.isEmpty());
1741 >            assertEquals(x.remove(), y.remove());
1742 >        }
1743 >        assertTrue(y.isEmpty());
1744      }
1745  
1746      /**
# Line 1585 | Line 1750 | public class LinkedBlockingDequeTest ext
1750          LinkedBlockingDeque q = populatedDeque(SIZE);
1751          ArrayList l = new ArrayList();
1752          q.drainTo(l);
1753 <        assertEquals(q.size(), 0);
1754 <        assertEquals(l.size(), SIZE);
1753 >        assertEquals(0, q.size());
1754 >        assertEquals(SIZE, l.size());
1755          for (int i = 0; i < SIZE; ++i)
1756              assertEquals(l.get(i), new Integer(i));
1757          q.add(zero);
# Line 1596 | Line 1761 | public class LinkedBlockingDequeTest ext
1761          assertTrue(q.contains(one));
1762          l.clear();
1763          q.drainTo(l);
1764 <        assertEquals(q.size(), 0);
1765 <        assertEquals(l.size(), 2);
1764 >        assertEquals(0, q.size());
1765 >        assertEquals(2, l.size());
1766          for (int i = 0; i < 2; ++i)
1767              assertEquals(l.get(i), new Integer(i));
1768      }
# Line 1609 | Line 1774 | public class LinkedBlockingDequeTest ext
1774          final LinkedBlockingDeque q = populatedDeque(SIZE);
1775          Thread t = new Thread(new CheckedRunnable() {
1776              public void realRun() throws InterruptedException {
1777 <                q.put(new Integer(SIZE+1));
1777 >                q.put(new Integer(SIZE + 1));
1778              }});
1779  
1780          t.start();
# Line 1623 | Line 1788 | public class LinkedBlockingDequeTest ext
1788      }
1789  
1790      /**
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    /**
1791       * drainTo(c, n) empties first min(n, size) elements of queue into c
1792       */
1793      public void testDrainToN() {
# Line 1655 | Line 1798 | public class LinkedBlockingDequeTest ext
1798              ArrayList l = new ArrayList();
1799              q.drainTo(l, i);
1800              int k = (i < SIZE) ? i : SIZE;
1801 <            assertEquals(l.size(), k);
1802 <            assertEquals(q.size(), SIZE-k);
1801 >            assertEquals(k, l.size());
1802 >            assertEquals(SIZE - k, q.size());
1803              for (int j = 0; j < k; ++j)
1804                  assertEquals(l.get(j), new Integer(j));
1805 <            while (q.poll() != null) ;
1805 >            do {} while (q.poll() != null);
1806 >        }
1807 >    }
1808 >
1809 >    /**
1810 >     * remove(null), contains(null) always return false
1811 >     */
1812 >    public void testNeverContainsNull() {
1813 >        Deque<?>[] qs = {
1814 >            new LinkedBlockingDeque<Object>(),
1815 >            populatedDeque(2),
1816 >        };
1817 >
1818 >        for (Deque<?> q : qs) {
1819 >            assertFalse(q.contains(null));
1820 >            assertFalse(q.remove(null));
1821 >            assertFalse(q.removeFirstOccurrence(null));
1822 >            assertFalse(q.removeLastOccurrence(null));
1823          }
1824      }
1825  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines