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.16 by jsr166, Sat Nov 21 22:00:46 2009 UTC vs.
Revision 1.50 by jsr166, Sun Nov 23 22:27:06 2014 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.*;
8 > import java.util.Arrays;
9 > import java.util.ArrayList;
10 > import java.util.Collection;
11 > import java.util.Deque;
12 > import java.util.Iterator;
13 > import java.util.NoSuchElementException;
14 > import java.util.Queue;
15 > import java.util.concurrent.BlockingDeque;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.LinkedBlockingDeque;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
11 import java.io.*;
22  
23   public class LinkedBlockingDequeTest extends JSR166TestCase {
24 +
25 +    public static class Unbounded extends BlockingQueueTest {
26 +        protected BlockingQueue emptyCollection() {
27 +            return new LinkedBlockingDeque();
28 +        }
29 +    }
30 +
31 +    public static class Bounded extends BlockingQueueTest {
32 +        protected BlockingQueue emptyCollection() {
33 +            return new LinkedBlockingDeque(SIZE);
34 +        }
35 +    }
36 +
37      public static void main(String[] args) {
38 <        junit.textui.TestRunner.run (suite());
38 >        junit.textui.TestRunner.run(suite());
39      }
40  
41      public static Test suite() {
42 <        return new TestSuite(LinkedBlockingDequeTest.class);
42 >        return newTestSuite(LinkedBlockingDequeTest.class,
43 >                            new Unbounded().testSuite(),
44 >                            new Bounded().testSuite());
45      }
46  
47      /**
48 <     * Create a deque of given size containing consecutive
48 >     * Returns a new deque of given size containing consecutive
49       * Integers 0 ... n.
50       */
51 <    private LinkedBlockingDeque populatedDeque(int n) {
52 <        LinkedBlockingDeque q = new LinkedBlockingDeque(n);
51 >    private LinkedBlockingDeque<Integer> populatedDeque(int n) {
52 >        LinkedBlockingDeque<Integer> q =
53 >            new LinkedBlockingDeque<Integer>(n);
54          assertTrue(q.isEmpty());
55          for (int i = 0; i < n; i++)
56              assertTrue(q.offer(new Integer(i)));
# Line 64 | Line 90 | public class LinkedBlockingDequeTest ext
90      }
91  
92      /**
93 <     * offer(null) throws NPE
93 >     * offerFirst(null) throws NullPointerException
94       */
95      public void testOfferFirstNull() {
96 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
97          try {
71            LinkedBlockingDeque q = new LinkedBlockingDeque();
98              q.offerFirst(null);
99              shouldThrow();
100          } catch (NullPointerException success) {}
101      }
102  
103      /**
104 +     * offerLast(null) throws NullPointerException
105 +     */
106 +    public void testOfferLastNull() {
107 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
108 +        try {
109 +            q.offerLast(null);
110 +            shouldThrow();
111 +        } catch (NullPointerException success) {}
112 +    }
113 +
114 +    /**
115       * OfferFirst succeeds
116       */
117      public void testOfferFirst() {
# Line 93 | Line 130 | public class LinkedBlockingDequeTest ext
130      }
131  
132      /**
133 <     *  pollFirst succeeds unless empty
133 >     * pollFirst succeeds unless empty
134       */
135      public void testPollFirst() {
136          LinkedBlockingDeque q = populatedDeque(SIZE);
137          for (int i = 0; i < SIZE; ++i) {
138 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
138 >            assertEquals(i, q.pollFirst());
139          }
140          assertNull(q.pollFirst());
141      }
142  
143      /**
144 <     *  pollLast succeeds unless empty
144 >     * pollLast succeeds unless empty
145       */
146      public void testPollLast() {
147          LinkedBlockingDeque q = populatedDeque(SIZE);
148          for (int i = SIZE-1; i >= 0; --i) {
149 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
149 >            assertEquals(i, q.pollLast());
150          }
151          assertNull(q.pollLast());
152      }
153  
154      /**
155 <     *  peekFirst returns next element, or null if empty
155 >     * peekFirst returns next element, or null if empty
156       */
157      public void testPeekFirst() {
158          LinkedBlockingDeque q = populatedDeque(SIZE);
159          for (int i = 0; i < SIZE; ++i) {
160 <            assertEquals(i, ((Integer)q.peekFirst()).intValue());
161 <            q.pollFirst();
160 >            assertEquals(i, q.peekFirst());
161 >            assertEquals(i, q.pollFirst());
162              assertTrue(q.peekFirst() == null ||
163 <                       i != ((Integer)q.peekFirst()).intValue());
163 >                       !q.peekFirst().equals(i));
164          }
165          assertNull(q.peekFirst());
166      }
167  
168      /**
169 <     *  peek returns next element, or null if empty
169 >     * peek returns next element, or null if empty
170       */
171      public void testPeek() {
172          LinkedBlockingDeque q = populatedDeque(SIZE);
173          for (int i = 0; i < SIZE; ++i) {
174 <            assertEquals(i, ((Integer)q.peek()).intValue());
175 <            q.pollFirst();
174 >            assertEquals(i, q.peek());
175 >            assertEquals(i, q.pollFirst());
176              assertTrue(q.peek() == null ||
177 <                       i != ((Integer)q.peek()).intValue());
177 >                       !q.peek().equals(i));
178          }
179          assertNull(q.peek());
180      }
181  
182      /**
183 <     *  peekLast returns next element, or null if empty
183 >     * peekLast returns next element, or null if empty
184       */
185      public void testPeekLast() {
186          LinkedBlockingDeque q = populatedDeque(SIZE);
187          for (int i = SIZE-1; i >= 0; --i) {
188 <            assertEquals(i, ((Integer)q.peekLast()).intValue());
189 <            q.pollLast();
188 >            assertEquals(i, q.peekLast());
189 >            assertEquals(i, q.pollLast());
190              assertTrue(q.peekLast() == null ||
191 <                       i != ((Integer)q.peekLast()).intValue());
191 >                       !q.peekLast().equals(i));
192          }
193          assertNull(q.peekLast());
194      }
195  
196      /**
197 <     * getFirst returns next getFirst, or throws NSEE if empty
197 >     * getFirst() returns first element, or throws NSEE if empty
198       */
199      public void testFirstElement() {
200          LinkedBlockingDeque q = populatedDeque(SIZE);
201          for (int i = 0; i < SIZE; ++i) {
202 <            assertEquals(i, ((Integer)q.getFirst()).intValue());
203 <            q.pollFirst();
202 >            assertEquals(i, q.getFirst());
203 >            assertEquals(i, q.pollFirst());
204          }
205          try {
206              q.getFirst();
# Line 173 | Line 210 | public class LinkedBlockingDequeTest ext
210      }
211  
212      /**
213 <     *  getLast returns next element, or throws NSEE if empty
213 >     * getLast() returns last element, or throws NSEE if empty
214       */
215      public void testLastElement() {
216          LinkedBlockingDeque q = populatedDeque(SIZE);
217          for (int i = SIZE-1; i >= 0; --i) {
218 <            assertEquals(i, ((Integer)q.getLast()).intValue());
219 <            q.pollLast();
218 >            assertEquals(i, q.getLast());
219 >            assertEquals(i, q.pollLast());
220          }
221          try {
222              q.getLast();
# Line 189 | Line 226 | public class LinkedBlockingDequeTest ext
226      }
227  
228      /**
229 <     *  removeFirst removes next element, or throws NSEE if empty
229 >     * removeFirst() removes first element, or throws NSEE if empty
230       */
231      public void testRemoveFirst() {
232          LinkedBlockingDeque q = populatedDeque(SIZE);
233          for (int i = 0; i < SIZE; ++i) {
234 <            assertEquals(i, ((Integer)q.removeFirst()).intValue());
234 >            assertEquals(i, q.removeFirst());
235          }
236          try {
237              q.removeFirst();
# Line 204 | Line 241 | public class LinkedBlockingDequeTest ext
241      }
242  
243      /**
244 <     *  removeLast removes last element, or throws NSEE if empty
244 >     * removeLast() removes last element, or throws NSEE if empty
245       */
246      public void testRemoveLast() {
247          LinkedBlockingDeque q = populatedDeque(SIZE);
248          for (int i = SIZE - 1; i >= 0; --i) {
249 <            assertEquals(i, ((Integer)q.removeLast()).intValue());
249 >            assertEquals(i, q.removeLast());
250          }
251          try {
252              q.removeLast();
# Line 219 | Line 256 | public class LinkedBlockingDequeTest ext
256      }
257  
258      /**
259 <     *  remove removes next element, or throws NSEE if empty
259 >     * remove removes next element, or throws NSEE if empty
260       */
261      public void testRemove() {
262          LinkedBlockingDeque q = populatedDeque(SIZE);
263          for (int i = 0; i < SIZE; ++i) {
264 <            assertEquals(i, ((Integer)q.remove()).intValue());
264 >            assertEquals(i, q.remove());
265          }
266          try {
267              q.remove();
# Line 269 | Line 306 | public class LinkedBlockingDequeTest ext
306          LinkedBlockingDeque q = populatedDeque(3);
307          q.pollLast();
308          q.addFirst(four);
309 <        assertEquals(four,q.peekFirst());
309 >        assertSame(four, q.peekFirst());
310      }
311  
312      /**
# Line 279 | Line 316 | public class LinkedBlockingDequeTest ext
316          LinkedBlockingDeque q = populatedDeque(3);
317          q.pollLast();
318          q.addLast(four);
319 <        assertEquals(four,q.peekLast());
319 >        assertSame(four, q.peekLast());
320      }
321  
285
322      /**
323       * A new deque has the indicated capacity, or Integer.MAX_VALUE if
324       * none given
# Line 293 | Line 329 | public class LinkedBlockingDequeTest ext
329      }
330  
331      /**
332 <     * Constructor throws IAE if capacity argument nonpositive
332 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
333       */
334      public void testConstructor2() {
335          try {
336 <            LinkedBlockingDeque q = new LinkedBlockingDeque(0);
336 >            new LinkedBlockingDeque(0);
337              shouldThrow();
338          } catch (IllegalArgumentException success) {}
339      }
340  
341      /**
342 <     * Initializing from null Collection throws NPE
342 >     * Initializing from null Collection throws NullPointerException
343       */
344      public void testConstructor3() {
345          try {
346 <            LinkedBlockingDeque q = new LinkedBlockingDeque(null);
346 >            new LinkedBlockingDeque(null);
347              shouldThrow();
348          } catch (NullPointerException success) {}
349      }
350  
351      /**
352 <     * Initializing from Collection of null elements throws NPE
352 >     * Initializing from Collection of null elements throws NullPointerException
353       */
354      public void testConstructor4() {
355 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
356          try {
357 <            Integer[] ints = new Integer[SIZE];
321 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
357 >            new LinkedBlockingDeque(elements);
358              shouldThrow();
359          } catch (NullPointerException success) {}
360      }
361  
362      /**
363 <     * Initializing from Collection with some null elements throws NPE
363 >     * Initializing from Collection with some null elements throws
364 >     * NullPointerException
365       */
366      public void testConstructor5() {
367 +        Integer[] ints = new Integer[SIZE];
368 +        for (int i = 0; i < SIZE-1; ++i)
369 +            ints[i] = i;
370 +        Collection<Integer> elements = Arrays.asList(ints);
371          try {
372 <            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));
372 >            new LinkedBlockingDeque(elements);
373              shouldThrow();
374          } catch (NullPointerException success) {}
375      }
# Line 342 | Line 380 | public class LinkedBlockingDequeTest ext
380      public void testConstructor6() {
381          Integer[] ints = new Integer[SIZE];
382          for (int i = 0; i < SIZE; ++i)
383 <            ints[i] = new Integer(i);
383 >            ints[i] = i;
384          LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
385          for (int i = 0; i < SIZE; ++i)
386              assertEquals(ints[i], q.poll());
# Line 381 | Line 419 | public class LinkedBlockingDequeTest ext
419      }
420  
421      /**
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    /**
422       * push(null) throws NPE
423       */
424      public void testPushNull() {
# Line 437 | Line 453 | public class LinkedBlockingDequeTest ext
453          LinkedBlockingDeque q = populatedDeque(3);
454          q.pollLast();
455          q.push(four);
456 <        assertEquals(four,q.peekFirst());
456 >        assertSame(four, q.peekFirst());
457      }
458  
443
459      /**
460 <     *  pop removes next element, or throws NSEE if empty
460 >     * pop removes next element, or throws NSEE if empty
461       */
462      public void testPop() {
463          LinkedBlockingDeque q = populatedDeque(SIZE);
464          for (int i = 0; i < SIZE; ++i) {
465 <            assertEquals(i, ((Integer)q.pop()).intValue());
465 >            assertEquals(i, q.pop());
466          }
467          try {
468              q.pop();
# Line 455 | Line 470 | public class LinkedBlockingDequeTest ext
470          } catch (NoSuchElementException success) {}
471      }
472  
458
473      /**
474       * Offer succeeds if not full; fails if full
475       */
# Line 469 | Line 483 | public class LinkedBlockingDequeTest ext
483       * add succeeds if not full; throws ISE if full
484       */
485      public void testAdd() {
486 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
487 +        for (int i = 0; i < SIZE; ++i)
488 +            assertTrue(q.add(new Integer(i)));
489 +        assertEquals(0, q.remainingCapacity());
490          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());
491              q.add(new Integer(SIZE));
492              shouldThrow();
493          } catch (IllegalStateException success) {}
494      }
495  
496      /**
484     * 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    /**
497       * addAll(this) throws IAE
498       */
499      public void testAddAllSelf() {
500 +        LinkedBlockingDeque q = populatedDeque(SIZE);
501          try {
499            LinkedBlockingDeque q = populatedDeque(SIZE);
502              q.addAll(q);
503              shouldThrow();
504          } catch (IllegalArgumentException success) {}
505      }
506  
507      /**
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    /**
508       * addAll of a collection with any null elements throws NPE after
509       * possibly adding some elements
510       */
511      public void testAddAll3() {
512 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
513 +        Integer[] ints = new Integer[SIZE];
514 +        for (int i = 0; i < SIZE-1; ++i)
515 +            ints[i] = new Integer(i);
516 +        Collection<Integer> elements = Arrays.asList(ints);
517          try {
518 <            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));
518 >            q.addAll(elements);
519              shouldThrow();
520          } catch (NullPointerException success) {}
521      }
522 +
523      /**
524 <     * addAll throws ISE if not enough room
524 >     * addAll throws IllegalStateException if not enough room
525       */
526      public void testAddAll4() {
527 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE - 1);
528 +        Integer[] ints = new Integer[SIZE];
529 +        for (int i = 0; i < SIZE; ++i)
530 +            ints[i] = new Integer(i);
531 +        Collection<Integer> elements = Arrays.asList(ints);
532          try {
533 <            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));
533 >            q.addAll(elements);
534              shouldThrow();
535          } catch (IllegalStateException success) {}
536      }
# Line 556 | Line 550 | public class LinkedBlockingDequeTest ext
550              assertEquals(ints[i], q.poll());
551      }
552  
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
553      /**
554       * all elements successfully put are contained
555       */
# Line 585 | Line 567 | public class LinkedBlockingDequeTest ext
567       * put blocks interruptibly if full
568       */
569      public void testBlockingPut() throws InterruptedException {
570 <        Thread t = new Thread(new CheckedRunnable() {
571 <            public void realRun() {
572 <                int added = 0;
570 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
571 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
572 >        Thread t = newStartedThread(new CheckedRunnable() {
573 >            public void realRun() throws InterruptedException {
574 >                for (int i = 0; i < SIZE; ++i)
575 >                    q.put(i);
576 >                assertEquals(SIZE, q.size());
577 >                assertEquals(0, q.remainingCapacity());
578 >
579 >                Thread.currentThread().interrupt();
580                  try {
581 <                    LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
582 <                    for (int i = 0; i < SIZE; ++i) {
583 <                        q.put(new Integer(i));
584 <                        ++added;
585 <                    }
586 <                    q.put(new Integer(SIZE));
587 <                    threadShouldThrow();
588 <                } catch (InterruptedException success) {
589 <                    threadAssertEquals(added, SIZE);
590 <                }
581 >                    q.put(99);
582 >                    shouldThrow();
583 >                } catch (InterruptedException success) {}
584 >                assertFalse(Thread.interrupted());
585 >
586 >                pleaseInterrupt.countDown();
587 >                try {
588 >                    q.put(99);
589 >                    shouldThrow();
590 >                } catch (InterruptedException success) {}
591 >                assertFalse(Thread.interrupted());
592              }});
593  
594 <        t.start();
595 <        Thread.sleep(SHORT_DELAY_MS);
594 >        await(pleaseInterrupt);
595 >        assertThreadStaysAlive(t);
596          t.interrupt();
597 <        t.join();
597 >        awaitTermination(t);
598 >        assertEquals(SIZE, q.size());
599 >        assertEquals(0, q.remainingCapacity());
600      }
601  
602      /**
603 <     * put blocks waiting for take when full
603 >     * put blocks interruptibly waiting for take when full
604       */
605      public void testPutWithTake() throws InterruptedException {
606 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
607 <        Thread t = new Thread(new CheckedRunnable() {
608 <            public void realRun() {
609 <                int added = 0;
606 >        final int capacity = 2;
607 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
608 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
609 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
610 >        Thread t = newStartedThread(new CheckedRunnable() {
611 >            public void realRun() throws InterruptedException {
612 >                for (int i = 0; i < capacity; i++)
613 >                    q.put(i);
614 >                pleaseTake.countDown();
615 >                q.put(86);
616 >
617 >                pleaseInterrupt.countDown();
618                  try {
619 <                    q.put(new Object());
620 <                    ++added;
621 <                    q.put(new Object());
622 <                    ++added;
623 <                    q.put(new Object());
624 <                    ++added;
625 <                    q.put(new Object());
626 <                    ++added;
627 <                    threadShouldThrow();
628 <                } catch (InterruptedException success) {
629 <                    threadAssertTrue(added >= 2);
630 <                }
619 >                    q.put(99);
620 >                    shouldThrow();
621 >                } catch (InterruptedException success) {}
622 >                assertFalse(Thread.interrupted());
623              }});
624  
625 <        t.start();
626 <        Thread.sleep(SHORT_DELAY_MS);
627 <        q.take();
625 >        await(pleaseTake);
626 >        assertEquals(0, q.remainingCapacity());
627 >        assertEquals(0, q.take());
628 >
629 >        await(pleaseInterrupt);
630 >        assertThreadStaysAlive(t);
631          t.interrupt();
632 <        t.join();
632 >        awaitTermination(t);
633 >        assertEquals(0, q.remainingCapacity());
634      }
635  
636      /**
# Line 642 | Line 638 | public class LinkedBlockingDequeTest ext
638       */
639      public void testTimedOffer() throws InterruptedException {
640          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
641 <        Thread t = new Thread(new CheckedRunnable() {
641 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
642 >        Thread t = newStartedThread(new CheckedRunnable() {
643              public void realRun() throws InterruptedException {
644                  q.put(new Object());
645                  q.put(new Object());
646 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
646 >                long startTime = System.nanoTime();
647 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
648 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
649 >                pleaseInterrupt.countDown();
650                  try {
651 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
651 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
652                      shouldThrow();
653                  } catch (InterruptedException success) {}
654              }});
655  
656 <        t.start();
657 <        Thread.sleep(SMALL_DELAY_MS);
656 >        await(pleaseInterrupt);
657 >        assertThreadStaysAlive(t);
658          t.interrupt();
659 <        t.join();
659 >        awaitTermination(t);
660      }
661  
662      /**
# Line 665 | Line 665 | public class LinkedBlockingDequeTest ext
665      public void testTake() throws InterruptedException {
666          LinkedBlockingDeque q = populatedDeque(SIZE);
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(i, ((Integer)q.take()).intValue());
668 >            assertEquals(i, q.take());
669          }
670      }
671  
672      /**
673 <     * take blocks interruptibly when empty
674 <     */
675 <    public void testTakeFromEmpty() throws InterruptedException {
676 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
677 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
678 <            public void realRun() throws InterruptedException {
679 <                q.take();
680 <            }};
681 <
682 <        t.start();
683 <        Thread.sleep(SHORT_DELAY_MS);
684 <        t.interrupt();
685 <        t.join();
686 <    }
687 <
688 <    /**
689 <     * Take removes existing elements until empty, then blocks interruptibly
673 >     * take removes existing elements until empty, then blocks interruptibly
674       */
675      public void testBlockingTake() throws InterruptedException {
676 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
676 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
677 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
678 >        Thread t = newStartedThread(new CheckedRunnable() {
679              public void realRun() throws InterruptedException {
694                LinkedBlockingDeque q = populatedDeque(SIZE);
680                  for (int i = 0; i < SIZE; ++i) {
681 <                    assertEquals(i, ((Integer)q.take()).intValue());
681 >                    assertEquals(i, q.take());
682                  }
698                q.take();
699            }};
683  
684 <        t.start();
685 <        Thread.sleep(SHORT_DELAY_MS);
684 >                Thread.currentThread().interrupt();
685 >                try {
686 >                    q.take();
687 >                    shouldThrow();
688 >                } catch (InterruptedException success) {}
689 >                assertFalse(Thread.interrupted());
690 >
691 >                pleaseInterrupt.countDown();
692 >                try {
693 >                    q.take();
694 >                    shouldThrow();
695 >                } catch (InterruptedException success) {}
696 >                assertFalse(Thread.interrupted());
697 >            }});
698 >
699 >        await(pleaseInterrupt);
700 >        assertThreadStaysAlive(t);
701          t.interrupt();
702 <        t.join();
702 >        awaitTermination(t);
703      }
704  
707
705      /**
706       * poll succeeds unless empty
707       */
708      public void testPoll() {
709          LinkedBlockingDeque q = populatedDeque(SIZE);
710          for (int i = 0; i < SIZE; ++i) {
711 <            assertEquals(i, ((Integer)q.poll()).intValue());
711 >            assertEquals(i, q.poll());
712          }
713          assertNull(q.poll());
714      }
# Line 722 | Line 719 | public class LinkedBlockingDequeTest ext
719      public void testTimedPoll0() throws InterruptedException {
720          LinkedBlockingDeque q = populatedDeque(SIZE);
721          for (int i = 0; i < SIZE; ++i) {
722 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
722 >            assertEquals(i, q.poll(0, MILLISECONDS));
723          }
724          assertNull(q.poll(0, MILLISECONDS));
725      }
# Line 733 | Line 730 | public class LinkedBlockingDequeTest ext
730      public void testTimedPoll() throws InterruptedException {
731          LinkedBlockingDeque q = populatedDeque(SIZE);
732          for (int i = 0; i < SIZE; ++i) {
733 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
734 <        }
735 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
733 >            long startTime = System.nanoTime();
734 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
735 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
736 >        }
737 >        long startTime = System.nanoTime();
738 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
739 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
740 >        checkEmpty(q);
741      }
742  
743      /**
# Line 743 | Line 745 | public class LinkedBlockingDequeTest ext
745       * returning timeout status
746       */
747      public void testInterruptedTimedPoll() throws InterruptedException {
748 <        Thread t = new Thread(new CheckedRunnable() {
748 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
749 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
750 >        Thread t = newStartedThread(new CheckedRunnable() {
751              public void realRun() throws InterruptedException {
748                LinkedBlockingDeque q = populatedDeque(SIZE);
752                  for (int i = 0; i < SIZE; ++i) {
753 <                    assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
753 >                    long t0 = System.nanoTime();
754 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
755 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
756                  }
757 +                long t0 = System.nanoTime();
758 +                aboutToWait.countDown();
759                  try {
760 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
760 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
761                      shouldThrow();
762 <                } catch (InterruptedException success) {}
763 <            }});
764 <
758 <        t.start();
759 <        Thread.sleep(SHORT_DELAY_MS);
760 <        t.interrupt();
761 <        t.join();
762 <    }
763 <
764 <    /**
765 <     *  timed poll before a delayed offer fails; after offer succeeds;
766 <     *  on interruption throws
767 <     */
768 <    public void testTimedPollWithOffer() throws InterruptedException {
769 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
770 <        Thread t = new Thread(new CheckedRunnable() {
771 <            public void realRun() throws InterruptedException {
772 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
773 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
774 <                try {
775 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
776 <                    shouldThrow();
777 <                } catch (InterruptedException success) {}
762 >                } catch (InterruptedException success) {
763 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
764 >                }
765              }});
766  
767 <        t.start();
768 <        Thread.sleep(SMALL_DELAY_MS);
782 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
767 >        aboutToWait.await();
768 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
769          t.interrupt();
770 <        t.join();
770 >        awaitTermination(t, MEDIUM_DELAY_MS);
771 >        checkEmpty(q);
772      }
773  
787
774      /**
775       * putFirst(null) throws NPE
776       */
777 <     public void testPutFirstNull() throws InterruptedException {
777 >    public void testPutFirstNull() throws InterruptedException {
778 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
779          try {
793            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
780              q.putFirst(null);
781              shouldThrow();
782          } catch (NullPointerException success) {}
783 <     }
783 >    }
784  
785      /**
786       * all elements successfully putFirst are contained
787       */
788 <     public void testPutFirst() throws InterruptedException {
789 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
790 <         for (int i = 0; i < SIZE; ++i) {
791 <             Integer I = new Integer(i);
792 <             q.putFirst(I);
793 <             assertTrue(q.contains(I));
794 <         }
795 <         assertEquals(0, q.remainingCapacity());
788 >    public void testPutFirst() throws InterruptedException {
789 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
790 >        for (int i = 0; i < SIZE; ++i) {
791 >            Integer I = new Integer(i);
792 >            q.putFirst(I);
793 >            assertTrue(q.contains(I));
794 >        }
795 >        assertEquals(0, q.remainingCapacity());
796      }
797  
798      /**
799       * putFirst blocks interruptibly if full
800       */
801      public void testBlockingPutFirst() throws InterruptedException {
802 <        Thread t = new Thread(new CheckedRunnable() {
803 <            public void realRun() {
804 <                int added = 0;
802 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
803 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
804 >        Thread t = newStartedThread(new CheckedRunnable() {
805 >            public void realRun() throws InterruptedException {
806 >                for (int i = 0; i < SIZE; ++i)
807 >                    q.putFirst(i);
808 >                assertEquals(SIZE, q.size());
809 >                assertEquals(0, q.remainingCapacity());
810 >
811 >                Thread.currentThread().interrupt();
812                  try {
813 <                    LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
814 <                    for (int i = 0; i < SIZE; ++i) {
815 <                        q.putFirst(new Integer(i));
816 <                        ++added;
817 <                    }
818 <                    q.putFirst(new Integer(SIZE));
819 <                    threadShouldThrow();
820 <                } catch (InterruptedException success) {
821 <                    threadAssertEquals(added, SIZE);
822 <                }
813 >                    q.putFirst(99);
814 >                    shouldThrow();
815 >                } catch (InterruptedException success) {}
816 >                assertFalse(Thread.interrupted());
817 >
818 >                pleaseInterrupt.countDown();
819 >                try {
820 >                    q.putFirst(99);
821 >                    shouldThrow();
822 >                } catch (InterruptedException success) {}
823 >                assertFalse(Thread.interrupted());
824              }});
825  
826 <        t.start();
827 <        Thread.sleep(SHORT_DELAY_MS);
826 >        await(pleaseInterrupt);
827 >        assertThreadStaysAlive(t);
828          t.interrupt();
829 <        t.join();
829 >        awaitTermination(t);
830 >        assertEquals(SIZE, q.size());
831 >        assertEquals(0, q.remainingCapacity());
832      }
833  
834      /**
835 <     * putFirst blocks waiting for take when full
835 >     * putFirst blocks interruptibly waiting for take when full
836       */
837      public void testPutFirstWithTake() throws InterruptedException {
838 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
839 <        Thread t = new Thread(new CheckedRunnable() {
840 <            public void realRun() {
841 <                int added = 0;
838 >        final int capacity = 2;
839 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
840 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
841 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
842 >        Thread t = newStartedThread(new CheckedRunnable() {
843 >            public void realRun() throws InterruptedException {
844 >                for (int i = 0; i < capacity; i++)
845 >                    q.putFirst(i);
846 >                pleaseTake.countDown();
847 >                q.putFirst(86);
848 >
849 >                pleaseInterrupt.countDown();
850                  try {
851 <                    q.putFirst(new Object());
852 <                    ++added;
853 <                    q.putFirst(new Object());
854 <                    ++added;
851 <                    q.putFirst(new Object());
852 <                    ++added;
853 <                    q.putFirst(new Object());
854 <                    ++added;
855 <                    threadShouldThrow();
856 <                } catch (InterruptedException success) {
857 <                    threadAssertTrue(added >= 2);
858 <                }
851 >                    q.putFirst(99);
852 >                    shouldThrow();
853 >                } catch (InterruptedException success) {}
854 >                assertFalse(Thread.interrupted());
855              }});
856  
857 <        t.start();
858 <        Thread.sleep(SHORT_DELAY_MS);
859 <        q.take();
857 >        await(pleaseTake);
858 >        assertEquals(0, q.remainingCapacity());
859 >        assertEquals(capacity - 1, q.take());
860 >
861 >        await(pleaseInterrupt);
862 >        assertThreadStaysAlive(t);
863          t.interrupt();
864 <        t.join();
864 >        awaitTermination(t);
865 >        assertEquals(0, q.remainingCapacity());
866      }
867  
868      /**
# Line 870 | Line 870 | public class LinkedBlockingDequeTest ext
870       */
871      public void testTimedOfferFirst() throws InterruptedException {
872          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
873 <        Thread t = new Thread(new CheckedRunnable() {
873 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
874 >        Thread t = newStartedThread(new CheckedRunnable() {
875              public void realRun() throws InterruptedException {
876                  q.putFirst(new Object());
877                  q.putFirst(new Object());
878 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
878 >                long startTime = System.nanoTime();
879 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
880 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
881 >                pleaseInterrupt.countDown();
882                  try {
883 <                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
883 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
884                      shouldThrow();
885                  } catch (InterruptedException success) {}
886              }});
887  
888 <        t.start();
889 <        Thread.sleep(SMALL_DELAY_MS);
888 >        await(pleaseInterrupt);
889 >        assertThreadStaysAlive(t);
890          t.interrupt();
891 <        t.join();
891 >        awaitTermination(t);
892      }
893  
894      /**
# Line 893 | Line 897 | public class LinkedBlockingDequeTest ext
897      public void testTakeFirst() throws InterruptedException {
898          LinkedBlockingDeque q = populatedDeque(SIZE);
899          for (int i = 0; i < SIZE; ++i) {
900 <            assertEquals(i, ((Integer)q.takeFirst()).intValue());
900 >            assertEquals(i, q.takeFirst());
901          }
902      }
903  
904      /**
905 <     * takeFirst blocks interruptibly when empty
905 >     * takeFirst() blocks interruptibly when empty
906       */
907 <    public void testTakeFirstFromEmpty() throws InterruptedException {
908 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
909 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
910 <            public void realRun() throws InterruptedException {
911 <                q.takeFirst();
912 <            }};
907 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
908 >        final BlockingDeque q = new LinkedBlockingDeque();
909 >        final CountDownLatch threadStarted = new CountDownLatch(1);
910 >        Thread t = newStartedThread(new CheckedRunnable() {
911 >            public void realRun() {
912 >                threadStarted.countDown();
913 >                try {
914 >                    q.takeFirst();
915 >                    shouldThrow();
916 >                } catch (InterruptedException success) {}
917 >                assertFalse(Thread.interrupted());
918 >            }});
919  
920 <        t.start();
921 <        Thread.sleep(SHORT_DELAY_MS);
920 >        await(threadStarted);
921 >        assertThreadStaysAlive(t);
922          t.interrupt();
923 <        t.join();
923 >        awaitTermination(t);
924 >    }
925 >
926 >    /**
927 >     * takeFirst() throws InterruptedException immediately if interrupted
928 >     * before waiting
929 >     */
930 >    public void testTakeFirstFromEmptyAfterInterrupt() {
931 >        final BlockingDeque q = new LinkedBlockingDeque();
932 >        Thread t = newStartedThread(new CheckedRunnable() {
933 >            public void realRun() {
934 >                Thread.currentThread().interrupt();
935 >                try {
936 >                    q.takeFirst();
937 >                    shouldThrow();
938 >                } catch (InterruptedException success) {}
939 >                assertFalse(Thread.interrupted());
940 >            }});
941 >
942 >        awaitTermination(t);
943      }
944  
945      /**
946 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
946 >     * takeLast() blocks interruptibly when empty
947 >     */
948 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
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.takeLast();
956 >                    shouldThrow();
957 >                } catch (InterruptedException success) {}
958 >                assertFalse(Thread.interrupted());
959 >            }});
960 >
961 >        await(threadStarted);
962 >        assertThreadStaysAlive(t);
963 >        t.interrupt();
964 >        awaitTermination(t);
965 >    }
966 >
967 >    /**
968 >     * takeLast() throws InterruptedException immediately if interrupted
969 >     * before waiting
970 >     */
971 >    public void testTakeLastFromEmptyAfterInterrupt() {
972 >        final BlockingDeque q = new LinkedBlockingDeque();
973 >        Thread t = newStartedThread(new CheckedRunnable() {
974 >            public void realRun() {
975 >                Thread.currentThread().interrupt();
976 >                try {
977 >                    q.takeLast();
978 >                    shouldThrow();
979 >                } catch (InterruptedException success) {}
980 >                assertFalse(Thread.interrupted());
981 >            }});
982 >
983 >        awaitTermination(t);
984 >    }
985 >
986 >    /**
987 >     * takeFirst removes existing elements until empty, then blocks interruptibly
988       */
989      public void testBlockingTakeFirst() throws InterruptedException {
990 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
990 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
991 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
992 >        Thread t = newStartedThread(new CheckedRunnable() {
993              public void realRun() throws InterruptedException {
922                LinkedBlockingDeque q = populatedDeque(SIZE);
994                  for (int i = 0; i < SIZE; ++i) {
995 <                    assertEquals(i, ((Integer)q.takeFirst()).intValue());
995 >                    assertEquals(i, q.takeFirst());
996                  }
926                q.takeFirst();
927            }};
997  
998 <        t.start();
999 <        Thread.sleep(SHORT_DELAY_MS);
998 >                Thread.currentThread().interrupt();
999 >                try {
1000 >                    q.takeFirst();
1001 >                    shouldThrow();
1002 >                } catch (InterruptedException success) {}
1003 >                assertFalse(Thread.interrupted());
1004 >
1005 >                pleaseInterrupt.countDown();
1006 >                try {
1007 >                    q.takeFirst();
1008 >                    shouldThrow();
1009 >                } catch (InterruptedException success) {}
1010 >                assertFalse(Thread.interrupted());
1011 >            }});
1012 >
1013 >        await(pleaseInterrupt);
1014 >        assertThreadStaysAlive(t);
1015          t.interrupt();
1016 <        t.join();
1016 >        awaitTermination(t);
1017      }
1018  
935
1019      /**
1020       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1021       */
1022      public void testTimedPollFirst0() throws InterruptedException {
1023          LinkedBlockingDeque q = populatedDeque(SIZE);
1024          for (int i = 0; i < SIZE; ++i) {
1025 <            assertEquals(i, ((Integer)q.pollFirst(0, MILLISECONDS)).intValue());
1025 >            assertEquals(i, q.pollFirst(0, MILLISECONDS));
1026          }
1027          assertNull(q.pollFirst(0, MILLISECONDS));
1028      }
# Line 950 | Line 1033 | public class LinkedBlockingDequeTest ext
1033      public void testTimedPollFirst() throws InterruptedException {
1034          LinkedBlockingDeque q = populatedDeque(SIZE);
1035          for (int i = 0; i < SIZE; ++i) {
1036 <            assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1037 <        }
1038 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1036 >            long startTime = System.nanoTime();
1037 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1038 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1039 >        }
1040 >        long startTime = System.nanoTime();
1041 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1042 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1043 >        checkEmpty(q);
1044      }
1045  
1046      /**
# Line 960 | Line 1048 | public class LinkedBlockingDequeTest ext
1048       * returning timeout status
1049       */
1050      public void testInterruptedTimedPollFirst() throws InterruptedException {
1051 <        Thread t = new Thread(new CheckedRunnable() {
1051 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1052 >        Thread t = newStartedThread(new CheckedRunnable() {
1053              public void realRun() throws InterruptedException {
1054                  LinkedBlockingDeque q = populatedDeque(SIZE);
1055                  for (int i = 0; i < SIZE; ++i) {
1056 <                    assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1056 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1057                  }
1058 +
1059 +                Thread.currentThread().interrupt();
1060                  try {
1061                      q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1062                      shouldThrow();
1063                  } catch (InterruptedException success) {}
1064 +                assertFalse(Thread.interrupted());
1065 +
1066 +                pleaseInterrupt.countDown();
1067 +                try {
1068 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1069 +                    shouldThrow();
1070 +                } catch (InterruptedException success) {}
1071 +                assertFalse(Thread.interrupted());
1072              }});
1073  
1074 <        t.start();
1075 <        Thread.sleep(SHORT_DELAY_MS);
1074 >        await(pleaseInterrupt);
1075 >        assertThreadStaysAlive(t);
1076          t.interrupt();
1077 <        t.join();
1077 >        awaitTermination(t);
1078      }
1079  
1080      /**
1081 <     *  timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1082 <     *  on interruption throws
1081 >     * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1082 >     * on interruption throws
1083       */
1084      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1085          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1086 <        Thread t = new Thread(new CheckedRunnable() {
1086 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1087 >        Thread t = newStartedThread(new CheckedRunnable() {
1088              public void realRun() throws InterruptedException {
1089 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1089 >                long startTime = System.nanoTime();
1090 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1091 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1092 >
1093 >                barrier.await();
1094 >
1095                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1096 +
1097 +                Thread.currentThread().interrupt();
1098                  try {
1099                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1100                      shouldThrow();
1101                  } catch (InterruptedException success) {}
1102 +
1103 +                barrier.await();
1104 +                try {
1105 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1106 +                    shouldThrow();
1107 +                } catch (InterruptedException success) {}
1108 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1109              }});
1110  
1111 <        t.start();
1112 <        Thread.sleep(SMALL_DELAY_MS);
1113 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1111 >        barrier.await();
1112 >        long startTime = System.nanoTime();
1113 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1114 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1115 >        barrier.await();
1116 >        assertThreadStaysAlive(t);
1117          t.interrupt();
1118 <        t.join();
1118 >        awaitTermination(t);
1119      }
1120  
1121      /**
1122       * putLast(null) throws NPE
1123       */
1124 <     public void testPutLastNull() throws InterruptedException {
1124 >    public void testPutLastNull() throws InterruptedException {
1125 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1126          try {
1009            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1127              q.putLast(null);
1128              shouldThrow();
1129          } catch (NullPointerException success) {}
1130 <     }
1130 >    }
1131  
1132      /**
1133       * all elements successfully putLast are contained
1134       */
1135 <     public void testPutLast() throws InterruptedException {
1136 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1137 <         for (int i = 0; i < SIZE; ++i) {
1138 <             Integer I = new Integer(i);
1139 <             q.putLast(I);
1140 <             assertTrue(q.contains(I));
1141 <         }
1142 <         assertEquals(0, q.remainingCapacity());
1135 >    public void testPutLast() throws InterruptedException {
1136 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1137 >        for (int i = 0; i < SIZE; ++i) {
1138 >            Integer I = new Integer(i);
1139 >            q.putLast(I);
1140 >            assertTrue(q.contains(I));
1141 >        }
1142 >        assertEquals(0, q.remainingCapacity());
1143      }
1144  
1145      /**
1146       * putLast blocks interruptibly if full
1147       */
1148      public void testBlockingPutLast() throws InterruptedException {
1149 <        Thread t = new Thread(new CheckedRunnable() {
1150 <            public void realRun() {
1151 <                int added = 0;
1149 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1150 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1151 >        Thread t = newStartedThread(new CheckedRunnable() {
1152 >            public void realRun() throws InterruptedException {
1153 >                for (int i = 0; i < SIZE; ++i)
1154 >                    q.putLast(i);
1155 >                assertEquals(SIZE, q.size());
1156 >                assertEquals(0, q.remainingCapacity());
1157 >
1158 >                Thread.currentThread().interrupt();
1159                  try {
1160 <                    LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1161 <                    for (int i = 0; i < SIZE; ++i) {
1162 <                        q.putLast(new Integer(i));
1163 <                        ++added;
1164 <                    }
1165 <                    q.putLast(new Integer(SIZE));
1166 <                    threadShouldThrow();
1167 <                } catch (InterruptedException success) {
1168 <                    threadAssertEquals(added, SIZE);
1169 <                }
1160 >                    q.putLast(99);
1161 >                    shouldThrow();
1162 >                } catch (InterruptedException success) {}
1163 >                assertFalse(Thread.interrupted());
1164 >
1165 >                pleaseInterrupt.countDown();
1166 >                try {
1167 >                    q.putLast(99);
1168 >                    shouldThrow();
1169 >                } catch (InterruptedException success) {}
1170 >                assertFalse(Thread.interrupted());
1171              }});
1172  
1173 <        t.start();
1174 <        Thread.sleep(SHORT_DELAY_MS);
1173 >        await(pleaseInterrupt);
1174 >        assertThreadStaysAlive(t);
1175          t.interrupt();
1176 <        t.join();
1176 >        awaitTermination(t);
1177 >        assertEquals(SIZE, q.size());
1178 >        assertEquals(0, q.remainingCapacity());
1179      }
1180  
1181      /**
1182 <     * putLast blocks waiting for take when full
1182 >     * putLast blocks interruptibly waiting for take when full
1183       */
1184      public void testPutLastWithTake() throws InterruptedException {
1185 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1186 <        Thread t = new Thread(new CheckedRunnable() {
1187 <            public void realRun() {
1188 <                int added = 0;
1185 >        final int capacity = 2;
1186 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1187 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1188 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1189 >        Thread t = newStartedThread(new CheckedRunnable() {
1190 >            public void realRun() throws InterruptedException {
1191 >                for (int i = 0; i < capacity; i++)
1192 >                    q.putLast(i);
1193 >                pleaseTake.countDown();
1194 >                q.putLast(86);
1195 >
1196 >                pleaseInterrupt.countDown();
1197                  try {
1198 <                    q.putLast(new Object());
1199 <                    ++added;
1200 <                    q.putLast(new Object());
1201 <                    ++added;
1067 <                    q.putLast(new Object());
1068 <                    ++added;
1069 <                    q.putLast(new Object());
1070 <                    ++added;
1071 <                    threadShouldThrow();
1072 <                } catch (InterruptedException success) {
1073 <                    threadAssertTrue(added >= 2);
1074 <                }
1198 >                    q.putLast(99);
1199 >                    shouldThrow();
1200 >                } catch (InterruptedException success) {}
1201 >                assertFalse(Thread.interrupted());
1202              }});
1203  
1204 <        t.start();
1205 <        Thread.sleep(SHORT_DELAY_MS);
1206 <        q.take();
1204 >        await(pleaseTake);
1205 >        assertEquals(0, q.remainingCapacity());
1206 >        assertEquals(0, q.take());
1207 >
1208 >        await(pleaseInterrupt);
1209 >        assertThreadStaysAlive(t);
1210          t.interrupt();
1211 <        t.join();
1211 >        awaitTermination(t);
1212 >        assertEquals(0, q.remainingCapacity());
1213      }
1214  
1215      /**
# Line 1086 | Line 1217 | public class LinkedBlockingDequeTest ext
1217       */
1218      public void testTimedOfferLast() throws InterruptedException {
1219          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1220 <        Thread t = new Thread(new CheckedRunnable() {
1220 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1221 >        Thread t = newStartedThread(new CheckedRunnable() {
1222              public void realRun() throws InterruptedException {
1223                  q.putLast(new Object());
1224                  q.putLast(new Object());
1225 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1225 >                long startTime = System.nanoTime();
1226 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1227 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1228 >                pleaseInterrupt.countDown();
1229                  try {
1230 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1230 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1231                      shouldThrow();
1232                  } catch (InterruptedException success) {}
1233              }});
1234  
1235 <        t.start();
1236 <        Thread.sleep(SMALL_DELAY_MS);
1235 >        await(pleaseInterrupt);
1236 >        assertThreadStaysAlive(t);
1237          t.interrupt();
1238 <        t.join();
1238 >        awaitTermination(t);
1239      }
1240  
1241      /**
# Line 1109 | Line 1244 | public class LinkedBlockingDequeTest ext
1244      public void testTakeLast() throws InterruptedException {
1245          LinkedBlockingDeque q = populatedDeque(SIZE);
1246          for (int i = 0; i < SIZE; ++i) {
1247 <            assertEquals(SIZE-i-1, ((Integer)q.takeLast()).intValue());
1247 >            assertEquals(SIZE-i-1, q.takeLast());
1248          }
1249      }
1250  
1251      /**
1252 <     * takeLast blocks interruptibly when empty
1118 <     */
1119 <    public void testTakeLastFromEmpty() throws InterruptedException {
1120 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1121 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1122 <            public void realRun() throws InterruptedException {
1123 <                q.takeLast();
1124 <            }};
1125 <
1126 <        t.start();
1127 <        Thread.sleep(SHORT_DELAY_MS);
1128 <        t.interrupt();
1129 <        t.join();
1130 <    }
1131 <
1132 <    /**
1133 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1252 >     * takeLast removes existing elements until empty, then blocks interruptibly
1253       */
1254      public void testBlockingTakeLast() throws InterruptedException {
1255 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1255 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1256 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1257 >        Thread t = newStartedThread(new CheckedRunnable() {
1258              public void realRun() throws InterruptedException {
1138                LinkedBlockingDeque q = populatedDeque(SIZE);
1259                  for (int i = 0; i < SIZE; ++i) {
1260 <                    assertEquals(SIZE-i-1, ((Integer)q.takeLast()).intValue());
1260 >                    assertEquals(SIZE-i-1, q.takeLast());
1261                  }
1142                q.takeLast();
1143            }};
1262  
1263 <        t.start();
1264 <        Thread.sleep(SHORT_DELAY_MS);
1263 >                Thread.currentThread().interrupt();
1264 >                try {
1265 >                    q.takeLast();
1266 >                    shouldThrow();
1267 >                } catch (InterruptedException success) {}
1268 >                assertFalse(Thread.interrupted());
1269 >
1270 >                pleaseInterrupt.countDown();
1271 >                try {
1272 >                    q.takeLast();
1273 >                    shouldThrow();
1274 >                } catch (InterruptedException success) {}
1275 >                assertFalse(Thread.interrupted());
1276 >            }});
1277 >
1278 >        await(pleaseInterrupt);
1279 >        assertThreadStaysAlive(t);
1280          t.interrupt();
1281 <        t.join();
1281 >        awaitTermination(t);
1282      }
1283  
1151
1284      /**
1285       * timed pollLast with zero timeout succeeds when non-empty, else times out
1286       */
1287      public void testTimedPollLast0() throws InterruptedException {
1288          LinkedBlockingDeque q = populatedDeque(SIZE);
1289          for (int i = 0; i < SIZE; ++i) {
1290 <            assertEquals(SIZE-i-1, ((Integer)q.pollLast(0, MILLISECONDS)).intValue());
1290 >            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1291          }
1292          assertNull(q.pollLast(0, MILLISECONDS));
1293      }
# Line 1166 | Line 1298 | public class LinkedBlockingDequeTest ext
1298      public void testTimedPollLast() throws InterruptedException {
1299          LinkedBlockingDeque q = populatedDeque(SIZE);
1300          for (int i = 0; i < SIZE; ++i) {
1301 <            assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1302 <        }
1303 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1301 >            long startTime = System.nanoTime();
1302 >            assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1303 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1304 >        }
1305 >        long startTime = System.nanoTime();
1306 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1307 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1308 >        checkEmpty(q);
1309      }
1310  
1311      /**
# Line 1176 | Line 1313 | public class LinkedBlockingDequeTest ext
1313       * returning timeout status
1314       */
1315      public void testInterruptedTimedPollLast() throws InterruptedException {
1316 <        Thread t = new Thread(new CheckedRunnable() {
1316 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1317 >        Thread t = newStartedThread(new CheckedRunnable() {
1318              public void realRun() throws InterruptedException {
1319                  LinkedBlockingDeque q = populatedDeque(SIZE);
1320                  for (int i = 0; i < SIZE; ++i) {
1321 <                    assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1321 >                    assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1322                  }
1323 +
1324 +                Thread.currentThread().interrupt();
1325                  try {
1326 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1326 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1327                      shouldThrow();
1328                  } catch (InterruptedException success) {}
1329 +                assertFalse(Thread.interrupted());
1330 +
1331 +                pleaseInterrupt.countDown();
1332 +                try {
1333 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1334 +                    shouldThrow();
1335 +                } catch (InterruptedException success) {}
1336 +                assertFalse(Thread.interrupted());
1337              }});
1338  
1339 <        t.start();
1340 <        Thread.sleep(SHORT_DELAY_MS);
1339 >        await(pleaseInterrupt);
1340 >        assertThreadStaysAlive(t);
1341          t.interrupt();
1342 <        t.join();
1342 >        awaitTermination(t);
1343      }
1344  
1345      /**
1346 <     *  timed poll before a delayed offerLast fails; after offerLast succeeds;
1347 <     *  on interruption throws
1346 >     * timed poll before a delayed offerLast fails; after offerLast succeeds;
1347 >     * on interruption throws
1348       */
1349      public void testTimedPollWithOfferLast() throws InterruptedException {
1350          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1351 <        Thread t = new Thread(new CheckedRunnable() {
1351 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1352 >        Thread t = newStartedThread(new CheckedRunnable() {
1353              public void realRun() throws InterruptedException {
1354 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1354 >                long startTime = System.nanoTime();
1355 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1356 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1357 >
1358 >                barrier.await();
1359 >
1360                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1361 +
1362 +                Thread.currentThread().interrupt();
1363 +                try {
1364 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1365 +                    shouldThrow();
1366 +                } catch (InterruptedException success) {}
1367 +                assertFalse(Thread.interrupted());
1368 +
1369 +                barrier.await();
1370                  try {
1371                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1372                      shouldThrow();
1373                  } catch (InterruptedException success) {}
1374 +                assertFalse(Thread.interrupted());
1375              }});
1376  
1377 <        t.start();
1378 <        Thread.sleep(SMALL_DELAY_MS);
1379 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1377 >        barrier.await();
1378 >        long startTime = System.nanoTime();
1379 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1380 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1381 >
1382 >        barrier.await();
1383 >        assertThreadStaysAlive(t);
1384          t.interrupt();
1385 <        t.join();
1385 >        awaitTermination(t);
1386      }
1387  
1220
1388      /**
1389       * element returns next element, or throws NSEE if empty
1390       */
1391      public void testElement() {
1392          LinkedBlockingDeque q = populatedDeque(SIZE);
1393          for (int i = 0; i < SIZE; ++i) {
1394 <            assertEquals(i, ((Integer)q.element()).intValue());
1394 >            assertEquals(i, q.element());
1395              q.poll();
1396          }
1397          try {
# Line 1234 | Line 1401 | public class LinkedBlockingDequeTest ext
1401      }
1402  
1403      /**
1237     * remove(x) removes x and returns true if present
1238     */
1239    public void testRemoveElement() {
1240        LinkedBlockingDeque q = populatedDeque(SIZE);
1241        for (int i = 1; i < SIZE; i+=2) {
1242            assertTrue(q.remove(new Integer(i)));
1243        }
1244        for (int i = 0; i < SIZE; i+=2) {
1245            assertTrue(q.remove(new Integer(i)));
1246            assertFalse(q.remove(new Integer(i+1)));
1247        }
1248        assertTrue(q.isEmpty());
1249    }
1250
1251    /**
1404       * contains(x) reports true when elements added but not yet removed
1405       */
1406      public void testContains() {
# Line 1326 | Line 1478 | public class LinkedBlockingDequeTest ext
1478      }
1479  
1480      /**
1481 <     * toArray contains all elements
1481 >     * toArray contains all elements in FIFO order
1482       */
1483 <    public void testToArray() throws InterruptedException{
1483 >    public void testToArray() throws InterruptedException {
1484          LinkedBlockingDeque q = populatedDeque(SIZE);
1485          Object[] o = q.toArray();
1486          for (int i = 0; i < o.length; i++)
1487 <            assertEquals(o[i], q.take());
1487 >            assertSame(o[i], q.poll());
1488      }
1489  
1490      /**
1491 <     * toArray(a) contains all elements
1491 >     * toArray(a) contains all elements in FIFO order
1492       */
1493 <    public void testToArray2() throws InterruptedException {
1494 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1493 >    public void testToArray2() {
1494 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1495          Integer[] ints = new Integer[SIZE];
1496 <        ints = (Integer[])q.toArray(ints);
1496 >        Integer[] array = q.toArray(ints);
1497 >        assertSame(ints, array);
1498          for (int i = 0; i < ints.length; i++)
1499 <            assertEquals(ints[i], q.take());
1347 <    }
1348 <
1349 <    /**
1350 <     * toArray(null) throws NPE
1351 <     */
1352 <    public void testToArray_BadArg() {
1353 <        try {
1354 <            LinkedBlockingDeque q = populatedDeque(SIZE);
1355 <            Object o[] = q.toArray(null);
1356 <            shouldThrow();
1357 <        } catch (NullPointerException success) {}
1499 >            assertSame(ints[i], q.remove());
1500      }
1501  
1502      /**
1503 <     * toArray with incompatible array type throws CCE
1503 >     * toArray(incompatible array type) throws ArrayStoreException
1504       */
1505      public void testToArray1_BadArg() {
1506 +        LinkedBlockingDeque q = populatedDeque(SIZE);
1507          try {
1508 <            LinkedBlockingDeque q = populatedDeque(SIZE);
1366 <            Object o[] = q.toArray(new String[10] );
1508 >            q.toArray(new String[10]);
1509              shouldThrow();
1510          } catch (ArrayStoreException success) {}
1511      }
1512  
1371
1513      /**
1514       * iterator iterates through all elements
1515       */
# Line 1383 | Line 1524 | public class LinkedBlockingDequeTest ext
1524      /**
1525       * iterator.remove removes current element
1526       */
1527 <    public void testIteratorRemove () {
1527 >    public void testIteratorRemove() {
1528          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1529          q.add(two);
1530          q.add(one);
# Line 1394 | Line 1535 | public class LinkedBlockingDequeTest ext
1535          it.remove();
1536  
1537          it = q.iterator();
1538 <        assertEquals(it.next(), one);
1539 <        assertEquals(it.next(), three);
1538 >        assertSame(it.next(), one);
1539 >        assertSame(it.next(), three);
1540          assertFalse(it.hasNext());
1541      }
1542  
1402
1543      /**
1544       * iterator ordering is FIFO
1545       */
# Line 1411 | Line 1551 | public class LinkedBlockingDequeTest ext
1551          assertEquals(0, q.remainingCapacity());
1552          int k = 0;
1553          for (Iterator it = q.iterator(); it.hasNext();) {
1554 <            int i = ((Integer)(it.next())).intValue();
1415 <            assertEquals(++k, i);
1554 >            assertEquals(++k, it.next());
1555          }
1556          assertEquals(3, k);
1557      }
# Line 1420 | Line 1559 | public class LinkedBlockingDequeTest ext
1559      /**
1560       * Modifications do not cause iterators to fail
1561       */
1562 <    public void testWeaklyConsistentIteration () {
1562 >    public void testWeaklyConsistentIteration() {
1563          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1564          q.add(one);
1565          q.add(two);
# Line 1432 | Line 1571 | public class LinkedBlockingDequeTest ext
1571          assertEquals(0, q.size());
1572      }
1573  
1435
1574      /**
1575 <     *  Descending iterator iterates through all elements
1575 >     * Descending iterator iterates through all elements
1576       */
1577      public void testDescendingIterator() {
1578          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 1453 | Line 1591 | public class LinkedBlockingDequeTest ext
1591      }
1592  
1593      /**
1594 <     *  Descending iterator ordering is reverse FIFO
1594 >     * Descending iterator ordering is reverse FIFO
1595       */
1596      public void testDescendingIteratorOrdering() {
1597          final LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1463 | Line 1601 | public class LinkedBlockingDequeTest ext
1601              q.add(new Integer(1));
1602              int k = 0;
1603              for (Iterator it = q.descendingIterator(); it.hasNext();) {
1604 <                int i = ((Integer)(it.next())).intValue();
1467 <                assertEquals(++k, i);
1604 >                assertEquals(++k, it.next());
1605              }
1606  
1607              assertEquals(3, k);
# Line 1477 | Line 1614 | public class LinkedBlockingDequeTest ext
1614      /**
1615       * descendingIterator.remove removes current element
1616       */
1617 <    public void testDescendingIteratorRemove () {
1617 >    public void testDescendingIteratorRemove() {
1618          final LinkedBlockingDeque q = new LinkedBlockingDeque();
1619          for (int iters = 0; iters < 100; ++iters) {
1620              q.add(new Integer(3));
# Line 1496 | Line 1633 | public class LinkedBlockingDequeTest ext
1633          }
1634      }
1635  
1499
1636      /**
1637       * toString contains toStrings of elements
1638       */
# Line 1504 | Line 1640 | public class LinkedBlockingDequeTest ext
1640          LinkedBlockingDeque q = populatedDeque(SIZE);
1641          String s = q.toString();
1642          for (int i = 0; i < SIZE; ++i) {
1643 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1643 >            assertTrue(s.contains(String.valueOf(i)));
1644          }
1645      }
1646  
1511
1647      /**
1648       * offer transfers elements across Executor tasks
1649       */
# Line 1517 | Line 1652 | public class LinkedBlockingDequeTest ext
1652          q.add(one);
1653          q.add(two);
1654          ExecutorService executor = Executors.newFixedThreadPool(2);
1655 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1656          executor.execute(new CheckedRunnable() {
1657              public void realRun() throws InterruptedException {
1658 <                threadAssertFalse(q.offer(three));
1659 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1660 <                threadAssertEquals(0, q.remainingCapacity());
1658 >                assertFalse(q.offer(three));
1659 >                threadsStarted.await();
1660 >                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1661 >                assertEquals(0, q.remainingCapacity());
1662              }});
1663  
1664          executor.execute(new CheckedRunnable() {
1665              public void realRun() throws InterruptedException {
1666 <                Thread.sleep(SMALL_DELAY_MS);
1667 <                threadAssertEquals(one, q.take());
1666 >                threadsStarted.await();
1667 >                assertSame(one, q.take());
1668              }});
1669  
1670          joinPool(executor);
1671      }
1672  
1673      /**
1674 <     * poll retrieves elements across Executor threads
1674 >     * timed poll retrieves elements across Executor threads
1675       */
1676      public void testPollInExecutor() {
1677          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1678 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1679          ExecutorService executor = Executors.newFixedThreadPool(2);
1680          executor.execute(new CheckedRunnable() {
1681              public void realRun() throws InterruptedException {
1682 <                threadAssertNull(q.poll());
1683 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1684 <                threadAssertTrue(q.isEmpty());
1682 >                assertNull(q.poll());
1683 >                threadsStarted.await();
1684 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1685 >                checkEmpty(q);
1686              }});
1687  
1688          executor.execute(new CheckedRunnable() {
1689              public void realRun() throws InterruptedException {
1690 <                Thread.sleep(SMALL_DELAY_MS);
1690 >                threadsStarted.await();
1691                  q.put(one);
1692              }});
1693  
# Line 1559 | Line 1698 | public class LinkedBlockingDequeTest ext
1698       * A deserialized serialized deque has same elements in same order
1699       */
1700      public void testSerialization() throws Exception {
1701 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1702 <
1564 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1565 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1566 <        out.writeObject(q);
1567 <        out.close();
1701 >        Queue x = populatedDeque(SIZE);
1702 >        Queue y = serialClone(x);
1703  
1704 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1705 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1706 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1707 <        assertEquals(q.size(), r.size());
1708 <        while (!q.isEmpty())
1709 <            assertEquals(q.remove(), r.remove());
1710 <    }
1711 <
1712 <    /**
1578 <     * drainTo(null) throws NPE
1579 <     */
1580 <    public void testDrainToNull() {
1581 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1582 <        try {
1583 <            q.drainTo(null);
1584 <            shouldThrow();
1585 <        } catch (NullPointerException success) {}
1586 <    }
1587 <
1588 <    /**
1589 <     * drainTo(this) throws IAE
1590 <     */
1591 <    public void testDrainToSelf() {
1592 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1593 <        try {
1594 <            q.drainTo(q);
1595 <            shouldThrow();
1596 <        } catch (IllegalArgumentException success) {}
1704 >        assertNotSame(y, x);
1705 >        assertEquals(x.size(), y.size());
1706 >        assertEquals(x.toString(), y.toString());
1707 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1708 >        while (!x.isEmpty()) {
1709 >            assertFalse(y.isEmpty());
1710 >            assertEquals(x.remove(), y.remove());
1711 >        }
1712 >        assertTrue(y.isEmpty());
1713      }
1714  
1715      /**
# Line 1603 | Line 1719 | public class LinkedBlockingDequeTest ext
1719          LinkedBlockingDeque q = populatedDeque(SIZE);
1720          ArrayList l = new ArrayList();
1721          q.drainTo(l);
1722 <        assertEquals(q.size(), 0);
1723 <        assertEquals(l.size(), SIZE);
1722 >        assertEquals(0, q.size());
1723 >        assertEquals(SIZE, l.size());
1724          for (int i = 0; i < SIZE; ++i)
1725              assertEquals(l.get(i), new Integer(i));
1726          q.add(zero);
# Line 1614 | Line 1730 | public class LinkedBlockingDequeTest ext
1730          assertTrue(q.contains(one));
1731          l.clear();
1732          q.drainTo(l);
1733 <        assertEquals(q.size(), 0);
1734 <        assertEquals(l.size(), 2);
1733 >        assertEquals(0, q.size());
1734 >        assertEquals(2, l.size());
1735          for (int i = 0; i < 2; ++i)
1736              assertEquals(l.get(i), new Integer(i));
1737      }
# Line 1641 | Line 1757 | public class LinkedBlockingDequeTest ext
1757      }
1758  
1759      /**
1760 <     * drainTo(null, n) throws NPE
1645 <     */
1646 <    public void testDrainToNullN() {
1647 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1648 <        try {
1649 <            q.drainTo(null, 0);
1650 <            shouldThrow();
1651 <        } catch (NullPointerException success) {}
1652 <    }
1653 <
1654 <    /**
1655 <     * drainTo(this, n) throws IAE
1656 <     */
1657 <    public void testDrainToSelfN() {
1658 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1659 <        try {
1660 <            q.drainTo(q, 0);
1661 <            shouldThrow();
1662 <        } catch (IllegalArgumentException success) {}
1663 <    }
1664 <
1665 <    /**
1666 <     * drainTo(c, n) empties first max {n, size} elements of deque into c
1760 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
1761       */
1762      public void testDrainToN() {
1763          LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1672 | Line 1766 | public class LinkedBlockingDequeTest ext
1766                  assertTrue(q.offer(new Integer(j)));
1767              ArrayList l = new ArrayList();
1768              q.drainTo(l, i);
1769 <            int k = (i < SIZE)? i : SIZE;
1770 <            assertEquals(l.size(), k);
1771 <            assertEquals(q.size(), SIZE-k);
1769 >            int k = (i < SIZE) ? i : SIZE;
1770 >            assertEquals(k, l.size());
1771 >            assertEquals(SIZE-k, q.size());
1772              for (int j = 0; j < k; ++j)
1773                  assertEquals(l.get(j), new Integer(j));
1774              while (q.poll() != null) ;
1775          }
1776      }
1777  
1778 +    /**
1779 +     * remove(null), contains(null) always return false
1780 +     */
1781 +    public void testNeverContainsNull() {
1782 +        Deque<?>[] qs = {
1783 +            new LinkedBlockingDeque<Object>(),
1784 +            populatedDeque(2),
1785 +        };
1786 +
1787 +        for (Deque<?> q : qs) {
1788 +            assertFalse(q.contains(null));
1789 +            assertFalse(q.remove(null));
1790 +            assertFalse(q.removeFirstOccurrence(null));
1791 +            assertFalse(q.removeLastOccurrence(null));
1792 +        }
1793 +    }
1794 +
1795   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines