ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedBlockingDequeTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.21 by jsr166, Wed Aug 25 00:07:03 2010 UTC vs.
Revision 1.68 by jsr166, Sat Mar 25 21:41:10 2017 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 import junit.framework.*;
8 import java.util.*;
9 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 < import java.io.*;
8 >
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Deque;
13 > import java.util.Iterator;
14 > import java.util.NoSuchElementException;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingDeque;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedBlockingDeque;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingDequeTest extends JSR166TestCase {
26 +
27 +    public static class Unbounded extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedBlockingDeque();
30 +        }
31 +    }
32 +
33 +    public static class Bounded extends BlockingQueueTest {
34 +        protected BlockingQueue emptyCollection() {
35 +            return new LinkedBlockingDeque(SIZE);
36 +        }
37 +    }
38 +
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run(suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
44 <        return new TestSuite(LinkedBlockingDequeTest.class);
44 >        class Implementation implements CollectionImplementation {
45 >            public Class<?> klazz() { return LinkedBlockingDeque.class; }
46 >            public Collection emptyCollection() { return new LinkedBlockingDeque(); }
47 >            public Object makeElement(int i) { return i; }
48 >            public boolean isConcurrent() { return true; }
49 >            public boolean permitsNulls() { return false; }
50 >        }
51 >        return newTestSuite(LinkedBlockingDequeTest.class,
52 >                            new Unbounded().testSuite(),
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58 <     * Create a deque of given size containing consecutive
59 <     * Integers 0 ... n.
60 <     */
61 <    private LinkedBlockingDeque populatedDeque(int n) {
62 <        LinkedBlockingDeque q = new LinkedBlockingDeque(n);
58 >     * Returns a new deque of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60 >     */
61 >    private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62 >        LinkedBlockingDeque<Integer> q =
63 >            new LinkedBlockingDeque<Integer>(n);
64          assertTrue(q.isEmpty());
65          for (int i = 0; i < n; i++)
66              assertTrue(q.offer(new Integer(i)));
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peekFirst());
71 +        assertEquals((Integer) (n - 1), q.peekLast());
72          return q;
73      }
74  
# Line 54 | Line 92 | public class LinkedBlockingDequeTest ext
92      public void testSize() {
93          LinkedBlockingDeque q = populatedDeque(SIZE);
94          for (int i = 0; i < SIZE; ++i) {
95 <            assertEquals(SIZE-i, q.size());
95 >            assertEquals(SIZE - i, q.size());
96              q.removeFirst();
97          }
98          for (int i = 0; i < SIZE; ++i) {
# Line 64 | Line 102 | public class LinkedBlockingDequeTest ext
102      }
103  
104      /**
105 <     * offer(null) throws NPE
105 >     * offerFirst(null) throws NullPointerException
106       */
107      public void testOfferFirstNull() {
108 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
109          try {
71            LinkedBlockingDeque q = new LinkedBlockingDeque();
110              q.offerFirst(null);
111              shouldThrow();
112          } catch (NullPointerException success) {}
113      }
114  
115      /**
116 +     * offerLast(null) throws NullPointerException
117 +     */
118 +    public void testOfferLastNull() {
119 +        LinkedBlockingDeque q = new LinkedBlockingDeque();
120 +        try {
121 +            q.offerLast(null);
122 +            shouldThrow();
123 +        } catch (NullPointerException success) {}
124 +    }
125 +
126 +    /**
127       * OfferFirst succeeds
128       */
129      public void testOfferFirst() {
# Line 93 | Line 142 | public class LinkedBlockingDequeTest ext
142      }
143  
144      /**
145 <     *  pollFirst succeeds unless empty
145 >     * pollFirst succeeds unless empty
146       */
147      public void testPollFirst() {
148          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 104 | Line 153 | public class LinkedBlockingDequeTest ext
153      }
154  
155      /**
156 <     *  pollLast succeeds unless empty
156 >     * pollLast succeeds unless empty
157       */
158      public void testPollLast() {
159          LinkedBlockingDeque q = populatedDeque(SIZE);
160 <        for (int i = SIZE-1; i >= 0; --i) {
160 >        for (int i = SIZE - 1; i >= 0; --i) {
161              assertEquals(i, q.pollLast());
162          }
163          assertNull(q.pollLast());
164      }
165  
166      /**
167 <     *  peekFirst returns next element, or null if empty
167 >     * peekFirst returns next element, or null if empty
168       */
169      public void testPeekFirst() {
170          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 129 | Line 178 | public class LinkedBlockingDequeTest ext
178      }
179  
180      /**
181 <     *  peek returns next element, or null if empty
181 >     * peek returns next element, or null if empty
182       */
183      public void testPeek() {
184          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 143 | Line 192 | public class LinkedBlockingDequeTest ext
192      }
193  
194      /**
195 <     *  peekLast returns next element, or null if empty
195 >     * peekLast returns next element, or null if empty
196       */
197      public void testPeekLast() {
198          LinkedBlockingDeque q = populatedDeque(SIZE);
199 <        for (int i = SIZE-1; i >= 0; --i) {
199 >        for (int i = SIZE - 1; i >= 0; --i) {
200              assertEquals(i, q.peekLast());
201              assertEquals(i, q.pollLast());
202              assertTrue(q.peekLast() == null ||
# Line 157 | Line 206 | public class LinkedBlockingDequeTest ext
206      }
207  
208      /**
209 <     * getFirst returns next getFirst, or throws NSEE if empty
209 >     * getFirst() returns first element, or throws NSEE if empty
210       */
211      public void testFirstElement() {
212          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 173 | Line 222 | public class LinkedBlockingDequeTest ext
222      }
223  
224      /**
225 <     *  getLast returns next element, or throws NSEE if empty
225 >     * getLast() returns last element, or throws NSEE if empty
226       */
227      public void testLastElement() {
228          LinkedBlockingDeque q = populatedDeque(SIZE);
229 <        for (int i = SIZE-1; i >= 0; --i) {
229 >        for (int i = SIZE - 1; i >= 0; --i) {
230              assertEquals(i, q.getLast());
231              assertEquals(i, q.pollLast());
232          }
# Line 189 | Line 238 | public class LinkedBlockingDequeTest ext
238      }
239  
240      /**
241 <     *  removeFirst removes next element, or throws NSEE if empty
241 >     * removeFirst() removes first element, or throws NSEE if empty
242       */
243      public void testRemoveFirst() {
244          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 204 | Line 253 | public class LinkedBlockingDequeTest ext
253      }
254  
255      /**
256 <     *  removeLast removes last element, or throws NSEE if empty
256 >     * removeLast() removes last element, or throws NSEE if empty
257       */
258      public void testRemoveLast() {
259          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 219 | Line 268 | public class LinkedBlockingDequeTest ext
268      }
269  
270      /**
271 <     *  remove removes next element, or throws NSEE if empty
271 >     * remove removes next element, or throws NSEE if empty
272       */
273      public void testRemove() {
274          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 237 | Line 286 | public class LinkedBlockingDequeTest ext
286       */
287      public void testRemoveFirstOccurrence() {
288          LinkedBlockingDeque q = populatedDeque(SIZE);
289 <        for (int i = 1; i < SIZE; i+=2) {
289 >        for (int i = 1; i < SIZE; i += 2) {
290              assertTrue(q.removeFirstOccurrence(new Integer(i)));
291          }
292 <        for (int i = 0; i < SIZE; i+=2) {
292 >        for (int i = 0; i < SIZE; i += 2) {
293              assertTrue(q.removeFirstOccurrence(new Integer(i)));
294 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
294 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
295          }
296          assertTrue(q.isEmpty());
297      }
# Line 252 | Line 301 | public class LinkedBlockingDequeTest ext
301       */
302      public void testRemoveLastOccurrence() {
303          LinkedBlockingDeque q = populatedDeque(SIZE);
304 <        for (int i = 1; i < SIZE; i+=2) {
304 >        for (int i = 1; i < SIZE; i += 2) {
305              assertTrue(q.removeLastOccurrence(new Integer(i)));
306          }
307 <        for (int i = 0; i < SIZE; i+=2) {
307 >        for (int i = 0; i < SIZE; i += 2) {
308              assertTrue(q.removeLastOccurrence(new Integer(i)));
309 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
309 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
310          }
311          assertTrue(q.isEmpty());
312      }
# Line 282 | Line 331 | public class LinkedBlockingDequeTest ext
331          assertSame(four, q.peekLast());
332      }
333  
285
334      /**
335       * A new deque has the indicated capacity, or Integer.MAX_VALUE if
336       * none given
# Line 293 | Line 341 | public class LinkedBlockingDequeTest ext
341      }
342  
343      /**
344 <     * Constructor throws IAE if capacity argument nonpositive
344 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
345       */
346      public void testConstructor2() {
347          try {
348 <            LinkedBlockingDeque q = new LinkedBlockingDeque(0);
348 >            new LinkedBlockingDeque(0);
349              shouldThrow();
350          } catch (IllegalArgumentException success) {}
351      }
352  
353      /**
354 <     * Initializing from null Collection throws NPE
354 >     * Initializing from null Collection throws NullPointerException
355       */
356      public void testConstructor3() {
357          try {
358 <            LinkedBlockingDeque q = new LinkedBlockingDeque(null);
358 >            new LinkedBlockingDeque(null);
359              shouldThrow();
360          } catch (NullPointerException success) {}
361      }
362  
363      /**
364 <     * Initializing from Collection of null elements throws NPE
364 >     * Initializing from Collection of null elements throws NullPointerException
365       */
366      public void testConstructor4() {
367 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
368          try {
369 <            Integer[] ints = new Integer[SIZE];
321 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
369 >            new LinkedBlockingDeque(elements);
370              shouldThrow();
371          } catch (NullPointerException success) {}
372      }
373  
374      /**
375 <     * Initializing from Collection with some null elements throws NPE
375 >     * Initializing from Collection with some null elements throws
376 >     * NullPointerException
377       */
378      public void testConstructor5() {
379 +        Integer[] ints = new Integer[SIZE];
380 +        for (int i = 0; i < SIZE - 1; ++i)
381 +            ints[i] = i;
382 +        Collection<Integer> elements = Arrays.asList(ints);
383          try {
384 <            Integer[] ints = new Integer[SIZE];
332 <            for (int i = 0; i < SIZE-1; ++i)
333 <                ints[i] = new Integer(i);
334 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
384 >            new LinkedBlockingDeque(elements);
385              shouldThrow();
386          } catch (NullPointerException success) {}
387      }
# Line 342 | Line 392 | public class LinkedBlockingDequeTest ext
392      public void testConstructor6() {
393          Integer[] ints = new Integer[SIZE];
394          for (int i = 0; i < SIZE; ++i)
395 <            ints[i] = new Integer(i);
395 >            ints[i] = i;
396          LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
397          for (int i = 0; i < SIZE; ++i)
398              assertEquals(ints[i], q.poll());
# Line 367 | Line 417 | public class LinkedBlockingDequeTest ext
417       * remainingCapacity decreases on add, increases on remove
418       */
419      public void testRemainingCapacity() {
420 <        LinkedBlockingDeque q = populatedDeque(SIZE);
420 >        BlockingQueue q = populatedDeque(SIZE);
421          for (int i = 0; i < SIZE; ++i) {
422              assertEquals(i, q.remainingCapacity());
423 <            assertEquals(SIZE-i, q.size());
424 <            q.remove();
423 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
424 >            assertEquals(i, q.remove());
425          }
426          for (int i = 0; i < SIZE; ++i) {
427 <            assertEquals(SIZE-i, q.remainingCapacity());
428 <            assertEquals(i, q.size());
429 <            q.add(new Integer(i));
427 >            assertEquals(SIZE - i, q.remainingCapacity());
428 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
429 >            assertTrue(q.add(i));
430          }
431      }
432  
433      /**
384     * offer(null) throws NPE
385     */
386    public void testOfferNull() {
387        try {
388            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
389            q.offer(null);
390            shouldThrow();
391        } catch (NullPointerException success) {}
392    }
393
394    /**
395     * add(null) throws NPE
396     */
397    public void testAddNull() {
398        try {
399            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
400            q.add(null);
401            shouldThrow();
402        } catch (NullPointerException success) {}
403    }
404
405    /**
434       * push(null) throws NPE
435       */
436      public void testPushNull() {
437 +        LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438          try {
410            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
439              q.push(null);
440              shouldThrow();
441          } catch (NullPointerException success) {}
# Line 417 | Line 445 | public class LinkedBlockingDequeTest ext
445       * push succeeds if not full; throws ISE if full
446       */
447      public void testPush() {
448 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
449 +        for (int i = 0; i < SIZE; ++i) {
450 +            Integer x = new Integer(i);
451 +            q.push(x);
452 +            assertEquals(x, q.peek());
453 +        }
454 +        assertEquals(0, q.remainingCapacity());
455          try {
421            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
422            for (int i = 0; i < SIZE; ++i) {
423                Integer I = new Integer(i);
424                q.push(I);
425                assertEquals(I, q.peek());
426            }
427            assertEquals(0, q.remainingCapacity());
456              q.push(new Integer(SIZE));
457              shouldThrow();
458          } catch (IllegalStateException success) {}
# Line 440 | Line 468 | public class LinkedBlockingDequeTest ext
468          assertSame(four, q.peekFirst());
469      }
470  
443
471      /**
472 <     *  pop removes next element, or throws NSEE if empty
472 >     * pop removes next element, or throws NSEE if empty
473       */
474      public void testPop() {
475          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 455 | Line 482 | public class LinkedBlockingDequeTest ext
482          } catch (NoSuchElementException success) {}
483      }
484  
458
485      /**
486       * Offer succeeds if not full; fails if full
487       */
# Line 469 | Line 495 | public class LinkedBlockingDequeTest ext
495       * add succeeds if not full; throws ISE if full
496       */
497      public void testAdd() {
498 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
499 +        for (int i = 0; i < SIZE; ++i)
500 +            assertTrue(q.add(new Integer(i)));
501 +        assertEquals(0, q.remainingCapacity());
502          try {
473            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
474            for (int i = 0; i < SIZE; ++i) {
475                assertTrue(q.add(new Integer(i)));
476            }
477            assertEquals(0, q.remainingCapacity());
503              q.add(new Integer(SIZE));
504              shouldThrow();
505          } catch (IllegalStateException success) {}
506      }
507  
508      /**
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    /**
509       * addAll(this) throws IAE
510       */
511      public void testAddAllSelf() {
512 +        LinkedBlockingDeque q = populatedDeque(SIZE);
513          try {
499            LinkedBlockingDeque q = populatedDeque(SIZE);
514              q.addAll(q);
515              shouldThrow();
516          } catch (IllegalArgumentException success) {}
517      }
518  
519      /**
506     * addAll of a collection with null elements throws NPE
507     */
508    public void testAddAll2() {
509        try {
510            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
511            Integer[] ints = new Integer[SIZE];
512            q.addAll(Arrays.asList(ints));
513            shouldThrow();
514        } catch (NullPointerException success) {}
515    }
516    /**
520       * addAll of a collection with any null elements throws NPE after
521       * possibly adding some elements
522       */
523      public void testAddAll3() {
524 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
525 +        Integer[] ints = new Integer[SIZE];
526 +        for (int i = 0; i < SIZE - 1; ++i)
527 +            ints[i] = new Integer(i);
528 +        Collection<Integer> elements = Arrays.asList(ints);
529          try {
530 <            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
523 <            Integer[] ints = new Integer[SIZE];
524 <            for (int i = 0; i < SIZE-1; ++i)
525 <                ints[i] = new Integer(i);
526 <            q.addAll(Arrays.asList(ints));
530 >            q.addAll(elements);
531              shouldThrow();
532          } catch (NullPointerException success) {}
533      }
534 +
535      /**
536 <     * addAll throws ISE if not enough room
536 >     * addAll throws IllegalStateException if not enough room
537       */
538      public void testAddAll4() {
539 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE - 1);
540 +        Integer[] ints = new Integer[SIZE];
541 +        for (int i = 0; i < SIZE; ++i)
542 +            ints[i] = new Integer(i);
543 +        Collection<Integer> elements = Arrays.asList(ints);
544          try {
545 <            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
536 <            Integer[] ints = new Integer[SIZE];
537 <            for (int i = 0; i < SIZE; ++i)
538 <                ints[i] = new Integer(i);
539 <            q.addAll(Arrays.asList(ints));
545 >            q.addAll(elements);
546              shouldThrow();
547          } catch (IllegalStateException success) {}
548      }
# Line 556 | Line 562 | public class LinkedBlockingDequeTest ext
562              assertEquals(ints[i], q.poll());
563      }
564  
559
560    /**
561     * put(null) throws NPE
562     */
563    public void testPutNull() throws InterruptedException {
564        try {
565            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
566            q.put(null);
567            shouldThrow();
568        } catch (NullPointerException success) {}
569    }
570
565      /**
566       * all elements successfully put are contained
567       */
568      public void testPut() throws InterruptedException {
569          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
570          for (int i = 0; i < SIZE; ++i) {
571 <            Integer I = new Integer(i);
572 <            q.put(I);
573 <            assertTrue(q.contains(I));
571 >            Integer x = new Integer(i);
572 >            q.put(x);
573 >            assertTrue(q.contains(x));
574          }
575          assertEquals(0, q.remainingCapacity());
576      }
# Line 586 | Line 580 | public class LinkedBlockingDequeTest ext
580       */
581      public void testBlockingPut() throws InterruptedException {
582          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
583 <        Thread t = new Thread(new CheckedRunnable() {
583 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
584 >        Thread t = newStartedThread(new CheckedRunnable() {
585              public void realRun() throws InterruptedException {
586                  for (int i = 0; i < SIZE; ++i)
587                      q.put(i);
588                  assertEquals(SIZE, q.size());
589                  assertEquals(0, q.remainingCapacity());
590 +
591 +                Thread.currentThread().interrupt();
592                  try {
593                      q.put(99);
594                      shouldThrow();
595                  } catch (InterruptedException success) {}
596 +                assertFalse(Thread.interrupted());
597 +
598 +                pleaseInterrupt.countDown();
599 +                try {
600 +                    q.put(99);
601 +                    shouldThrow();
602 +                } catch (InterruptedException success) {}
603 +                assertFalse(Thread.interrupted());
604              }});
605  
606 <        t.start();
607 <        Thread.sleep(SHORT_DELAY_MS);
606 >        await(pleaseInterrupt);
607 >        assertThreadStaysAlive(t);
608          t.interrupt();
609 <        t.join();
609 >        awaitTermination(t);
610          assertEquals(SIZE, q.size());
611          assertEquals(0, q.remainingCapacity());
612      }
613  
614      /**
615 <     * put blocks waiting for take when full
615 >     * put blocks interruptibly waiting for take when full
616       */
617      public void testPutWithTake() throws InterruptedException {
618          final int capacity = 2;
619          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
620 <        Thread t = new Thread(new CheckedRunnable() {
620 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
621 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
622 >        Thread t = newStartedThread(new CheckedRunnable() {
623              public void realRun() throws InterruptedException {
624 <                for (int i = 0; i < capacity + 1; i++)
624 >                for (int i = 0; i < capacity; i++)
625                      q.put(i);
626 +                pleaseTake.countDown();
627 +                q.put(86);
628 +
629 +                pleaseInterrupt.countDown();
630                  try {
631                      q.put(99);
632                      shouldThrow();
633                  } catch (InterruptedException success) {}
634 +                assertFalse(Thread.interrupted());
635              }});
636  
637 <        t.start();
638 <        Thread.sleep(SHORT_DELAY_MS);
627 <        assertEquals(q.remainingCapacity(), 0);
637 >        await(pleaseTake);
638 >        assertEquals(0, q.remainingCapacity());
639          assertEquals(0, q.take());
640 <        Thread.sleep(SHORT_DELAY_MS);
640 >
641 >        await(pleaseInterrupt);
642 >        assertThreadStaysAlive(t);
643          t.interrupt();
644 <        t.join();
645 <        assertEquals(q.remainingCapacity(), 0);
644 >        awaitTermination(t);
645 >        assertEquals(0, q.remainingCapacity());
646      }
647  
648      /**
# Line 637 | Line 650 | public class LinkedBlockingDequeTest ext
650       */
651      public void testTimedOffer() throws InterruptedException {
652          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
653 <        Thread t = new Thread(new CheckedRunnable() {
653 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
654 >        Thread t = newStartedThread(new CheckedRunnable() {
655              public void realRun() throws InterruptedException {
656                  q.put(new Object());
657                  q.put(new Object());
658 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
658 >                long startTime = System.nanoTime();
659 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
660 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
661 >                pleaseInterrupt.countDown();
662                  try {
663 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
663 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
664                      shouldThrow();
665                  } catch (InterruptedException success) {}
666              }});
667  
668 <        t.start();
669 <        Thread.sleep(SMALL_DELAY_MS);
668 >        await(pleaseInterrupt);
669 >        assertThreadStaysAlive(t);
670          t.interrupt();
671 <        t.join();
671 >        awaitTermination(t);
672      }
673  
674      /**
# Line 665 | Line 682 | public class LinkedBlockingDequeTest ext
682      }
683  
684      /**
685 <     * take blocks interruptibly when empty
669 <     */
670 <    public void testTakeFromEmpty() throws InterruptedException {
671 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
672 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
673 <            public void realRun() throws InterruptedException {
674 <                q.take();
675 <            }};
676 <
677 <        t.start();
678 <        Thread.sleep(SHORT_DELAY_MS);
679 <        t.interrupt();
680 <        t.join();
681 <    }
682 <
683 <    /**
684 <     * Take removes existing elements until empty, then blocks interruptibly
685 >     * take removes existing elements until empty, then blocks interruptibly
686       */
687      public void testBlockingTake() throws InterruptedException {
688          final LinkedBlockingDeque q = populatedDeque(SIZE);
689 <        Thread t = new Thread(new CheckedRunnable() {
689 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
690 >        Thread t = newStartedThread(new CheckedRunnable() {
691              public void realRun() throws InterruptedException {
692                  for (int i = 0; i < SIZE; ++i) {
693                      assertEquals(i, q.take());
694                  }
695 +
696 +                Thread.currentThread().interrupt();
697                  try {
698                      q.take();
699                      shouldThrow();
700                  } catch (InterruptedException success) {}
701 +                assertFalse(Thread.interrupted());
702 +
703 +                pleaseInterrupt.countDown();
704 +                try {
705 +                    q.take();
706 +                    shouldThrow();
707 +                } catch (InterruptedException success) {}
708 +                assertFalse(Thread.interrupted());
709              }});
710  
711 <        t.start();
712 <        Thread.sleep(SHORT_DELAY_MS);
711 >        await(pleaseInterrupt);
712 >        assertThreadStaysAlive(t);
713          t.interrupt();
714 <        t.join();
714 >        awaitTermination(t);
715      }
716  
705
717      /**
718       * poll succeeds unless empty
719       */
# Line 731 | Line 742 | public class LinkedBlockingDequeTest ext
742      public void testTimedPoll() throws InterruptedException {
743          LinkedBlockingDeque q = populatedDeque(SIZE);
744          for (int i = 0; i < SIZE; ++i) {
745 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
746 <        }
747 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
745 >            long startTime = System.nanoTime();
746 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
747 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
748 >        }
749 >        long startTime = System.nanoTime();
750 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
751 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
752 >        checkEmpty(q);
753      }
754  
755      /**
# Line 741 | Line 757 | public class LinkedBlockingDequeTest ext
757       * returning timeout status
758       */
759      public void testInterruptedTimedPoll() throws InterruptedException {
760 <        Thread t = new Thread(new CheckedRunnable() {
760 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
761 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
762 >        Thread t = newStartedThread(new CheckedRunnable() {
763              public void realRun() throws InterruptedException {
764 <                LinkedBlockingDeque q = populatedDeque(SIZE);
764 >                long startTime = System.nanoTime();
765                  for (int i = 0; i < SIZE; ++i) {
766 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
766 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
767                  }
768 <                try {
751 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
752 <                    shouldThrow();
753 <                } catch (InterruptedException success) {}
754 <            }});
755 <
756 <        t.start();
757 <        Thread.sleep(SHORT_DELAY_MS);
758 <        t.interrupt();
759 <        t.join();
760 <    }
761 <
762 <    /**
763 <     *  timed poll before a delayed offer fails; after offer succeeds;
764 <     *  on interruption throws
765 <     */
766 <    public void testTimedPollWithOffer() throws InterruptedException {
767 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
768 <        Thread t = new Thread(new CheckedRunnable() {
769 <            public void realRun() throws InterruptedException {
770 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
771 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
768 >                aboutToWait.countDown();
769                  try {
770                      q.poll(LONG_DELAY_MS, MILLISECONDS);
771                      shouldThrow();
772 <                } catch (InterruptedException success) {}
772 >                } catch (InterruptedException success) {
773 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
774 >                }
775              }});
776  
777 <        t.start();
778 <        Thread.sleep(SMALL_DELAY_MS);
780 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
777 >        await(aboutToWait);
778 >        waitForThreadToEnterWaitState(t);
779          t.interrupt();
780 <        t.join();
780 >        awaitTermination(t);
781 >        checkEmpty(q);
782      }
783  
785
784      /**
785       * putFirst(null) throws NPE
786       */
787 <     public void testPutFirstNull() throws InterruptedException {
787 >    public void testPutFirstNull() throws InterruptedException {
788 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
789          try {
791            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
790              q.putFirst(null);
791              shouldThrow();
792          } catch (NullPointerException success) {}
793 <     }
793 >    }
794  
795      /**
796       * all elements successfully putFirst are contained
797       */
798 <     public void testPutFirst() throws InterruptedException {
799 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
800 <         for (int i = 0; i < SIZE; ++i) {
801 <             Integer I = new Integer(i);
802 <             q.putFirst(I);
803 <             assertTrue(q.contains(I));
804 <         }
805 <         assertEquals(0, q.remainingCapacity());
798 >    public void testPutFirst() throws InterruptedException {
799 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
800 >        for (int i = 0; i < SIZE; ++i) {
801 >            Integer x = new Integer(i);
802 >            q.putFirst(x);
803 >            assertTrue(q.contains(x));
804 >        }
805 >        assertEquals(0, q.remainingCapacity());
806      }
807  
808      /**
# Line 812 | Line 810 | public class LinkedBlockingDequeTest ext
810       */
811      public void testBlockingPutFirst() throws InterruptedException {
812          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
813 <        Thread t = new Thread(new CheckedRunnable() {
813 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
814 >        Thread t = newStartedThread(new CheckedRunnable() {
815              public void realRun() throws InterruptedException {
816                  for (int i = 0; i < SIZE; ++i)
817                      q.putFirst(i);
818                  assertEquals(SIZE, q.size());
819                  assertEquals(0, q.remainingCapacity());
820 +
821 +                Thread.currentThread().interrupt();
822                  try {
823                      q.putFirst(99);
824                      shouldThrow();
825                  } catch (InterruptedException success) {}
826 +                assertFalse(Thread.interrupted());
827 +
828 +                pleaseInterrupt.countDown();
829 +                try {
830 +                    q.putFirst(99);
831 +                    shouldThrow();
832 +                } catch (InterruptedException success) {}
833 +                assertFalse(Thread.interrupted());
834              }});
835  
836 <        t.start();
837 <        Thread.sleep(SHORT_DELAY_MS);
836 >        await(pleaseInterrupt);
837 >        assertThreadStaysAlive(t);
838          t.interrupt();
839 <        t.join();
839 >        awaitTermination(t);
840          assertEquals(SIZE, q.size());
841          assertEquals(0, q.remainingCapacity());
842      }
843  
844      /**
845 <     * putFirst blocks waiting for take when full
845 >     * putFirst blocks interruptibly waiting for take when full
846       */
847      public void testPutFirstWithTake() throws InterruptedException {
848          final int capacity = 2;
849          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
850 <        Thread t = new Thread(new CheckedRunnable() {
850 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
851 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
852 >        Thread t = newStartedThread(new CheckedRunnable() {
853              public void realRun() throws InterruptedException {
854 <                for (int i = 0; i < capacity + 1; i++)
854 >                for (int i = 0; i < capacity; i++)
855                      q.putFirst(i);
856 +                pleaseTake.countDown();
857 +                q.putFirst(86);
858 +
859 +                pleaseInterrupt.countDown();
860                  try {
861                      q.putFirst(99);
862                      shouldThrow();
863                  } catch (InterruptedException success) {}
864 +                assertFalse(Thread.interrupted());
865              }});
866  
867 <        t.start();
868 <        Thread.sleep(SHORT_DELAY_MS);
853 <        assertEquals(q.remainingCapacity(), 0);
867 >        await(pleaseTake);
868 >        assertEquals(0, q.remainingCapacity());
869          assertEquals(capacity - 1, q.take());
870 <        Thread.sleep(SHORT_DELAY_MS);
870 >
871 >        await(pleaseInterrupt);
872 >        assertThreadStaysAlive(t);
873          t.interrupt();
874 <        t.join();
875 <        assertEquals(q.remainingCapacity(), 0);
874 >        awaitTermination(t);
875 >        assertEquals(0, q.remainingCapacity());
876      }
877  
878      /**
# Line 863 | Line 880 | public class LinkedBlockingDequeTest ext
880       */
881      public void testTimedOfferFirst() throws InterruptedException {
882          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
883 <        Thread t = new Thread(new CheckedRunnable() {
883 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
884 >        Thread t = newStartedThread(new CheckedRunnable() {
885              public void realRun() throws InterruptedException {
886                  q.putFirst(new Object());
887                  q.putFirst(new Object());
888 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
888 >                long startTime = System.nanoTime();
889 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
890 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
891 >                pleaseInterrupt.countDown();
892                  try {
893 <                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
893 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
894                      shouldThrow();
895                  } catch (InterruptedException success) {}
896              }});
897  
898 <        t.start();
899 <        Thread.sleep(SMALL_DELAY_MS);
898 >        await(pleaseInterrupt);
899 >        assertThreadStaysAlive(t);
900          t.interrupt();
901 <        t.join();
901 >        awaitTermination(t);
902      }
903  
904      /**
# Line 891 | Line 912 | public class LinkedBlockingDequeTest ext
912      }
913  
914      /**
915 <     * takeFirst blocks interruptibly when empty
915 >     * takeFirst() blocks interruptibly when empty
916       */
917 <    public void testTakeFirstFromEmpty() throws InterruptedException {
918 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
919 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
920 <            public void realRun() throws InterruptedException {
921 <                q.takeFirst();
922 <            }};
917 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
918 >        final BlockingDeque q = new LinkedBlockingDeque();
919 >        final CountDownLatch threadStarted = new CountDownLatch(1);
920 >        Thread t = newStartedThread(new CheckedRunnable() {
921 >            public void realRun() {
922 >                threadStarted.countDown();
923 >                try {
924 >                    q.takeFirst();
925 >                    shouldThrow();
926 >                } catch (InterruptedException success) {}
927 >                assertFalse(Thread.interrupted());
928 >            }});
929  
930 <        t.start();
931 <        Thread.sleep(SHORT_DELAY_MS);
930 >        await(threadStarted);
931 >        assertThreadStaysAlive(t);
932          t.interrupt();
933 <        t.join();
933 >        awaitTermination(t);
934 >    }
935 >
936 >    /**
937 >     * takeFirst() throws InterruptedException immediately if interrupted
938 >     * before waiting
939 >     */
940 >    public void testTakeFirstFromEmptyAfterInterrupt() {
941 >        final BlockingDeque q = new LinkedBlockingDeque();
942 >        Thread t = newStartedThread(new CheckedRunnable() {
943 >            public void realRun() {
944 >                Thread.currentThread().interrupt();
945 >                try {
946 >                    q.takeFirst();
947 >                    shouldThrow();
948 >                } catch (InterruptedException success) {}
949 >                assertFalse(Thread.interrupted());
950 >            }});
951 >
952 >        awaitTermination(t);
953 >    }
954 >
955 >    /**
956 >     * takeLast() blocks interruptibly when empty
957 >     */
958 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
959 >        final BlockingDeque q = new LinkedBlockingDeque();
960 >        final CountDownLatch threadStarted = new CountDownLatch(1);
961 >        Thread t = newStartedThread(new CheckedRunnable() {
962 >            public void realRun() {
963 >                threadStarted.countDown();
964 >                try {
965 >                    q.takeLast();
966 >                    shouldThrow();
967 >                } catch (InterruptedException success) {}
968 >                assertFalse(Thread.interrupted());
969 >            }});
970 >
971 >        await(threadStarted);
972 >        assertThreadStaysAlive(t);
973 >        t.interrupt();
974 >        awaitTermination(t);
975 >    }
976 >
977 >    /**
978 >     * takeLast() throws InterruptedException immediately if interrupted
979 >     * before waiting
980 >     */
981 >    public void testTakeLastFromEmptyAfterInterrupt() {
982 >        final BlockingDeque q = new LinkedBlockingDeque();
983 >        Thread t = newStartedThread(new CheckedRunnable() {
984 >            public void realRun() {
985 >                Thread.currentThread().interrupt();
986 >                try {
987 >                    q.takeLast();
988 >                    shouldThrow();
989 >                } catch (InterruptedException success) {}
990 >                assertFalse(Thread.interrupted());
991 >            }});
992 >
993 >        awaitTermination(t);
994      }
995  
996      /**
997 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
997 >     * takeFirst removes existing elements until empty, then blocks interruptibly
998       */
999      public void testBlockingTakeFirst() throws InterruptedException {
1000          final LinkedBlockingDeque q = populatedDeque(SIZE);
1001 <        Thread t = new Thread(new CheckedRunnable() {
1001 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1002 >        Thread t = newStartedThread(new CheckedRunnable() {
1003              public void realRun() throws InterruptedException {
1004 <                for (int i = 0; i < SIZE; ++i)
1004 >                for (int i = 0; i < SIZE; ++i) {
1005                      assertEquals(i, q.takeFirst());
1006 +                }
1007 +
1008 +                Thread.currentThread().interrupt();
1009 +                try {
1010 +                    q.takeFirst();
1011 +                    shouldThrow();
1012 +                } catch (InterruptedException success) {}
1013 +                assertFalse(Thread.interrupted());
1014 +
1015 +                pleaseInterrupt.countDown();
1016                  try {
1017                      q.takeFirst();
1018                      shouldThrow();
1019                  } catch (InterruptedException success) {}
1020 +                assertFalse(Thread.interrupted());
1021              }});
1022  
1023 <        t.start();
1024 <        Thread.sleep(SHORT_DELAY_MS);
1023 >        await(pleaseInterrupt);
1024 >        assertThreadStaysAlive(t);
1025          t.interrupt();
1026 <        t.join();
1026 >        awaitTermination(t);
1027      }
1028  
930
1029      /**
1030       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1031       */
# Line 945 | Line 1043 | public class LinkedBlockingDequeTest ext
1043      public void testTimedPollFirst() throws InterruptedException {
1044          LinkedBlockingDeque q = populatedDeque(SIZE);
1045          for (int i = 0; i < SIZE; ++i) {
1046 <            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1047 <        }
1048 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1046 >            long startTime = System.nanoTime();
1047 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1048 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1049 >        }
1050 >        long startTime = System.nanoTime();
1051 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1052 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1053 >        checkEmpty(q);
1054      }
1055  
1056      /**
# Line 955 | Line 1058 | public class LinkedBlockingDequeTest ext
1058       * returning timeout status
1059       */
1060      public void testInterruptedTimedPollFirst() throws InterruptedException {
1061 <        Thread t = new Thread(new CheckedRunnable() {
1061 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1062 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1063 >        Thread t = newStartedThread(new CheckedRunnable() {
1064              public void realRun() throws InterruptedException {
1065 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1065 >                long startTime = System.nanoTime();
1066                  for (int i = 0; i < SIZE; ++i) {
1067 <                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1067 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1068                  }
1069 +
1070 +                Thread.currentThread().interrupt();
1071 +                try {
1072 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1073 +                    shouldThrow();
1074 +                } catch (InterruptedException success) {}
1075 +                assertFalse(Thread.interrupted());
1076 +
1077 +                pleaseInterrupt.countDown();
1078                  try {
1079 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1079 >                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1080                      shouldThrow();
1081                  } catch (InterruptedException success) {}
1082 +                assertFalse(Thread.interrupted());
1083 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1084              }});
1085  
1086 <        t.start();
1087 <        Thread.sleep(SHORT_DELAY_MS);
1086 >        await(pleaseInterrupt);
1087 >        assertThreadStaysAlive(t);
1088          t.interrupt();
1089 <        t.join();
1089 >        awaitTermination(t);
1090      }
1091  
1092      /**
1093 <     *  timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1094 <     *  on interruption throws
1093 >     * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1094 >     * on interruption throws
1095       */
1096      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1097          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1098 <        Thread t = new Thread(new CheckedRunnable() {
1098 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1099 >        Thread t = newStartedThread(new CheckedRunnable() {
1100              public void realRun() throws InterruptedException {
1101 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1101 >                long startTime = System.nanoTime();
1102 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1103 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1104 >
1105 >                barrier.await();
1106 >
1107                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1108 +
1109 +                Thread.currentThread().interrupt();
1110 +                try {
1111 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1112 +                    shouldThrow();
1113 +                } catch (InterruptedException success) {}
1114 +
1115 +                barrier.await();
1116                  try {
1117                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1118                      shouldThrow();
1119                  } catch (InterruptedException success) {}
1120 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1121              }});
1122  
1123 <        t.start();
1124 <        Thread.sleep(SMALL_DELAY_MS);
1125 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1123 >        barrier.await();
1124 >        long startTime = System.nanoTime();
1125 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1126 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1127 >        barrier.await();
1128 >        assertThreadStaysAlive(t);
1129          t.interrupt();
1130 <        t.join();
1130 >        awaitTermination(t);
1131      }
1132  
1133      /**
1134       * putLast(null) throws NPE
1135       */
1136 <     public void testPutLastNull() throws InterruptedException {
1136 >    public void testPutLastNull() throws InterruptedException {
1137 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1138          try {
1004            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1139              q.putLast(null);
1140              shouldThrow();
1141          } catch (NullPointerException success) {}
1142 <     }
1142 >    }
1143  
1144      /**
1145       * all elements successfully putLast are contained
1146       */
1147 <     public void testPutLast() throws InterruptedException {
1148 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1149 <         for (int i = 0; i < SIZE; ++i) {
1150 <             Integer I = new Integer(i);
1151 <             q.putLast(I);
1152 <             assertTrue(q.contains(I));
1153 <         }
1154 <         assertEquals(0, q.remainingCapacity());
1147 >    public void testPutLast() throws InterruptedException {
1148 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1149 >        for (int i = 0; i < SIZE; ++i) {
1150 >            Integer x = new Integer(i);
1151 >            q.putLast(x);
1152 >            assertTrue(q.contains(x));
1153 >        }
1154 >        assertEquals(0, q.remainingCapacity());
1155      }
1156  
1157      /**
# Line 1025 | Line 1159 | public class LinkedBlockingDequeTest ext
1159       */
1160      public void testBlockingPutLast() throws InterruptedException {
1161          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1162 <        Thread t = new Thread(new CheckedRunnable() {
1162 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1163 >        Thread t = newStartedThread(new CheckedRunnable() {
1164              public void realRun() throws InterruptedException {
1165                  for (int i = 0; i < SIZE; ++i)
1166                      q.putLast(i);
1167                  assertEquals(SIZE, q.size());
1168                  assertEquals(0, q.remainingCapacity());
1169 +
1170 +                Thread.currentThread().interrupt();
1171                  try {
1172                      q.putLast(99);
1173                      shouldThrow();
1174                  } catch (InterruptedException success) {}
1175 +                assertFalse(Thread.interrupted());
1176 +
1177 +                pleaseInterrupt.countDown();
1178 +                try {
1179 +                    q.putLast(99);
1180 +                    shouldThrow();
1181 +                } catch (InterruptedException success) {}
1182 +                assertFalse(Thread.interrupted());
1183              }});
1184  
1185 <        t.start();
1186 <        Thread.sleep(SHORT_DELAY_MS);
1185 >        await(pleaseInterrupt);
1186 >        assertThreadStaysAlive(t);
1187          t.interrupt();
1188 <        t.join();
1188 >        awaitTermination(t);
1189          assertEquals(SIZE, q.size());
1190          assertEquals(0, q.remainingCapacity());
1191      }
1192  
1193      /**
1194 <     * putLast blocks waiting for take when full
1194 >     * putLast blocks interruptibly waiting for take when full
1195       */
1196      public void testPutLastWithTake() throws InterruptedException {
1197          final int capacity = 2;
1198          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1199 <        Thread t = new Thread(new CheckedRunnable() {
1199 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1200 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1201 >        Thread t = newStartedThread(new CheckedRunnable() {
1202              public void realRun() throws InterruptedException {
1203 <                for (int i = 0; i < capacity + 1; i++)
1203 >                for (int i = 0; i < capacity; i++)
1204                      q.putLast(i);
1205 +                pleaseTake.countDown();
1206 +                q.putLast(86);
1207 +
1208 +                pleaseInterrupt.countDown();
1209                  try {
1210                      q.putLast(99);
1211                      shouldThrow();
1212                  } catch (InterruptedException success) {}
1213 +                assertFalse(Thread.interrupted());
1214              }});
1215  
1216 <        t.start();
1217 <        Thread.sleep(SHORT_DELAY_MS);
1066 <        assertEquals(q.remainingCapacity(), 0);
1216 >        await(pleaseTake);
1217 >        assertEquals(0, q.remainingCapacity());
1218          assertEquals(0, q.take());
1219 <        Thread.sleep(SHORT_DELAY_MS);
1219 >
1220 >        await(pleaseInterrupt);
1221 >        assertThreadStaysAlive(t);
1222          t.interrupt();
1223 <        t.join();
1224 <        assertEquals(q.remainingCapacity(), 0);
1223 >        awaitTermination(t);
1224 >        assertEquals(0, q.remainingCapacity());
1225      }
1226  
1227      /**
# Line 1076 | Line 1229 | public class LinkedBlockingDequeTest ext
1229       */
1230      public void testTimedOfferLast() throws InterruptedException {
1231          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1232 <        Thread t = new Thread(new CheckedRunnable() {
1232 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1233 >        Thread t = newStartedThread(new CheckedRunnable() {
1234              public void realRun() throws InterruptedException {
1235                  q.putLast(new Object());
1236                  q.putLast(new Object());
1237 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1237 >                long startTime = System.nanoTime();
1238 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1239 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1240 >                pleaseInterrupt.countDown();
1241                  try {
1242 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1242 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1243                      shouldThrow();
1244                  } catch (InterruptedException success) {}
1245              }});
1246  
1247 <        t.start();
1248 <        Thread.sleep(SMALL_DELAY_MS);
1247 >        await(pleaseInterrupt);
1248 >        assertThreadStaysAlive(t);
1249          t.interrupt();
1250 <        t.join();
1250 >        awaitTermination(t);
1251      }
1252  
1253      /**
# Line 1099 | Line 1256 | public class LinkedBlockingDequeTest ext
1256      public void testTakeLast() throws InterruptedException {
1257          LinkedBlockingDeque q = populatedDeque(SIZE);
1258          for (int i = 0; i < SIZE; ++i) {
1259 <            assertEquals(SIZE-i-1, q.takeLast());
1259 >            assertEquals(SIZE - i - 1, q.takeLast());
1260          }
1261      }
1262  
1263      /**
1264 <     * takeLast blocks interruptibly when empty
1108 <     */
1109 <    public void testTakeLastFromEmpty() throws InterruptedException {
1110 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1111 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1112 <            public void realRun() throws InterruptedException {
1113 <                q.takeLast();
1114 <            }};
1115 <
1116 <        t.start();
1117 <        Thread.sleep(SHORT_DELAY_MS);
1118 <        t.interrupt();
1119 <        t.join();
1120 <    }
1121 <
1122 <    /**
1123 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1264 >     * takeLast removes existing elements until empty, then blocks interruptibly
1265       */
1266      public void testBlockingTakeLast() throws InterruptedException {
1267          final LinkedBlockingDeque q = populatedDeque(SIZE);
1268 <        Thread t = new Thread(new CheckedRunnable() {
1268 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1269 >        Thread t = newStartedThread(new CheckedRunnable() {
1270              public void realRun() throws InterruptedException {
1271 <                for (int i = 0; i < SIZE; ++i)
1272 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1271 >                for (int i = 0; i < SIZE; ++i) {
1272 >                    assertEquals(SIZE - i - 1, q.takeLast());
1273 >                }
1274 >
1275 >                Thread.currentThread().interrupt();
1276                  try {
1277                      q.takeLast();
1278                      shouldThrow();
1279                  } catch (InterruptedException success) {}
1280 +                assertFalse(Thread.interrupted());
1281 +
1282 +                pleaseInterrupt.countDown();
1283 +                try {
1284 +                    q.takeLast();
1285 +                    shouldThrow();
1286 +                } catch (InterruptedException success) {}
1287 +                assertFalse(Thread.interrupted());
1288              }});
1289  
1290 <        t.start();
1291 <        Thread.sleep(SHORT_DELAY_MS);
1290 >        await(pleaseInterrupt);
1291 >        assertThreadStaysAlive(t);
1292          t.interrupt();
1293 <        t.join();
1293 >        awaitTermination(t);
1294      }
1295  
1296      /**
# Line 1146 | Line 1299 | public class LinkedBlockingDequeTest ext
1299      public void testTimedPollLast0() throws InterruptedException {
1300          LinkedBlockingDeque q = populatedDeque(SIZE);
1301          for (int i = 0; i < SIZE; ++i) {
1302 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1302 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1303          }
1304          assertNull(q.pollLast(0, MILLISECONDS));
1305      }
# Line 1157 | Line 1310 | public class LinkedBlockingDequeTest ext
1310      public void testTimedPollLast() throws InterruptedException {
1311          LinkedBlockingDeque q = populatedDeque(SIZE);
1312          for (int i = 0; i < SIZE; ++i) {
1313 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1314 <        }
1315 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1313 >            long startTime = System.nanoTime();
1314 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1315 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1316 >        }
1317 >        long startTime = System.nanoTime();
1318 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1319 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1320 >        checkEmpty(q);
1321      }
1322  
1323      /**
# Line 1167 | Line 1325 | public class LinkedBlockingDequeTest ext
1325       * returning timeout status
1326       */
1327      public void testInterruptedTimedPollLast() throws InterruptedException {
1328 <        Thread t = new Thread(new CheckedRunnable() {
1328 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1329 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1330 >        Thread t = newStartedThread(new CheckedRunnable() {
1331              public void realRun() throws InterruptedException {
1332 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1332 >                long startTime = System.nanoTime();
1333                  for (int i = 0; i < SIZE; ++i) {
1334 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1334 >                    assertEquals(SIZE - i - 1,
1335 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1336                  }
1337 +
1338 +                Thread.currentThread().interrupt();
1339 +                try {
1340 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1341 +                    shouldThrow();
1342 +                } catch (InterruptedException success) {}
1343 +                assertFalse(Thread.interrupted());
1344 +
1345 +                pleaseInterrupt.countDown();
1346                  try {
1347 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1347 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1348                      shouldThrow();
1349                  } catch (InterruptedException success) {}
1350 +                assertFalse(Thread.interrupted());
1351 +
1352 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1353              }});
1354  
1355 <        t.start();
1356 <        Thread.sleep(SHORT_DELAY_MS);
1355 >        await(pleaseInterrupt);
1356 >        assertThreadStaysAlive(t);
1357          t.interrupt();
1358 <        t.join();
1358 >        awaitTermination(t);
1359 >        checkEmpty(q);
1360      }
1361  
1362      /**
1363 <     *  timed poll before a delayed offerLast fails; after offerLast succeeds;
1364 <     *  on interruption throws
1363 >     * timed poll before a delayed offerLast fails; after offerLast succeeds;
1364 >     * on interruption throws
1365       */
1366      public void testTimedPollWithOfferLast() throws InterruptedException {
1367          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1368 <        Thread t = new Thread(new CheckedRunnable() {
1368 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1369 >        Thread t = newStartedThread(new CheckedRunnable() {
1370              public void realRun() throws InterruptedException {
1371 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1371 >                long startTime = System.nanoTime();
1372 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1373 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1374 >
1375 >                barrier.await();
1376 >
1377                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1378 +
1379 +                Thread.currentThread().interrupt();
1380 +                try {
1381 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1382 +                    shouldThrow();
1383 +                } catch (InterruptedException success) {}
1384 +                assertFalse(Thread.interrupted());
1385 +
1386 +                barrier.await();
1387                  try {
1388                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1389                      shouldThrow();
1390                  } catch (InterruptedException success) {}
1391 +                assertFalse(Thread.interrupted());
1392 +
1393 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1394              }});
1395  
1396 <        t.start();
1397 <        Thread.sleep(SMALL_DELAY_MS);
1398 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1396 >        barrier.await();
1397 >        long startTime = System.nanoTime();
1398 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1399 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1400 >
1401 >        barrier.await();
1402 >        assertThreadStaysAlive(t);
1403          t.interrupt();
1404 <        t.join();
1404 >        awaitTermination(t);
1405      }
1406  
1211
1407      /**
1408       * element returns next element, or throws NSEE if empty
1409       */
# Line 1225 | Line 1420 | public class LinkedBlockingDequeTest ext
1420      }
1421  
1422      /**
1228     * remove(x) removes x and returns true if present
1229     */
1230    public void testRemoveElement() {
1231        LinkedBlockingDeque q = populatedDeque(SIZE);
1232        for (int i = 1; i < SIZE; i+=2) {
1233            assertTrue(q.remove(new Integer(i)));
1234        }
1235        for (int i = 0; i < SIZE; i+=2) {
1236            assertTrue(q.remove(new Integer(i)));
1237            assertFalse(q.remove(new Integer(i+1)));
1238        }
1239        assertTrue(q.isEmpty());
1240    }
1241
1242    /**
1423       * contains(x) reports true when elements added but not yet removed
1424       */
1425      public void testContains() {
# Line 1295 | Line 1475 | public class LinkedBlockingDequeTest ext
1475                  assertTrue(changed);
1476  
1477              assertTrue(q.containsAll(p));
1478 <            assertEquals(SIZE-i, q.size());
1478 >            assertEquals(SIZE - i, q.size());
1479              p.remove();
1480          }
1481      }
# Line 1308 | Line 1488 | public class LinkedBlockingDequeTest ext
1488              LinkedBlockingDeque q = populatedDeque(SIZE);
1489              LinkedBlockingDeque p = populatedDeque(i);
1490              assertTrue(q.removeAll(p));
1491 <            assertEquals(SIZE-i, q.size());
1491 >            assertEquals(SIZE - i, q.size());
1492              for (int j = 0; j < i; ++j) {
1493 <                Integer I = (Integer)(p.remove());
1494 <                assertFalse(q.contains(I));
1493 >                Integer x = (Integer)(p.remove());
1494 >                assertFalse(q.contains(x));
1495              }
1496          }
1497      }
1498  
1499      /**
1500 <     * toArray contains all elements
1500 >     * toArray contains all elements in FIFO order
1501       */
1502 <    public void testToArray() throws InterruptedException{
1502 >    public void testToArray() throws InterruptedException {
1503          LinkedBlockingDeque q = populatedDeque(SIZE);
1504          Object[] o = q.toArray();
1505          for (int i = 0; i < o.length; i++)
1506 <            assertEquals(o[i], q.take());
1506 >            assertSame(o[i], q.poll());
1507      }
1508  
1509      /**
1510 <     * toArray(a) contains all elements
1510 >     * toArray(a) contains all elements in FIFO order
1511       */
1512 <    public void testToArray2() throws InterruptedException {
1513 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1512 >    public void testToArray2() {
1513 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1514          Integer[] ints = new Integer[SIZE];
1515 <        ints = (Integer[])q.toArray(ints);
1515 >        Integer[] array = q.toArray(ints);
1516 >        assertSame(ints, array);
1517          for (int i = 0; i < ints.length; i++)
1518 <            assertEquals(ints[i], q.take());
1338 <    }
1339 <
1340 <    /**
1341 <     * toArray(null) throws NPE
1342 <     */
1343 <    public void testToArray_BadArg() {
1344 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1345 <        try {
1346 <            Object o[] = q.toArray(null);
1347 <            shouldThrow();
1348 <        } catch (NullPointerException success) {}
1518 >            assertSame(ints[i], q.remove());
1519      }
1520  
1521      /**
1522 <     * toArray with incompatible array type throws CCE
1522 >     * toArray(incompatible array type) throws ArrayStoreException
1523       */
1524      public void testToArray1_BadArg() {
1525          LinkedBlockingDeque q = populatedDeque(SIZE);
1526          try {
1527 <            Object o[] = q.toArray(new String[10]);
1527 >            q.toArray(new String[10]);
1528              shouldThrow();
1529          } catch (ArrayStoreException success) {}
1530      }
1531  
1362
1532      /**
1533       * iterator iterates through all elements
1534       */
1535      public void testIterator() throws InterruptedException {
1536          LinkedBlockingDeque q = populatedDeque(SIZE);
1537          Iterator it = q.iterator();
1538 <        while (it.hasNext()) {
1538 >        int i;
1539 >        for (i = 0; it.hasNext(); i++)
1540 >            assertTrue(q.contains(it.next()));
1541 >        assertEquals(i, SIZE);
1542 >        assertIteratorExhausted(it);
1543 >
1544 >        it = q.iterator();
1545 >        for (i = 0; it.hasNext(); i++)
1546              assertEquals(it.next(), q.take());
1547 <        }
1547 >        assertEquals(i, SIZE);
1548 >        assertIteratorExhausted(it);
1549 >    }
1550 >
1551 >    /**
1552 >     * iterator of empty collection has no elements
1553 >     */
1554 >    public void testEmptyIterator() {
1555 >        Deque c = new LinkedBlockingDeque();
1556 >        assertIteratorExhausted(c.iterator());
1557 >        assertIteratorExhausted(c.descendingIterator());
1558      }
1559  
1560      /**
# Line 1390 | Line 1576 | public class LinkedBlockingDequeTest ext
1576          assertFalse(it.hasNext());
1577      }
1578  
1393
1579      /**
1580       * iterator ordering is FIFO
1581       */
# Line 1422 | Line 1607 | public class LinkedBlockingDequeTest ext
1607          assertEquals(0, q.size());
1608      }
1609  
1425
1610      /**
1611 <     *  Descending iterator iterates through all elements
1611 >     * Descending iterator iterates through all elements
1612       */
1613      public void testDescendingIterator() {
1614          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 1443 | Line 1627 | public class LinkedBlockingDequeTest ext
1627      }
1628  
1629      /**
1630 <     *  Descending iterator ordering is reverse FIFO
1630 >     * Descending iterator ordering is reverse FIFO
1631       */
1632      public void testDescendingIteratorOrdering() {
1633          final LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1485 | Line 1669 | public class LinkedBlockingDequeTest ext
1669          }
1670      }
1671  
1488
1672      /**
1673       * toString contains toStrings of elements
1674       */
# Line 1493 | Line 1676 | public class LinkedBlockingDequeTest ext
1676          LinkedBlockingDeque q = populatedDeque(SIZE);
1677          String s = q.toString();
1678          for (int i = 0; i < SIZE; ++i) {
1679 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1679 >            assertTrue(s.contains(String.valueOf(i)));
1680          }
1681      }
1682  
1500
1683      /**
1684       * offer transfers elements across Executor tasks
1685       */
# Line 1505 | Line 1687 | public class LinkedBlockingDequeTest ext
1687          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1688          q.add(one);
1689          q.add(two);
1690 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1691 <        executor.execute(new CheckedRunnable() {
1692 <            public void realRun() throws InterruptedException {
1693 <                assertFalse(q.offer(three));
1694 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1695 <                assertEquals(0, q.remainingCapacity());
1696 <            }});
1697 <
1698 <        executor.execute(new CheckedRunnable() {
1699 <            public void realRun() throws InterruptedException {
1700 <                Thread.sleep(SMALL_DELAY_MS);
1701 <                assertSame(one, q.take());
1702 <            }});
1703 <
1704 <        joinPool(executor);
1690 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1691 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1692 >        try (PoolCleaner cleaner = cleaner(executor)) {
1693 >            executor.execute(new CheckedRunnable() {
1694 >                public void realRun() throws InterruptedException {
1695 >                    assertFalse(q.offer(three));
1696 >                    threadsStarted.await();
1697 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1698 >                    assertEquals(0, q.remainingCapacity());
1699 >                }});
1700 >
1701 >            executor.execute(new CheckedRunnable() {
1702 >                public void realRun() throws InterruptedException {
1703 >                    threadsStarted.await();
1704 >                    assertSame(one, q.take());
1705 >                }});
1706 >        }
1707      }
1708  
1709      /**
1710 <     * poll retrieves elements across Executor threads
1710 >     * timed poll retrieves elements across Executor threads
1711       */
1712      public void testPollInExecutor() {
1713          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1714 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1715 <        executor.execute(new CheckedRunnable() {
1716 <            public void realRun() throws InterruptedException {
1717 <                assertNull(q.poll());
1718 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1719 <                assertTrue(q.isEmpty());
1720 <            }});
1721 <
1722 <        executor.execute(new CheckedRunnable() {
1723 <            public void realRun() throws InterruptedException {
1724 <                Thread.sleep(SMALL_DELAY_MS);
1725 <                q.put(one);
1726 <            }});
1727 <
1728 <        joinPool(executor);
1714 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1715 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1716 >        try (PoolCleaner cleaner = cleaner(executor)) {
1717 >            executor.execute(new CheckedRunnable() {
1718 >                public void realRun() throws InterruptedException {
1719 >                    assertNull(q.poll());
1720 >                    threadsStarted.await();
1721 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1722 >                    checkEmpty(q);
1723 >                }});
1724 >
1725 >            executor.execute(new CheckedRunnable() {
1726 >                public void realRun() throws InterruptedException {
1727 >                    threadsStarted.await();
1728 >                    q.put(one);
1729 >                }});
1730 >        }
1731      }
1732  
1733      /**
1734       * A deserialized serialized deque has same elements in same order
1735       */
1736      public void testSerialization() throws Exception {
1737 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1738 <
1553 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1554 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1555 <        out.writeObject(q);
1556 <        out.close();
1557 <
1558 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1559 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1560 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1561 <        assertEquals(q.size(), r.size());
1562 <        while (!q.isEmpty())
1563 <            assertEquals(q.remove(), r.remove());
1564 <    }
1565 <
1566 <    /**
1567 <     * drainTo(null) throws NPE
1568 <     */
1569 <    public void testDrainToNull() {
1570 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1571 <        try {
1572 <            q.drainTo(null);
1573 <            shouldThrow();
1574 <        } catch (NullPointerException success) {}
1575 <    }
1737 >        Queue x = populatedDeque(SIZE);
1738 >        Queue y = serialClone(x);
1739  
1740 <    /**
1741 <     * drainTo(this) throws IAE
1742 <     */
1743 <    public void testDrainToSelf() {
1744 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1745 <        try {
1746 <            q.drainTo(q);
1747 <            shouldThrow();
1748 <        } catch (IllegalArgumentException success) {}
1740 >        assertNotSame(y, x);
1741 >        assertEquals(x.size(), y.size());
1742 >        assertEquals(x.toString(), y.toString());
1743 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1744 >        while (!x.isEmpty()) {
1745 >            assertFalse(y.isEmpty());
1746 >            assertEquals(x.remove(), y.remove());
1747 >        }
1748 >        assertTrue(y.isEmpty());
1749      }
1750  
1751      /**
# Line 1592 | Line 1755 | public class LinkedBlockingDequeTest ext
1755          LinkedBlockingDeque q = populatedDeque(SIZE);
1756          ArrayList l = new ArrayList();
1757          q.drainTo(l);
1758 <        assertEquals(q.size(), 0);
1759 <        assertEquals(l.size(), SIZE);
1758 >        assertEquals(0, q.size());
1759 >        assertEquals(SIZE, l.size());
1760          for (int i = 0; i < SIZE; ++i)
1761              assertEquals(l.get(i), new Integer(i));
1762          q.add(zero);
# Line 1603 | Line 1766 | public class LinkedBlockingDequeTest ext
1766          assertTrue(q.contains(one));
1767          l.clear();
1768          q.drainTo(l);
1769 <        assertEquals(q.size(), 0);
1770 <        assertEquals(l.size(), 2);
1769 >        assertEquals(0, q.size());
1770 >        assertEquals(2, l.size());
1771          for (int i = 0; i < 2; ++i)
1772              assertEquals(l.get(i), new Integer(i));
1773      }
# Line 1616 | Line 1779 | public class LinkedBlockingDequeTest ext
1779          final LinkedBlockingDeque q = populatedDeque(SIZE);
1780          Thread t = new Thread(new CheckedRunnable() {
1781              public void realRun() throws InterruptedException {
1782 <                q.put(new Integer(SIZE+1));
1782 >                q.put(new Integer(SIZE + 1));
1783              }});
1784  
1785          t.start();
# Line 1630 | Line 1793 | public class LinkedBlockingDequeTest ext
1793      }
1794  
1795      /**
1796 <     * drainTo(null, n) throws NPE
1634 <     */
1635 <    public void testDrainToNullN() {
1636 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1637 <        try {
1638 <            q.drainTo(null, 0);
1639 <            shouldThrow();
1640 <        } catch (NullPointerException success) {}
1641 <    }
1642 <
1643 <    /**
1644 <     * drainTo(this, n) throws IAE
1645 <     */
1646 <    public void testDrainToSelfN() {
1647 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1648 <        try {
1649 <            q.drainTo(q, 0);
1650 <            shouldThrow();
1651 <        } catch (IllegalArgumentException success) {}
1652 <    }
1653 <
1654 <    /**
1655 <     * drainTo(c, n) empties first max {n, size} elements of deque into c
1796 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
1797       */
1798      public void testDrainToN() {
1799          LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1661 | Line 1802 | public class LinkedBlockingDequeTest ext
1802                  assertTrue(q.offer(new Integer(j)));
1803              ArrayList l = new ArrayList();
1804              q.drainTo(l, i);
1805 <            int k = (i < SIZE)? i : SIZE;
1806 <            assertEquals(l.size(), k);
1807 <            assertEquals(q.size(), SIZE-k);
1805 >            int k = (i < SIZE) ? i : SIZE;
1806 >            assertEquals(k, l.size());
1807 >            assertEquals(SIZE - k, q.size());
1808              for (int j = 0; j < k; ++j)
1809                  assertEquals(l.get(j), new Integer(j));
1810 <            while (q.poll() != null) ;
1810 >            do {} while (q.poll() != null);
1811 >        }
1812 >    }
1813 >
1814 >    /**
1815 >     * remove(null), contains(null) always return false
1816 >     */
1817 >    public void testNeverContainsNull() {
1818 >        Deque<?>[] qs = {
1819 >            new LinkedBlockingDeque<Object>(),
1820 >            populatedDeque(2),
1821 >        };
1822 >
1823 >        for (Deque<?> q : qs) {
1824 >            assertFalse(q.contains(null));
1825 >            assertFalse(q.remove(null));
1826 >            assertFalse(q.removeFirstOccurrence(null));
1827 >            assertFalse(q.removeLastOccurrence(null));
1828          }
1829      }
1830  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines