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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines