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.21 by jsr166, Wed Aug 25 00:07:03 2010 UTC vs.
Revision 1.83 by jsr166, Mon May 28 21:19:50 2018 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 +
27 +    public static class Unbounded extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedBlockingDeque();
30 +        }
31 +    }
32 +
33 +    public static class Bounded extends BlockingQueueTest {
34 +        protected BlockingQueue emptyCollection() {
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 <        return new TestSuite(LinkedBlockingDequeTest.class);
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(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58 <     * Create a deque of given size containing consecutive
59 <     * Integers 0 ... n.
60 <     */
61 <    private LinkedBlockingDeque populatedDeque(int n) {
62 <        LinkedBlockingDeque q = new LinkedBlockingDeque(n);
58 >     * Returns a new deque of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60 >     */
61 >    private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62 >        LinkedBlockingDeque<Integer> q =
63 >            new LinkedBlockingDeque<Integer>(n);
64          assertTrue(q.isEmpty());
65          for (int i = 0; i < n; i++)
66              assertTrue(q.offer(new Integer(i)));
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peekFirst());
71 +        assertEquals((Integer) (n - 1), q.peekLast());
72          return q;
73      }
74  
# Line 54 | 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 64 | 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 {
71            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 93 | Line 142 | public class LinkedBlockingDequeTest ext
142      }
143  
144      /**
145 <     *  pollFirst succeeds unless empty
145 >     * pollFirst succeeds unless empty
146       */
147      public void testPollFirst() {
148          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 104 | Line 153 | public class LinkedBlockingDequeTest ext
153      }
154  
155      /**
156 <     *  pollLast succeeds unless empty
156 >     * pollLast succeeds unless empty
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());
164      }
165  
166      /**
167 <     *  peekFirst returns next element, or null if empty
167 >     * peekFirst returns next element, or null if empty
168       */
169      public void testPeekFirst() {
170          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 129 | Line 178 | public class LinkedBlockingDequeTest ext
178      }
179  
180      /**
181 <     *  peek returns next element, or null if empty
181 >     * peek returns next element, or null if empty
182       */
183      public void testPeek() {
184          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 143 | Line 192 | public class LinkedBlockingDequeTest ext
192      }
193  
194      /**
195 <     *  peekLast returns next element, or null if empty
195 >     * peekLast returns next element, or null if empty
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 157 | Line 206 | public class LinkedBlockingDequeTest ext
206      }
207  
208      /**
209 <     * getFirst returns next getFirst, or throws NSEE if empty
209 >     * getFirst() returns first element, or throws NSEE if empty
210       */
211      public void testFirstElement() {
212          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 173 | Line 222 | public class LinkedBlockingDequeTest ext
222      }
223  
224      /**
225 <     *  getLast returns next element, or throws NSEE if empty
225 >     * getLast() returns last element, or throws NSEE if empty
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 189 | Line 238 | public class LinkedBlockingDequeTest ext
238      }
239  
240      /**
241 <     *  removeFirst removes next element, or throws NSEE if empty
241 >     * removeFirst() removes first element, or throws NSEE if empty
242       */
243      public void testRemoveFirst() {
244          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 204 | Line 253 | public class LinkedBlockingDequeTest ext
253      }
254  
255      /**
256 <     *  removeLast removes last element, or throws NSEE if empty
256 >     * removeLast() removes last element, or throws NSEE if empty
257       */
258      public void testRemoveLast() {
259          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 219 | Line 268 | public class LinkedBlockingDequeTest ext
268      }
269  
270      /**
271 <     *  remove removes next element, or throws NSEE if empty
271 >     * remove removes next element, or throws NSEE if empty
272       */
273      public void testRemove() {
274          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 237 | 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 252 | 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 282 | Line 331 | public class LinkedBlockingDequeTest ext
331          assertSame(four, q.peekLast());
332      }
333  
285
334      /**
335       * A new deque has the indicated capacity, or Integer.MAX_VALUE if
336       * none given
# Line 293 | 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];
321 <            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];
332 <            for (int i = 0; i < SIZE-1; ++i)
333 <                ints[i] = new Integer(i);
334 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
384 >            new LinkedBlockingDeque(elements);
385              shouldThrow();
386          } catch (NullPointerException success) {}
387      }
# Line 342 | 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 367 | 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      /**
384     * offer(null) throws NPE
385     */
386    public void testOfferNull() {
387        try {
388            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
389            q.offer(null);
390            shouldThrow();
391        } catch (NullPointerException success) {}
392    }
393
394    /**
395     * add(null) throws NPE
396     */
397    public void testAddNull() {
398        try {
399            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
400            q.add(null);
401            shouldThrow();
402        } catch (NullPointerException success) {}
403    }
404
405    /**
434       * push(null) throws NPE
435       */
436      public void testPushNull() {
437 +        LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438          try {
410            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
439              q.push(null);
440              shouldThrow();
441          } catch (NullPointerException success) {}
442      }
443  
444      /**
445 <     * push succeeds if not full; throws ISE if full
445 >     * push succeeds if not full; throws IllegalStateException if full
446       */
447      public void testPush() {
448 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
449 +        for (int i = 0; i < SIZE; ++i) {
450 +            Integer x = new Integer(i);
451 +            q.push(x);
452 +            assertEquals(x, q.peek());
453 +        }
454 +        assertEquals(0, q.remainingCapacity());
455          try {
421            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
422            for (int i = 0; i < SIZE; ++i) {
423                Integer I = new Integer(i);
424                q.push(I);
425                assertEquals(I, q.peek());
426            }
427            assertEquals(0, q.remainingCapacity());
456              q.push(new Integer(SIZE));
457              shouldThrow();
458          } catch (IllegalStateException success) {}
# Line 440 | Line 468 | public class LinkedBlockingDequeTest ext
468          assertSame(four, q.peekFirst());
469      }
470  
443
471      /**
472 <     *  pop removes next element, or throws NSEE if empty
472 >     * pop removes next element, or throws NSEE if empty
473       */
474      public void testPop() {
475          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 455 | Line 482 | public class LinkedBlockingDequeTest ext
482          } catch (NoSuchElementException success) {}
483      }
484  
458
485      /**
486       * Offer succeeds if not full; fails if full
487       */
# Line 466 | Line 492 | public class LinkedBlockingDequeTest ext
492      }
493  
494      /**
495 <     * add succeeds if not full; throws ISE if full
495 >     * add succeeds if not full; throws IllegalStateException if full
496       */
497      public void testAdd() {
498 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
499 +        for (int i = 0; i < SIZE; ++i)
500 +            assertTrue(q.add(new Integer(i)));
501 +        assertEquals(0, q.remainingCapacity());
502          try {
473            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
474            for (int i = 0; i < SIZE; ++i) {
475                assertTrue(q.add(new Integer(i)));
476            }
477            assertEquals(0, q.remainingCapacity());
503              q.add(new Integer(SIZE));
504              shouldThrow();
505          } catch (IllegalStateException success) {}
506      }
507  
508      /**
509 <     * addAll(null) throws NPE
485 <     */
486 <    public void testAddAll1() {
487 <        try {
488 <            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
489 <            q.addAll(null);
490 <            shouldThrow();
491 <        } catch (NullPointerException success) {}
492 <    }
493 <
494 <    /**
495 <     * addAll(this) throws IAE
509 >     * addAll(this) throws IllegalArgumentException
510       */
511      public void testAddAllSelf() {
512 +        LinkedBlockingDeque q = populatedDeque(SIZE);
513          try {
499            LinkedBlockingDeque q = populatedDeque(SIZE);
514              q.addAll(q);
515              shouldThrow();
516          } catch (IllegalArgumentException success) {}
517      }
518  
519      /**
506     * addAll of a collection with null elements throws NPE
507     */
508    public void testAddAll2() {
509        try {
510            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
511            Integer[] ints = new Integer[SIZE];
512            q.addAll(Arrays.asList(ints));
513            shouldThrow();
514        } catch (NullPointerException success) {}
515    }
516    /**
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);
523 <            Integer[] ints = new Integer[SIZE];
524 <            for (int i = 0; i < SIZE-1; ++i)
525 <                ints[i] = new Integer(i);
526 <            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);
536 <            Integer[] ints = new Integer[SIZE];
537 <            for (int i = 0; i < SIZE; ++i)
538 <                ints[i] = new Integer(i);
539 <            q.addAll(Arrays.asList(ints));
545 >            q.addAll(elements);
546              shouldThrow();
547          } catch (IllegalStateException success) {}
548      }
# Line 556 | Line 562 | public class LinkedBlockingDequeTest ext
562              assertEquals(ints[i], q.poll());
563      }
564  
559
560    /**
561     * put(null) throws NPE
562     */
563    public void testPutNull() throws InterruptedException {
564        try {
565            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
566            q.put(null);
567            shouldThrow();
568        } catch (NullPointerException success) {}
569    }
570
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 586 | 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 >        assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609 <        t.join();
609 >        awaitTermination(t);
610          assertEquals(SIZE, q.size());
611          assertEquals(0, q.remainingCapacity());
612      }
613  
614      /**
615 <     * put blocks waiting for take when full
615 >     * put blocks interruptibly waiting for take when full
616       */
617      public void testPutWithTake() throws InterruptedException {
618          final int capacity = 2;
619          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
620 <        Thread t = new Thread(new CheckedRunnable() {
620 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
621 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
622 >        Thread t = newStartedThread(new CheckedRunnable() {
623              public void realRun() throws InterruptedException {
624 <                for (int i = 0; i < capacity + 1; i++)
624 >                for (int i = 0; i < capacity; i++)
625                      q.put(i);
626 +                pleaseTake.countDown();
627 +                q.put(86);
628 +
629 +                Thread.currentThread().interrupt();
630                  try {
631                      q.put(99);
632                      shouldThrow();
633                  } catch (InterruptedException success) {}
634 +                assertFalse(Thread.interrupted());
635 +
636 +                pleaseInterrupt.countDown();
637 +                try {
638 +                    q.put(99);
639 +                    shouldThrow();
640 +                } catch (InterruptedException success) {}
641 +                assertFalse(Thread.interrupted());
642              }});
643  
644 <        t.start();
645 <        Thread.sleep(SHORT_DELAY_MS);
627 <        assertEquals(q.remainingCapacity(), 0);
644 >        await(pleaseTake);
645 >        assertEquals(0, q.remainingCapacity());
646          assertEquals(0, q.take());
647 <        Thread.sleep(SHORT_DELAY_MS);
647 >
648 >        await(pleaseInterrupt);
649 >        assertThreadBlocks(t, Thread.State.WAITING);
650          t.interrupt();
651 <        t.join();
652 <        assertEquals(q.remainingCapacity(), 0);
651 >        awaitTermination(t);
652 >        assertEquals(0, q.remainingCapacity());
653      }
654  
655      /**
656       * timed offer times out if full and elements not taken
657       */
658 <    public void testTimedOffer() throws InterruptedException {
658 >    public void testTimedOffer() {
659          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
660 <        Thread t = new Thread(new CheckedRunnable() {
660 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
661 >        Thread t = newStartedThread(new CheckedRunnable() {
662              public void realRun() throws InterruptedException {
663                  q.put(new Object());
664                  q.put(new Object());
665 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
665 >                long startTime = System.nanoTime();
666 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
667 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
668 >
669 >                Thread.currentThread().interrupt();
670                  try {
671 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
671 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
672                      shouldThrow();
673                  } catch (InterruptedException success) {}
674 +                assertFalse(Thread.interrupted());
675 +
676 +                pleaseInterrupt.countDown();
677 +                try {
678 +                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
679 +                    shouldThrow();
680 +                } catch (InterruptedException success) {}
681 +                assertFalse(Thread.interrupted());
682              }});
683  
684 <        t.start();
685 <        Thread.sleep(SMALL_DELAY_MS);
684 >        await(pleaseInterrupt);
685 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
686          t.interrupt();
687 <        t.join();
687 >        awaitTermination(t);
688      }
689  
690      /**
# Line 665 | Line 698 | public class LinkedBlockingDequeTest ext
698      }
699  
700      /**
701 <     * take blocks interruptibly when empty
669 <     */
670 <    public void testTakeFromEmpty() throws InterruptedException {
671 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
672 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
673 <            public void realRun() throws InterruptedException {
674 <                q.take();
675 <            }};
676 <
677 <        t.start();
678 <        Thread.sleep(SHORT_DELAY_MS);
679 <        t.interrupt();
680 <        t.join();
681 <    }
682 <
683 <    /**
684 <     * Take removes existing elements until empty, then blocks interruptibly
701 >     * take removes existing elements until empty, then blocks interruptibly
702       */
703      public void testBlockingTake() throws InterruptedException {
704          final LinkedBlockingDeque q = populatedDeque(SIZE);
705 <        Thread t = new Thread(new CheckedRunnable() {
705 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
706 >        Thread t = newStartedThread(new CheckedRunnable() {
707              public void realRun() throws InterruptedException {
708 <                for (int i = 0; i < SIZE; ++i) {
709 <                    assertEquals(i, q.take());
710 <                }
708 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
709 >
710 >                Thread.currentThread().interrupt();
711                  try {
712                      q.take();
713                      shouldThrow();
714                  } catch (InterruptedException success) {}
715 +                assertFalse(Thread.interrupted());
716 +
717 +                pleaseInterrupt.countDown();
718 +                try {
719 +                    q.take();
720 +                    shouldThrow();
721 +                } catch (InterruptedException success) {}
722 +                assertFalse(Thread.interrupted());
723              }});
724  
725 <        t.start();
726 <        Thread.sleep(SHORT_DELAY_MS);
725 >        await(pleaseInterrupt);
726 >        assertThreadBlocks(t, Thread.State.WAITING);
727          t.interrupt();
728 <        t.join();
728 >        awaitTermination(t);
729      }
730  
705
731      /**
732       * poll succeeds unless empty
733       */
# Line 731 | Line 756 | public class LinkedBlockingDequeTest ext
756      public void testTimedPoll() throws InterruptedException {
757          LinkedBlockingDeque q = populatedDeque(SIZE);
758          for (int i = 0; i < SIZE; ++i) {
759 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
760 <        }
761 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
759 >            long startTime = System.nanoTime();
760 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
761 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
762 >        }
763 >        long startTime = System.nanoTime();
764 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
765 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
766 >        checkEmpty(q);
767      }
768  
769      /**
# Line 741 | Line 771 | public class LinkedBlockingDequeTest ext
771       * returning timeout status
772       */
773      public void testInterruptedTimedPoll() throws InterruptedException {
774 <        Thread t = new Thread(new CheckedRunnable() {
775 <            public void realRun() throws InterruptedException {
776 <                LinkedBlockingDeque q = populatedDeque(SIZE);
777 <                for (int i = 0; i < SIZE; ++i) {
778 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
779 <                }
774 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
775 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
776 >        Thread t = newStartedThread(new CheckedRunnable() {
777 >            public void realRun() throws InterruptedException {
778 >                long startTime = System.nanoTime();
779 >                for (int i = 0; i < SIZE; i++)
780 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
781 >
782 >                Thread.currentThread().interrupt();
783                  try {
784 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
784 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
785                      shouldThrow();
786                  } catch (InterruptedException success) {}
787 <            }});
755 <
756 <        t.start();
757 <        Thread.sleep(SHORT_DELAY_MS);
758 <        t.interrupt();
759 <        t.join();
760 <    }
787 >                assertFalse(Thread.interrupted());
788  
789 <    /**
763 <     *  timed poll before a delayed offer fails; after offer succeeds;
764 <     *  on interruption throws
765 <     */
766 <    public void testTimedPollWithOffer() throws InterruptedException {
767 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
768 <        Thread t = new Thread(new CheckedRunnable() {
769 <            public void realRun() throws InterruptedException {
770 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
771 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
789 >                pleaseInterrupt.countDown();
790                  try {
791                      q.poll(LONG_DELAY_MS, MILLISECONDS);
792                      shouldThrow();
793                  } catch (InterruptedException success) {}
794 +                assertFalse(Thread.interrupted());
795 +
796 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
797              }});
798  
799 <        t.start();
800 <        Thread.sleep(SMALL_DELAY_MS);
780 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
799 >        await(pleaseInterrupt);
800 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
801          t.interrupt();
802 <        t.join();
802 >        awaitTermination(t);
803 >        checkEmpty(q);
804      }
805  
785
806      /**
807       * putFirst(null) throws NPE
808       */
809 <     public void testPutFirstNull() throws InterruptedException {
809 >    public void testPutFirstNull() throws InterruptedException {
810 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
811          try {
791            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
812              q.putFirst(null);
813              shouldThrow();
814          } catch (NullPointerException success) {}
815 <     }
815 >    }
816  
817      /**
818       * all elements successfully putFirst are contained
819       */
820 <     public void testPutFirst() throws InterruptedException {
821 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
822 <         for (int i = 0; i < SIZE; ++i) {
823 <             Integer I = new Integer(i);
824 <             q.putFirst(I);
825 <             assertTrue(q.contains(I));
826 <         }
827 <         assertEquals(0, q.remainingCapacity());
820 >    public void testPutFirst() throws InterruptedException {
821 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
822 >        for (int i = 0; i < SIZE; ++i) {
823 >            Integer x = new Integer(i);
824 >            q.putFirst(x);
825 >            assertTrue(q.contains(x));
826 >        }
827 >        assertEquals(0, q.remainingCapacity());
828      }
829  
830      /**
# Line 812 | Line 832 | public class LinkedBlockingDequeTest ext
832       */
833      public void testBlockingPutFirst() throws InterruptedException {
834          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
835 <        Thread t = new Thread(new CheckedRunnable() {
835 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
836 >        Thread t = newStartedThread(new CheckedRunnable() {
837              public void realRun() throws InterruptedException {
838                  for (int i = 0; i < SIZE; ++i)
839                      q.putFirst(i);
840                  assertEquals(SIZE, q.size());
841                  assertEquals(0, q.remainingCapacity());
842 +
843 +                Thread.currentThread().interrupt();
844                  try {
845                      q.putFirst(99);
846                      shouldThrow();
847                  } catch (InterruptedException success) {}
848 +                assertFalse(Thread.interrupted());
849 +
850 +                pleaseInterrupt.countDown();
851 +                try {
852 +                    q.putFirst(99);
853 +                    shouldThrow();
854 +                } catch (InterruptedException success) {}
855 +                assertFalse(Thread.interrupted());
856              }});
857  
858 <        t.start();
859 <        Thread.sleep(SHORT_DELAY_MS);
858 >        await(pleaseInterrupt);
859 >        assertThreadBlocks(t, Thread.State.WAITING);
860          t.interrupt();
861 <        t.join();
861 >        awaitTermination(t);
862          assertEquals(SIZE, q.size());
863          assertEquals(0, q.remainingCapacity());
864      }
865  
866      /**
867 <     * putFirst blocks waiting for take when full
867 >     * putFirst blocks interruptibly waiting for take when full
868       */
869      public void testPutFirstWithTake() throws InterruptedException {
870          final int capacity = 2;
871          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
872 <        Thread t = new Thread(new CheckedRunnable() {
872 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
873 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
874 >        Thread t = newStartedThread(new CheckedRunnable() {
875              public void realRun() throws InterruptedException {
876 <                for (int i = 0; i < capacity + 1; i++)
876 >                for (int i = 0; i < capacity; i++)
877                      q.putFirst(i);
878 +                pleaseTake.countDown();
879 +                q.putFirst(86);
880 +
881 +                pleaseInterrupt.countDown();
882                  try {
883                      q.putFirst(99);
884                      shouldThrow();
885                  } catch (InterruptedException success) {}
886 +                assertFalse(Thread.interrupted());
887              }});
888  
889 <        t.start();
890 <        Thread.sleep(SHORT_DELAY_MS);
853 <        assertEquals(q.remainingCapacity(), 0);
889 >        await(pleaseTake);
890 >        assertEquals(0, q.remainingCapacity());
891          assertEquals(capacity - 1, q.take());
892 <        Thread.sleep(SHORT_DELAY_MS);
892 >
893 >        await(pleaseInterrupt);
894 >        assertThreadBlocks(t, Thread.State.WAITING);
895          t.interrupt();
896 <        t.join();
897 <        assertEquals(q.remainingCapacity(), 0);
896 >        awaitTermination(t);
897 >        assertEquals(0, q.remainingCapacity());
898      }
899  
900      /**
901       * timed offerFirst times out if full and elements not taken
902       */
903 <    public void testTimedOfferFirst() throws InterruptedException {
903 >    public void testTimedOfferFirst() {
904          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
905 <        Thread t = new Thread(new CheckedRunnable() {
905 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
906 >        Thread t = newStartedThread(new CheckedRunnable() {
907              public void realRun() throws InterruptedException {
908                  q.putFirst(new Object());
909                  q.putFirst(new Object());
910 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
910 >                long startTime = System.nanoTime();
911 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
912 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
913 >
914 >                Thread.currentThread().interrupt();
915 >                try {
916 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
917 >                    shouldThrow();
918 >                } catch (InterruptedException success) {}
919 >                assertFalse(Thread.interrupted());
920 >
921 >                pleaseInterrupt.countDown();
922                  try {
923 <                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
923 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
924                      shouldThrow();
925                  } catch (InterruptedException success) {}
926 +                assertFalse(Thread.interrupted());
927              }});
928  
929 <        t.start();
930 <        Thread.sleep(SMALL_DELAY_MS);
929 >        await(pleaseInterrupt);
930 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
931          t.interrupt();
932 <        t.join();
932 >        awaitTermination(t);
933      }
934  
935      /**
# Line 891 | Line 943 | public class LinkedBlockingDequeTest ext
943      }
944  
945      /**
946 <     * takeFirst blocks interruptibly when empty
946 >     * takeFirst() blocks interruptibly when empty
947       */
948 <    public void testTakeFirstFromEmpty() throws InterruptedException {
949 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
950 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
951 <            public void realRun() throws InterruptedException {
952 <                q.takeFirst();
953 <            }};
948 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
949 >        final BlockingDeque q = new LinkedBlockingDeque();
950 >        final CountDownLatch threadStarted = new CountDownLatch(1);
951 >        Thread t = newStartedThread(new CheckedRunnable() {
952 >            public void realRun() {
953 >                threadStarted.countDown();
954 >                try {
955 >                    q.takeFirst();
956 >                    shouldThrow();
957 >                } catch (InterruptedException success) {}
958 >                assertFalse(Thread.interrupted());
959 >            }});
960  
961 <        t.start();
962 <        Thread.sleep(SHORT_DELAY_MS);
961 >        await(threadStarted);
962 >        assertThreadBlocks(t, Thread.State.WAITING);
963          t.interrupt();
964 <        t.join();
964 >        awaitTermination(t);
965 >    }
966 >
967 >    /**
968 >     * takeFirst() throws InterruptedException immediately if interrupted
969 >     * before waiting
970 >     */
971 >    public void testTakeFirstFromEmptyAfterInterrupt() {
972 >        final BlockingDeque q = new LinkedBlockingDeque();
973 >        Thread t = newStartedThread(new CheckedRunnable() {
974 >            public void realRun() {
975 >                Thread.currentThread().interrupt();
976 >                try {
977 >                    q.takeFirst();
978 >                    shouldThrow();
979 >                } catch (InterruptedException success) {}
980 >                assertFalse(Thread.interrupted());
981 >            }});
982 >
983 >        awaitTermination(t);
984 >    }
985 >
986 >    /**
987 >     * takeLast() blocks interruptibly when empty
988 >     */
989 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
990 >        final BlockingDeque q = new LinkedBlockingDeque();
991 >        final CountDownLatch threadStarted = new CountDownLatch(1);
992 >        Thread t = newStartedThread(new CheckedRunnable() {
993 >            public void realRun() {
994 >                threadStarted.countDown();
995 >                try {
996 >                    q.takeLast();
997 >                    shouldThrow();
998 >                } catch (InterruptedException success) {}
999 >                assertFalse(Thread.interrupted());
1000 >            }});
1001 >
1002 >        await(threadStarted);
1003 >        assertThreadBlocks(t, Thread.State.WAITING);
1004 >        t.interrupt();
1005 >        awaitTermination(t);
1006 >    }
1007 >
1008 >    /**
1009 >     * takeLast() throws InterruptedException immediately if interrupted
1010 >     * before waiting
1011 >     */
1012 >    public void testTakeLastFromEmptyAfterInterrupt() {
1013 >        final BlockingDeque q = new LinkedBlockingDeque();
1014 >        Thread t = newStartedThread(new CheckedRunnable() {
1015 >            public void realRun() {
1016 >                Thread.currentThread().interrupt();
1017 >                try {
1018 >                    q.takeLast();
1019 >                    shouldThrow();
1020 >                } catch (InterruptedException success) {}
1021 >                assertFalse(Thread.interrupted());
1022 >            }});
1023 >
1024 >        awaitTermination(t);
1025      }
1026  
1027      /**
1028 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
1028 >     * takeFirst removes existing elements until empty, then blocks interruptibly
1029       */
1030      public void testBlockingTakeFirst() throws InterruptedException {
1031          final LinkedBlockingDeque q = populatedDeque(SIZE);
1032 <        Thread t = new Thread(new CheckedRunnable() {
1032 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1033 >        Thread t = newStartedThread(new CheckedRunnable() {
1034              public void realRun() throws InterruptedException {
1035 <                for (int i = 0; i < SIZE; ++i)
1036 <                    assertEquals(i, q.takeFirst());
1035 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1036 >
1037 >                Thread.currentThread().interrupt();
1038 >                try {
1039 >                    q.takeFirst();
1040 >                    shouldThrow();
1041 >                } catch (InterruptedException success) {}
1042 >                assertFalse(Thread.interrupted());
1043 >
1044 >                pleaseInterrupt.countDown();
1045                  try {
1046                      q.takeFirst();
1047                      shouldThrow();
1048                  } catch (InterruptedException success) {}
1049 +                assertFalse(Thread.interrupted());
1050              }});
1051  
1052 <        t.start();
1053 <        Thread.sleep(SHORT_DELAY_MS);
1052 >        await(pleaseInterrupt);
1053 >        assertThreadBlocks(t, Thread.State.WAITING);
1054          t.interrupt();
1055 <        t.join();
1055 >        awaitTermination(t);
1056      }
1057  
930
1058      /**
1059       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1060       */
# Line 945 | Line 1072 | public class LinkedBlockingDequeTest ext
1072      public void testTimedPollFirst() throws InterruptedException {
1073          LinkedBlockingDeque q = populatedDeque(SIZE);
1074          for (int i = 0; i < SIZE; ++i) {
1075 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1076 <        }
1077 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1075 >            long startTime = System.nanoTime();
1076 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1077 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1078 >        }
1079 >        long startTime = System.nanoTime();
1080 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1081 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1082 >        checkEmpty(q);
1083      }
1084  
1085      /**
# Line 955 | Line 1087 | public class LinkedBlockingDequeTest ext
1087       * returning timeout status
1088       */
1089      public void testInterruptedTimedPollFirst() throws InterruptedException {
1090 <        Thread t = new Thread(new CheckedRunnable() {
1090 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1091 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1092 >        Thread t = newStartedThread(new CheckedRunnable() {
1093              public void realRun() throws InterruptedException {
1094 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1095 <                for (int i = 0; i < SIZE; ++i) {
1096 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1097 <                }
1094 >                long startTime = System.nanoTime();
1095 >                for (int i = 0; i < SIZE; i++)
1096 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1097 >
1098 >                Thread.currentThread().interrupt();
1099                  try {
1100 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1100 >                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1101                      shouldThrow();
1102                  } catch (InterruptedException success) {}
1103 +                assertFalse(Thread.interrupted());
1104 +
1105 +                pleaseInterrupt.countDown();
1106 +                try {
1107 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1108 +                    shouldThrow();
1109 +                } catch (InterruptedException success) {}
1110 +                assertFalse(Thread.interrupted());
1111 +
1112 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1113              }});
1114  
1115 <        t.start();
1116 <        Thread.sleep(SHORT_DELAY_MS);
1115 >        await(pleaseInterrupt);
1116 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1117          t.interrupt();
1118 <        t.join();
1118 >        awaitTermination(t);
1119      }
1120  
1121      /**
1122 <     *  timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1123 <     *  on interruption throws
1122 >     * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1123 >     * on interruption throws
1124       */
1125      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1126          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1127 <        Thread t = new Thread(new CheckedRunnable() {
1127 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1128 >        Thread t = newStartedThread(new CheckedRunnable() {
1129              public void realRun() throws InterruptedException {
1130 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1130 >                long startTime = System.nanoTime();
1131 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1132 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1133 >
1134 >                barrier.await();
1135 >
1136                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1137 +
1138 +                Thread.currentThread().interrupt();
1139 +                try {
1140 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1141 +                    shouldThrow();
1142 +                } catch (InterruptedException success) {}
1143 +
1144 +                barrier.await();
1145                  try {
1146                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1147                      shouldThrow();
1148                  } catch (InterruptedException success) {}
1149 +                assertFalse(Thread.interrupted());
1150 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1151              }});
1152  
1153 <        t.start();
1154 <        Thread.sleep(SMALL_DELAY_MS);
1155 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1153 >        barrier.await();
1154 >        long startTime = System.nanoTime();
1155 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1156 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1157 >        barrier.await();
1158 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1159          t.interrupt();
1160 <        t.join();
1160 >        awaitTermination(t);
1161      }
1162  
1163      /**
1164       * putLast(null) throws NPE
1165       */
1166 <     public void testPutLastNull() throws InterruptedException {
1166 >    public void testPutLastNull() throws InterruptedException {
1167 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1168          try {
1004            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1169              q.putLast(null);
1170              shouldThrow();
1171          } catch (NullPointerException success) {}
1172 <     }
1172 >    }
1173  
1174      /**
1175       * all elements successfully putLast are contained
1176       */
1177 <     public void testPutLast() throws InterruptedException {
1178 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1179 <         for (int i = 0; i < SIZE; ++i) {
1180 <             Integer I = new Integer(i);
1181 <             q.putLast(I);
1182 <             assertTrue(q.contains(I));
1183 <         }
1184 <         assertEquals(0, q.remainingCapacity());
1177 >    public void testPutLast() throws InterruptedException {
1178 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1179 >        for (int i = 0; i < SIZE; ++i) {
1180 >            Integer x = new Integer(i);
1181 >            q.putLast(x);
1182 >            assertTrue(q.contains(x));
1183 >        }
1184 >        assertEquals(0, q.remainingCapacity());
1185      }
1186  
1187      /**
# Line 1025 | Line 1189 | public class LinkedBlockingDequeTest ext
1189       */
1190      public void testBlockingPutLast() throws InterruptedException {
1191          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1192 <        Thread t = new Thread(new CheckedRunnable() {
1192 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1193 >        Thread t = newStartedThread(new CheckedRunnable() {
1194              public void realRun() throws InterruptedException {
1195                  for (int i = 0; i < SIZE; ++i)
1196                      q.putLast(i);
1197                  assertEquals(SIZE, q.size());
1198                  assertEquals(0, q.remainingCapacity());
1199 +
1200 +                Thread.currentThread().interrupt();
1201                  try {
1202                      q.putLast(99);
1203                      shouldThrow();
1204                  } catch (InterruptedException success) {}
1205 +                assertFalse(Thread.interrupted());
1206 +
1207 +                pleaseInterrupt.countDown();
1208 +                try {
1209 +                    q.putLast(99);
1210 +                    shouldThrow();
1211 +                } catch (InterruptedException success) {}
1212 +                assertFalse(Thread.interrupted());
1213              }});
1214  
1215 <        t.start();
1216 <        Thread.sleep(SHORT_DELAY_MS);
1215 >        await(pleaseInterrupt);
1216 >        assertThreadBlocks(t, Thread.State.WAITING);
1217          t.interrupt();
1218 <        t.join();
1218 >        awaitTermination(t);
1219          assertEquals(SIZE, q.size());
1220          assertEquals(0, q.remainingCapacity());
1221      }
1222  
1223      /**
1224 <     * putLast blocks waiting for take when full
1224 >     * putLast blocks interruptibly waiting for take when full
1225       */
1226      public void testPutLastWithTake() throws InterruptedException {
1227          final int capacity = 2;
1228          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1229 <        Thread t = new Thread(new CheckedRunnable() {
1229 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1230 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1231 >        Thread t = newStartedThread(new CheckedRunnable() {
1232              public void realRun() throws InterruptedException {
1233 <                for (int i = 0; i < capacity + 1; i++)
1233 >                for (int i = 0; i < capacity; i++)
1234                      q.putLast(i);
1235 +                pleaseTake.countDown();
1236 +                q.putLast(86);
1237 +
1238 +                Thread.currentThread().interrupt();
1239 +                try {
1240 +                    q.putLast(99);
1241 +                    shouldThrow();
1242 +                } catch (InterruptedException success) {}
1243 +                assertFalse(Thread.interrupted());
1244 +
1245 +                pleaseInterrupt.countDown();
1246                  try {
1247                      q.putLast(99);
1248                      shouldThrow();
1249                  } catch (InterruptedException success) {}
1250 +                assertFalse(Thread.interrupted());
1251              }});
1252  
1253 <        t.start();
1254 <        Thread.sleep(SHORT_DELAY_MS);
1066 <        assertEquals(q.remainingCapacity(), 0);
1253 >        await(pleaseTake);
1254 >        assertEquals(0, q.remainingCapacity());
1255          assertEquals(0, q.take());
1256 <        Thread.sleep(SHORT_DELAY_MS);
1256 >
1257 >        await(pleaseInterrupt);
1258 >        assertThreadBlocks(t, Thread.State.WAITING);
1259          t.interrupt();
1260 <        t.join();
1261 <        assertEquals(q.remainingCapacity(), 0);
1260 >        awaitTermination(t);
1261 >        assertEquals(0, q.remainingCapacity());
1262      }
1263  
1264      /**
1265       * timed offerLast times out if full and elements not taken
1266       */
1267 <    public void testTimedOfferLast() throws InterruptedException {
1267 >    public void testTimedOfferLast() {
1268          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1269 <        Thread t = new Thread(new CheckedRunnable() {
1269 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1270 >        Thread t = newStartedThread(new CheckedRunnable() {
1271              public void realRun() throws InterruptedException {
1272                  q.putLast(new Object());
1273                  q.putLast(new Object());
1274 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1274 >                long startTime = System.nanoTime();
1275 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1276 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1277 >
1278 >                Thread.currentThread().interrupt();
1279                  try {
1280 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1280 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1281 >                    shouldThrow();
1282 >                } catch (InterruptedException success) {}
1283 >
1284 >                pleaseInterrupt.countDown();
1285 >                try {
1286 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1287                      shouldThrow();
1288                  } catch (InterruptedException success) {}
1289              }});
1290  
1291 <        t.start();
1292 <        Thread.sleep(SMALL_DELAY_MS);
1291 >        await(pleaseInterrupt);
1292 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1293          t.interrupt();
1294 <        t.join();
1294 >        awaitTermination(t);
1295      }
1296  
1297      /**
# Line 1099 | Line 1300 | public class LinkedBlockingDequeTest ext
1300      public void testTakeLast() throws InterruptedException {
1301          LinkedBlockingDeque q = populatedDeque(SIZE);
1302          for (int i = 0; i < SIZE; ++i) {
1303 <            assertEquals(SIZE-i-1, q.takeLast());
1303 >            assertEquals(SIZE - i - 1, q.takeLast());
1304          }
1305      }
1306  
1307      /**
1308 <     * takeLast blocks interruptibly when empty
1108 <     */
1109 <    public void testTakeLastFromEmpty() throws InterruptedException {
1110 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1111 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1112 <            public void realRun() throws InterruptedException {
1113 <                q.takeLast();
1114 <            }};
1115 <
1116 <        t.start();
1117 <        Thread.sleep(SHORT_DELAY_MS);
1118 <        t.interrupt();
1119 <        t.join();
1120 <    }
1121 <
1122 <    /**
1123 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1308 >     * takeLast removes existing elements until empty, then blocks interruptibly
1309       */
1310      public void testBlockingTakeLast() throws InterruptedException {
1311          final LinkedBlockingDeque q = populatedDeque(SIZE);
1312 <        Thread t = new Thread(new CheckedRunnable() {
1312 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1313 >        Thread t = newStartedThread(new CheckedRunnable() {
1314              public void realRun() throws InterruptedException {
1315 <                for (int i = 0; i < SIZE; ++i)
1316 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1315 >                for (int i = 0; i < SIZE; i++)
1316 >                    assertEquals(SIZE - i - 1, q.takeLast());
1317 >
1318 >                Thread.currentThread().interrupt();
1319                  try {
1320                      q.takeLast();
1321                      shouldThrow();
1322                  } catch (InterruptedException success) {}
1323 +                assertFalse(Thread.interrupted());
1324 +
1325 +                pleaseInterrupt.countDown();
1326 +                try {
1327 +                    q.takeLast();
1328 +                    shouldThrow();
1329 +                } catch (InterruptedException success) {}
1330 +                assertFalse(Thread.interrupted());
1331              }});
1332  
1333 <        t.start();
1334 <        Thread.sleep(SHORT_DELAY_MS);
1333 >        await(pleaseInterrupt);
1334 >        assertThreadBlocks(t, Thread.State.WAITING);
1335          t.interrupt();
1336 <        t.join();
1336 >        awaitTermination(t);
1337      }
1338  
1339      /**
# Line 1146 | Line 1342 | public class LinkedBlockingDequeTest ext
1342      public void testTimedPollLast0() throws InterruptedException {
1343          LinkedBlockingDeque q = populatedDeque(SIZE);
1344          for (int i = 0; i < SIZE; ++i) {
1345 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1345 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1346          }
1347          assertNull(q.pollLast(0, MILLISECONDS));
1348      }
# Line 1157 | Line 1353 | public class LinkedBlockingDequeTest ext
1353      public void testTimedPollLast() throws InterruptedException {
1354          LinkedBlockingDeque q = populatedDeque(SIZE);
1355          for (int i = 0; i < SIZE; ++i) {
1356 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1357 <        }
1358 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1356 >            long startTime = System.nanoTime();
1357 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1358 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1359 >        }
1360 >        long startTime = System.nanoTime();
1361 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1362 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1363 >        checkEmpty(q);
1364      }
1365  
1366      /**
# Line 1167 | Line 1368 | public class LinkedBlockingDequeTest ext
1368       * returning timeout status
1369       */
1370      public void testInterruptedTimedPollLast() throws InterruptedException {
1371 <        Thread t = new Thread(new CheckedRunnable() {
1371 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1372 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1373 >        Thread t = newStartedThread(new CheckedRunnable() {
1374              public void realRun() throws InterruptedException {
1375 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1376 <                for (int i = 0; i < SIZE; ++i) {
1377 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1378 <                }
1375 >                long startTime = System.nanoTime();
1376 >                for (int i = 0; i < SIZE; i++)
1377 >                    assertEquals(SIZE - i - 1,
1378 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1379 >
1380 >                Thread.currentThread().interrupt();
1381                  try {
1382 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1382 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1383                      shouldThrow();
1384                  } catch (InterruptedException success) {}
1385 +                assertFalse(Thread.interrupted());
1386 +
1387 +                pleaseInterrupt.countDown();
1388 +                try {
1389 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1390 +                    shouldThrow();
1391 +                } catch (InterruptedException success) {}
1392 +                assertFalse(Thread.interrupted());
1393 +
1394 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1395              }});
1396  
1397 <        t.start();
1398 <        Thread.sleep(SHORT_DELAY_MS);
1397 >        await(pleaseInterrupt);
1398 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1399          t.interrupt();
1400 <        t.join();
1400 >        awaitTermination(t);
1401 >        checkEmpty(q);
1402      }
1403  
1404      /**
1405 <     *  timed poll before a delayed offerLast fails; after offerLast succeeds;
1406 <     *  on interruption throws
1405 >     * timed poll before a delayed offerLast fails; after offerLast succeeds;
1406 >     * on interruption throws
1407       */
1408      public void testTimedPollWithOfferLast() throws InterruptedException {
1409          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1410 <        Thread t = new Thread(new CheckedRunnable() {
1410 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1411 >        Thread t = newStartedThread(new CheckedRunnable() {
1412              public void realRun() throws InterruptedException {
1413 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1413 >                long startTime = System.nanoTime();
1414 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1415 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1416 >
1417 >                barrier.await();
1418 >
1419                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1420 +
1421 +                Thread.currentThread().interrupt();
1422 +                try {
1423 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1424 +                    shouldThrow();
1425 +                } catch (InterruptedException success) {}
1426 +                assertFalse(Thread.interrupted());
1427 +
1428 +                barrier.await();
1429                  try {
1430                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1431                      shouldThrow();
1432                  } catch (InterruptedException success) {}
1433 +                assertFalse(Thread.interrupted());
1434 +
1435 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1436              }});
1437  
1438 <        t.start();
1439 <        Thread.sleep(SMALL_DELAY_MS);
1440 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1438 >        barrier.await();
1439 >        long startTime = System.nanoTime();
1440 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1441 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1442 >
1443 >        barrier.await();
1444 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1445          t.interrupt();
1446 <        t.join();
1446 >        awaitTermination(t);
1447      }
1448  
1211
1449      /**
1450       * element returns next element, or throws NSEE if empty
1451       */
# Line 1225 | Line 1462 | public class LinkedBlockingDequeTest ext
1462      }
1463  
1464      /**
1228     * remove(x) removes x and returns true if present
1229     */
1230    public void testRemoveElement() {
1231        LinkedBlockingDeque q = populatedDeque(SIZE);
1232        for (int i = 1; i < SIZE; i+=2) {
1233            assertTrue(q.remove(new Integer(i)));
1234        }
1235        for (int i = 0; i < SIZE; i+=2) {
1236            assertTrue(q.remove(new Integer(i)));
1237            assertFalse(q.remove(new Integer(i+1)));
1238        }
1239        assertTrue(q.isEmpty());
1240    }
1241
1242    /**
1465       * contains(x) reports true when elements added but not yet removed
1466       */
1467      public void testContains() {
# Line 1295 | Line 1517 | public class LinkedBlockingDequeTest ext
1517                  assertTrue(changed);
1518  
1519              assertTrue(q.containsAll(p));
1520 <            assertEquals(SIZE-i, q.size());
1520 >            assertEquals(SIZE - i, q.size());
1521              p.remove();
1522          }
1523      }
# Line 1308 | Line 1530 | public class LinkedBlockingDequeTest ext
1530              LinkedBlockingDeque q = populatedDeque(SIZE);
1531              LinkedBlockingDeque p = populatedDeque(i);
1532              assertTrue(q.removeAll(p));
1533 <            assertEquals(SIZE-i, q.size());
1533 >            assertEquals(SIZE - i, q.size());
1534              for (int j = 0; j < i; ++j) {
1535 <                Integer I = (Integer)(p.remove());
1536 <                assertFalse(q.contains(I));
1535 >                Integer x = (Integer)(p.remove());
1536 >                assertFalse(q.contains(x));
1537              }
1538          }
1539      }
1540  
1541      /**
1542 <     * toArray contains all elements
1542 >     * toArray contains all elements in FIFO order
1543       */
1544 <    public void testToArray() throws InterruptedException{
1544 >    public void testToArray() throws InterruptedException {
1545          LinkedBlockingDeque q = populatedDeque(SIZE);
1546 <        Object[] o = q.toArray();
1547 <        for (int i = 0; i < o.length; i++)
1548 <            assertEquals(o[i], q.take());
1546 >        Object[] a = q.toArray();
1547 >        assertSame(Object[].class, a.getClass());
1548 >        for (Object o : a)
1549 >            assertSame(o, q.poll());
1550 >        assertTrue(q.isEmpty());
1551      }
1552  
1553      /**
1554 <     * toArray(a) contains all elements
1554 >     * toArray(a) contains all elements in FIFO order
1555       */
1556 <    public void testToArray2() throws InterruptedException {
1557 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1556 >    public void testToArray2() {
1557 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1558          Integer[] ints = new Integer[SIZE];
1559 <        ints = (Integer[])q.toArray(ints);
1560 <        for (int i = 0; i < ints.length; i++)
1561 <            assertEquals(ints[i], q.take());
1562 <    }
1563 <
1340 <    /**
1341 <     * toArray(null) throws NPE
1342 <     */
1343 <    public void testToArray_BadArg() {
1344 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1345 <        try {
1346 <            Object o[] = q.toArray(null);
1347 <            shouldThrow();
1348 <        } catch (NullPointerException success) {}
1559 >        Integer[] array = q.toArray(ints);
1560 >        assertSame(ints, array);
1561 >        for (Integer o : ints)
1562 >            assertSame(o, q.remove());
1563 >        assertTrue(q.isEmpty());
1564      }
1565  
1566      /**
1567 <     * toArray with incompatible array type throws CCE
1567 >     * toArray(incompatible array type) throws ArrayStoreException
1568       */
1569      public void testToArray1_BadArg() {
1570          LinkedBlockingDeque q = populatedDeque(SIZE);
1571          try {
1572 <            Object o[] = q.toArray(new String[10]);
1572 >            q.toArray(new String[10]);
1573              shouldThrow();
1574          } catch (ArrayStoreException success) {}
1575      }
1576  
1362
1577      /**
1578       * iterator iterates through all elements
1579       */
1580      public void testIterator() throws InterruptedException {
1581          LinkedBlockingDeque q = populatedDeque(SIZE);
1582          Iterator it = q.iterator();
1583 <        while (it.hasNext()) {
1583 >        int i;
1584 >        for (i = 0; it.hasNext(); i++)
1585 >            assertTrue(q.contains(it.next()));
1586 >        assertEquals(i, SIZE);
1587 >        assertIteratorExhausted(it);
1588 >
1589 >        it = q.iterator();
1590 >        for (i = 0; it.hasNext(); i++)
1591              assertEquals(it.next(), q.take());
1592 <        }
1592 >        assertEquals(i, SIZE);
1593 >        assertIteratorExhausted(it);
1594 >    }
1595 >
1596 >    /**
1597 >     * iterator of empty collection has no elements
1598 >     */
1599 >    public void testEmptyIterator() {
1600 >        Deque c = new LinkedBlockingDeque();
1601 >        assertIteratorExhausted(c.iterator());
1602 >        assertIteratorExhausted(c.descendingIterator());
1603      }
1604  
1605      /**
# Line 1390 | Line 1621 | public class LinkedBlockingDequeTest ext
1621          assertFalse(it.hasNext());
1622      }
1623  
1393
1624      /**
1625       * iterator ordering is FIFO
1626       */
# Line 1422 | Line 1652 | public class LinkedBlockingDequeTest ext
1652          assertEquals(0, q.size());
1653      }
1654  
1425
1655      /**
1656 <     *  Descending iterator iterates through all elements
1656 >     * Descending iterator iterates through all elements
1657       */
1658      public void testDescendingIterator() {
1659          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 1443 | Line 1672 | public class LinkedBlockingDequeTest ext
1672      }
1673  
1674      /**
1675 <     *  Descending iterator ordering is reverse FIFO
1675 >     * Descending iterator ordering is reverse FIFO
1676       */
1677      public void testDescendingIteratorOrdering() {
1678          final LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1485 | Line 1714 | public class LinkedBlockingDequeTest ext
1714          }
1715      }
1716  
1488
1717      /**
1718       * toString contains toStrings of elements
1719       */
# Line 1493 | Line 1721 | public class LinkedBlockingDequeTest ext
1721          LinkedBlockingDeque q = populatedDeque(SIZE);
1722          String s = q.toString();
1723          for (int i = 0; i < SIZE; ++i) {
1724 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1724 >            assertTrue(s.contains(String.valueOf(i)));
1725          }
1726      }
1727  
1500
1728      /**
1729       * offer transfers elements across Executor tasks
1730       */
# Line 1505 | Line 1732 | public class LinkedBlockingDequeTest ext
1732          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1733          q.add(one);
1734          q.add(two);
1735 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1736 <        executor.execute(new CheckedRunnable() {
1737 <            public void realRun() throws InterruptedException {
1738 <                assertFalse(q.offer(three));
1739 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1740 <                assertEquals(0, q.remainingCapacity());
1741 <            }});
1742 <
1743 <        executor.execute(new CheckedRunnable() {
1744 <            public void realRun() throws InterruptedException {
1745 <                Thread.sleep(SMALL_DELAY_MS);
1746 <                assertSame(one, q.take());
1747 <            }});
1748 <
1749 <        joinPool(executor);
1735 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1736 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1737 >        try (PoolCleaner cleaner = cleaner(executor)) {
1738 >            executor.execute(new CheckedRunnable() {
1739 >                public void realRun() throws InterruptedException {
1740 >                    assertFalse(q.offer(three));
1741 >                    threadsStarted.await();
1742 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1743 >                    assertEquals(0, q.remainingCapacity());
1744 >                }});
1745 >
1746 >            executor.execute(new CheckedRunnable() {
1747 >                public void realRun() throws InterruptedException {
1748 >                    threadsStarted.await();
1749 >                    assertSame(one, q.take());
1750 >                }});
1751 >        }
1752      }
1753  
1754      /**
1755 <     * poll retrieves elements across Executor threads
1755 >     * timed poll retrieves elements across Executor threads
1756       */
1757      public void testPollInExecutor() {
1758          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1759 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1760 <        executor.execute(new CheckedRunnable() {
1761 <            public void realRun() throws InterruptedException {
1762 <                assertNull(q.poll());
1763 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1764 <                assertTrue(q.isEmpty());
1765 <            }});
1766 <
1767 <        executor.execute(new CheckedRunnable() {
1768 <            public void realRun() throws InterruptedException {
1769 <                Thread.sleep(SMALL_DELAY_MS);
1770 <                q.put(one);
1771 <            }});
1772 <
1773 <        joinPool(executor);
1759 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1760 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1761 >        try (PoolCleaner cleaner = cleaner(executor)) {
1762 >            executor.execute(new CheckedRunnable() {
1763 >                public void realRun() throws InterruptedException {
1764 >                    assertNull(q.poll());
1765 >                    threadsStarted.await();
1766 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1767 >                    checkEmpty(q);
1768 >                }});
1769 >
1770 >            executor.execute(new CheckedRunnable() {
1771 >                public void realRun() throws InterruptedException {
1772 >                    threadsStarted.await();
1773 >                    q.put(one);
1774 >                }});
1775 >        }
1776      }
1777  
1778      /**
1779 <     * A deserialized serialized deque has same elements in same order
1779 >     * A deserialized/reserialized deque has same elements in same order
1780       */
1781      public void testSerialization() throws Exception {
1782 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1783 <
1553 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1554 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1555 <        out.writeObject(q);
1556 <        out.close();
1782 >        Queue x = populatedDeque(SIZE);
1783 >        Queue y = serialClone(x);
1784  
1785 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1786 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1787 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1788 <        assertEquals(q.size(), r.size());
1789 <        while (!q.isEmpty())
1790 <            assertEquals(q.remove(), r.remove());
1791 <    }
1792 <
1793 <    /**
1567 <     * drainTo(null) throws NPE
1568 <     */
1569 <    public void testDrainToNull() {
1570 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1571 <        try {
1572 <            q.drainTo(null);
1573 <            shouldThrow();
1574 <        } catch (NullPointerException success) {}
1575 <    }
1576 <
1577 <    /**
1578 <     * drainTo(this) throws IAE
1579 <     */
1580 <    public void testDrainToSelf() {
1581 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1582 <        try {
1583 <            q.drainTo(q);
1584 <            shouldThrow();
1585 <        } catch (IllegalArgumentException success) {}
1785 >        assertNotSame(y, x);
1786 >        assertEquals(x.size(), y.size());
1787 >        assertEquals(x.toString(), y.toString());
1788 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1789 >        while (!x.isEmpty()) {
1790 >            assertFalse(y.isEmpty());
1791 >            assertEquals(x.remove(), y.remove());
1792 >        }
1793 >        assertTrue(y.isEmpty());
1794      }
1795  
1796      /**
# Line 1592 | Line 1800 | public class LinkedBlockingDequeTest ext
1800          LinkedBlockingDeque q = populatedDeque(SIZE);
1801          ArrayList l = new ArrayList();
1802          q.drainTo(l);
1803 <        assertEquals(q.size(), 0);
1804 <        assertEquals(l.size(), SIZE);
1803 >        assertEquals(0, q.size());
1804 >        assertEquals(SIZE, l.size());
1805          for (int i = 0; i < SIZE; ++i)
1806              assertEquals(l.get(i), new Integer(i));
1807          q.add(zero);
# Line 1603 | Line 1811 | public class LinkedBlockingDequeTest ext
1811          assertTrue(q.contains(one));
1812          l.clear();
1813          q.drainTo(l);
1814 <        assertEquals(q.size(), 0);
1815 <        assertEquals(l.size(), 2);
1814 >        assertEquals(0, q.size());
1815 >        assertEquals(2, l.size());
1816          for (int i = 0; i < 2; ++i)
1817              assertEquals(l.get(i), new Integer(i));
1818      }
# Line 1616 | Line 1824 | public class LinkedBlockingDequeTest ext
1824          final LinkedBlockingDeque q = populatedDeque(SIZE);
1825          Thread t = new Thread(new CheckedRunnable() {
1826              public void realRun() throws InterruptedException {
1827 <                q.put(new Integer(SIZE+1));
1827 >                q.put(new Integer(SIZE + 1));
1828              }});
1829  
1830          t.start();
# Line 1630 | Line 1838 | public class LinkedBlockingDequeTest ext
1838      }
1839  
1840      /**
1841 <     * drainTo(null, n) throws NPE
1634 <     */
1635 <    public void testDrainToNullN() {
1636 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1637 <        try {
1638 <            q.drainTo(null, 0);
1639 <            shouldThrow();
1640 <        } catch (NullPointerException success) {}
1641 <    }
1642 <
1643 <    /**
1644 <     * drainTo(this, n) throws IAE
1645 <     */
1646 <    public void testDrainToSelfN() {
1647 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1648 <        try {
1649 <            q.drainTo(q, 0);
1650 <            shouldThrow();
1651 <        } catch (IllegalArgumentException success) {}
1652 <    }
1653 <
1654 <    /**
1655 <     * drainTo(c, n) empties first max {n, size} elements of deque into c
1841 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
1842       */
1843      public void testDrainToN() {
1844          LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1661 | Line 1847 | public class LinkedBlockingDequeTest ext
1847                  assertTrue(q.offer(new Integer(j)));
1848              ArrayList l = new ArrayList();
1849              q.drainTo(l, i);
1850 <            int k = (i < SIZE)? i : SIZE;
1851 <            assertEquals(l.size(), k);
1852 <            assertEquals(q.size(), SIZE-k);
1850 >            int k = (i < SIZE) ? i : SIZE;
1851 >            assertEquals(k, l.size());
1852 >            assertEquals(SIZE - k, q.size());
1853              for (int j = 0; j < k; ++j)
1854                  assertEquals(l.get(j), new Integer(j));
1855 <            while (q.poll() != null) ;
1855 >            do {} while (q.poll() != null);
1856 >        }
1857 >    }
1858 >
1859 >    /**
1860 >     * remove(null), contains(null) always return false
1861 >     */
1862 >    public void testNeverContainsNull() {
1863 >        Deque<?>[] qs = {
1864 >            new LinkedBlockingDeque<Object>(),
1865 >            populatedDeque(2),
1866 >        };
1867 >
1868 >        for (Deque<?> q : qs) {
1869 >            assertFalse(q.contains(null));
1870 >            assertFalse(q.remove(null));
1871 >            assertFalse(q.removeFirstOccurrence(null));
1872 >            assertFalse(q.removeLastOccurrence(null));
1873          }
1874      }
1875  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines