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.19 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.77 by jsr166, Sun May 14 00:56:43 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 269 | Line 318 | public class LinkedBlockingDequeTest ext
318          LinkedBlockingDeque q = populatedDeque(3);
319          q.pollLast();
320          q.addFirst(four);
321 <        assertEquals(four,q.peekFirst());
321 >        assertSame(four, q.peekFirst());
322      }
323  
324      /**
# Line 279 | Line 328 | public class LinkedBlockingDequeTest ext
328          LinkedBlockingDeque q = populatedDeque(3);
329          q.pollLast();
330          q.addLast(four);
331 <        assertEquals(four,q.peekLast());
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 437 | Line 465 | public class LinkedBlockingDequeTest ext
465          LinkedBlockingDeque q = populatedDeque(3);
466          q.pollLast();
467          q.push(four);
468 <        assertEquals(four,q.peekFirst());
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 >        assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609 <        t.join();
609 >        awaitTermination(t);
610          assertEquals(SIZE, q.size());
611          assertEquals(0, q.remainingCapacity());
612      }
613  
614      /**
615 <     * put blocks waiting for take when full
615 >     * put blocks interruptibly waiting for take when full
616       */
617      public void testPutWithTake() throws InterruptedException {
618          final int capacity = 2;
619          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
620 <        Thread t = new Thread(new CheckedRunnable() {
620 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
621 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
622 >        Thread t = newStartedThread(new CheckedRunnable() {
623              public void realRun() throws InterruptedException {
624 <                for (int i = 0; i < capacity + 1; i++)
624 >                for (int i = 0; i < capacity; i++)
625                      q.put(i);
626 +                pleaseTake.countDown();
627 +                q.put(86);
628 +
629 +                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 >        assertThreadBlocks(t, Thread.State.WAITING);
643          t.interrupt();
644 <        t.join();
645 <        assertEquals(q.remainingCapacity(), 0);
644 >        awaitTermination(t);
645 >        assertEquals(0, q.remainingCapacity());
646      }
647  
648      /**
# Line 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 +                assertFalse(Thread.interrupted());
667              }});
668  
669 <        t.start();
670 <        Thread.sleep(SMALL_DELAY_MS);
669 >        await(pleaseInterrupt);
670 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
671          t.interrupt();
672 <        t.join();
672 >        awaitTermination(t);
673      }
674  
675      /**
# Line 665 | Line 683 | public class LinkedBlockingDequeTest ext
683      }
684  
685      /**
686 <     * 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
686 >     * take removes existing elements until empty, then blocks interruptibly
687       */
688      public void testBlockingTake() throws InterruptedException {
689          final LinkedBlockingDeque q = populatedDeque(SIZE);
690 <        Thread t = new Thread(new CheckedRunnable() {
690 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
691 >        Thread t = newStartedThread(new CheckedRunnable() {
692              public void realRun() throws InterruptedException {
693 <                for (int i = 0; i < SIZE; ++i) {
694 <                    assertEquals(i, q.take());
695 <                }
693 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
694 >
695 >                Thread.currentThread().interrupt();
696                  try {
697                      q.take();
698                      shouldThrow();
699                  } catch (InterruptedException success) {}
700 +                assertFalse(Thread.interrupted());
701 +
702 +                pleaseInterrupt.countDown();
703 +                try {
704 +                    q.take();
705 +                    shouldThrow();
706 +                } catch (InterruptedException success) {}
707 +                assertFalse(Thread.interrupted());
708              }});
709  
710 <        t.start();
711 <        Thread.sleep(SHORT_DELAY_MS);
710 >        await(pleaseInterrupt);
711 >        assertThreadBlocks(t, Thread.State.WAITING);
712          t.interrupt();
713 <        t.join();
713 >        awaitTermination(t);
714      }
715  
705
716      /**
717       * poll succeeds unless empty
718       */
# Line 731 | Line 741 | public class LinkedBlockingDequeTest ext
741      public void testTimedPoll() throws InterruptedException {
742          LinkedBlockingDeque q = populatedDeque(SIZE);
743          for (int i = 0; i < SIZE; ++i) {
744 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
745 <        }
746 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
744 >            long startTime = System.nanoTime();
745 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
746 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
747 >        }
748 >        long startTime = System.nanoTime();
749 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
750 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
751 >        checkEmpty(q);
752      }
753  
754      /**
# Line 741 | Line 756 | public class LinkedBlockingDequeTest ext
756       * returning timeout status
757       */
758      public void testInterruptedTimedPoll() throws InterruptedException {
759 <        Thread t = new Thread(new CheckedRunnable() {
759 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
760 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
761 >        Thread t = newStartedThread(new CheckedRunnable() {
762              public void realRun() throws InterruptedException {
763 <                LinkedBlockingDeque q = populatedDeque(SIZE);
763 >                long startTime = System.nanoTime();
764                  for (int i = 0; i < SIZE; ++i) {
765 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
765 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
766                  }
750                try {
751                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
752                    shouldThrow();
753                } catch (InterruptedException success) {}
754            }});
767  
768 <        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 >                pleaseInterrupt.countDown();
769                  try {
770                      q.poll(LONG_DELAY_MS, MILLISECONDS);
771                      shouldThrow();
772                  } catch (InterruptedException success) {}
773 +                assertFalse(Thread.interrupted());
774 +
775 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
776              }});
777  
778 <        t.start();
779 <        Thread.sleep(SMALL_DELAY_MS);
780 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
778 >        await(pleaseInterrupt);
779 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
780          t.interrupt();
781 <        t.join();
781 >        awaitTermination(t);
782 >        checkEmpty(q);
783      }
784  
785
785      /**
786       * putFirst(null) throws NPE
787       */
788 <     public void testPutFirstNull() throws InterruptedException {
788 >    public void testPutFirstNull() throws InterruptedException {
789 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
790          try {
791            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
791              q.putFirst(null);
792              shouldThrow();
793          } catch (NullPointerException success) {}
794 <     }
794 >    }
795  
796      /**
797       * all elements successfully putFirst are contained
798       */
799 <     public void testPutFirst() throws InterruptedException {
800 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
801 <         for (int i = 0; i < SIZE; ++i) {
802 <             Integer I = new Integer(i);
803 <             q.putFirst(I);
804 <             assertTrue(q.contains(I));
805 <         }
806 <         assertEquals(0, q.remainingCapacity());
799 >    public void testPutFirst() throws InterruptedException {
800 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
801 >        for (int i = 0; i < SIZE; ++i) {
802 >            Integer x = new Integer(i);
803 >            q.putFirst(x);
804 >            assertTrue(q.contains(x));
805 >        }
806 >        assertEquals(0, q.remainingCapacity());
807      }
808  
809      /**
# Line 812 | Line 811 | public class LinkedBlockingDequeTest ext
811       */
812      public void testBlockingPutFirst() throws InterruptedException {
813          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
814 <        Thread t = new Thread(new CheckedRunnable() {
814 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
815 >        Thread t = newStartedThread(new CheckedRunnable() {
816              public void realRun() throws InterruptedException {
817                  for (int i = 0; i < SIZE; ++i)
818                      q.putFirst(i);
819                  assertEquals(SIZE, q.size());
820                  assertEquals(0, q.remainingCapacity());
821 +
822 +                Thread.currentThread().interrupt();
823 +                try {
824 +                    q.putFirst(99);
825 +                    shouldThrow();
826 +                } catch (InterruptedException success) {}
827 +                assertFalse(Thread.interrupted());
828 +
829 +                pleaseInterrupt.countDown();
830                  try {
831                      q.putFirst(99);
832                      shouldThrow();
833                  } catch (InterruptedException success) {}
834 +                assertFalse(Thread.interrupted());
835              }});
836  
837 <        t.start();
838 <        Thread.sleep(SHORT_DELAY_MS);
837 >        await(pleaseInterrupt);
838 >        assertThreadBlocks(t, Thread.State.WAITING);
839          t.interrupt();
840 <        t.join();
840 >        awaitTermination(t);
841          assertEquals(SIZE, q.size());
842          assertEquals(0, q.remainingCapacity());
843      }
844  
845      /**
846 <     * putFirst blocks waiting for take when full
846 >     * putFirst blocks interruptibly waiting for take when full
847       */
848      public void testPutFirstWithTake() throws InterruptedException {
849          final int capacity = 2;
850          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
851 <        Thread t = new Thread(new CheckedRunnable() {
851 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
852 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
853 >        Thread t = newStartedThread(new CheckedRunnable() {
854              public void realRun() throws InterruptedException {
855 <                for (int i = 0; i < capacity + 1; i++)
855 >                for (int i = 0; i < capacity; i++)
856                      q.putFirst(i);
857 +                pleaseTake.countDown();
858 +                q.putFirst(86);
859 +
860 +                pleaseInterrupt.countDown();
861                  try {
862                      q.putFirst(99);
863                      shouldThrow();
864                  } catch (InterruptedException success) {}
865 +                assertFalse(Thread.interrupted());
866              }});
867  
868 <        t.start();
869 <        Thread.sleep(SHORT_DELAY_MS);
853 <        assertEquals(q.remainingCapacity(), 0);
868 >        await(pleaseTake);
869 >        assertEquals(0, q.remainingCapacity());
870          assertEquals(capacity - 1, q.take());
871 <        Thread.sleep(SHORT_DELAY_MS);
871 >
872 >        await(pleaseInterrupt);
873 >        assertThreadBlocks(t, Thread.State.WAITING);
874          t.interrupt();
875 <        t.join();
876 <        assertEquals(q.remainingCapacity(), 0);
875 >        awaitTermination(t);
876 >        assertEquals(0, q.remainingCapacity());
877      }
878  
879      /**
# Line 863 | Line 881 | public class LinkedBlockingDequeTest ext
881       */
882      public void testTimedOfferFirst() throws InterruptedException {
883          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
884 <        Thread t = new Thread(new CheckedRunnable() {
884 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
885 >        Thread t = newStartedThread(new CheckedRunnable() {
886              public void realRun() throws InterruptedException {
887                  q.putFirst(new Object());
888                  q.putFirst(new Object());
889 <                assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS));
889 >                long startTime = System.nanoTime();
890 >                assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
891 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
892 >                pleaseInterrupt.countDown();
893                  try {
894 <                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
894 >                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
895                      shouldThrow();
896                  } catch (InterruptedException success) {}
897 +                assertFalse(Thread.interrupted());
898              }});
899  
900 <        t.start();
901 <        Thread.sleep(SMALL_DELAY_MS);
900 >        await(pleaseInterrupt);
901 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
902          t.interrupt();
903 <        t.join();
903 >        awaitTermination(t);
904      }
905  
906      /**
# Line 891 | Line 914 | public class LinkedBlockingDequeTest ext
914      }
915  
916      /**
917 <     * takeFirst blocks interruptibly when empty
917 >     * takeFirst() blocks interruptibly when empty
918       */
919 <    public void testTakeFirstFromEmpty() throws InterruptedException {
920 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
921 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
922 <            public void realRun() throws InterruptedException {
923 <                q.takeFirst();
924 <            }};
919 >    public void testTakeFirstFromEmptyBlocksInterruptibly() {
920 >        final BlockingDeque q = new LinkedBlockingDeque();
921 >        final CountDownLatch threadStarted = new CountDownLatch(1);
922 >        Thread t = newStartedThread(new CheckedRunnable() {
923 >            public void realRun() {
924 >                threadStarted.countDown();
925 >                try {
926 >                    q.takeFirst();
927 >                    shouldThrow();
928 >                } catch (InterruptedException success) {}
929 >                assertFalse(Thread.interrupted());
930 >            }});
931  
932 <        t.start();
933 <        Thread.sleep(SHORT_DELAY_MS);
932 >        await(threadStarted);
933 >        assertThreadBlocks(t, Thread.State.WAITING);
934          t.interrupt();
935 <        t.join();
935 >        awaitTermination(t);
936      }
937  
938      /**
939 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
939 >     * takeFirst() throws InterruptedException immediately if interrupted
940 >     * before waiting
941 >     */
942 >    public void testTakeFirstFromEmptyAfterInterrupt() {
943 >        final BlockingDeque q = new LinkedBlockingDeque();
944 >        Thread t = newStartedThread(new CheckedRunnable() {
945 >            public void realRun() {
946 >                Thread.currentThread().interrupt();
947 >                try {
948 >                    q.takeFirst();
949 >                    shouldThrow();
950 >                } catch (InterruptedException success) {}
951 >                assertFalse(Thread.interrupted());
952 >            }});
953 >
954 >        awaitTermination(t);
955 >    }
956 >
957 >    /**
958 >     * takeLast() blocks interruptibly when empty
959 >     */
960 >    public void testTakeLastFromEmptyBlocksInterruptibly() {
961 >        final BlockingDeque q = new LinkedBlockingDeque();
962 >        final CountDownLatch threadStarted = new CountDownLatch(1);
963 >        Thread t = newStartedThread(new CheckedRunnable() {
964 >            public void realRun() {
965 >                threadStarted.countDown();
966 >                try {
967 >                    q.takeLast();
968 >                    shouldThrow();
969 >                } catch (InterruptedException success) {}
970 >                assertFalse(Thread.interrupted());
971 >            }});
972 >
973 >        await(threadStarted);
974 >        assertThreadBlocks(t, Thread.State.WAITING);
975 >        t.interrupt();
976 >        awaitTermination(t);
977 >    }
978 >
979 >    /**
980 >     * takeLast() throws InterruptedException immediately if interrupted
981 >     * before waiting
982 >     */
983 >    public void testTakeLastFromEmptyAfterInterrupt() {
984 >        final BlockingDeque q = new LinkedBlockingDeque();
985 >        Thread t = newStartedThread(new CheckedRunnable() {
986 >            public void realRun() {
987 >                Thread.currentThread().interrupt();
988 >                try {
989 >                    q.takeLast();
990 >                    shouldThrow();
991 >                } catch (InterruptedException success) {}
992 >                assertFalse(Thread.interrupted());
993 >            }});
994 >
995 >        awaitTermination(t);
996 >    }
997 >
998 >    /**
999 >     * takeFirst removes existing elements until empty, then blocks interruptibly
1000       */
1001      public void testBlockingTakeFirst() throws InterruptedException {
1002          final LinkedBlockingDeque q = populatedDeque(SIZE);
1003 <        Thread t = new Thread(new CheckedRunnable() {
1003 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1004 >        Thread t = newStartedThread(new CheckedRunnable() {
1005              public void realRun() throws InterruptedException {
1006 <                for (int i = 0; i < SIZE; ++i)
1007 <                    assertEquals(i, q.takeFirst());
1006 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
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 >        assertThreadBlocks(t, Thread.State.WAITING);
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(SMALL_DELAY_MS, MILLISECONDS);
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(LONG_DELAY_MS, MILLISECONDS);
1080 +                    shouldThrow();
1081 +                } catch (InterruptedException success) {}
1082 +                assertFalse(Thread.interrupted());
1083 +
1084 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1085              }});
1086  
1087 <        t.start();
1088 <        Thread.sleep(SHORT_DELAY_MS);
1087 >        await(pleaseInterrupt);
1088 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1089          t.interrupt();
1090 <        t.join();
1090 >        awaitTermination(t);
1091      }
1092  
1093      /**
1094 <     *  timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1095 <     *  on interruption throws
1094 >     * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1095 >     * on interruption throws
1096       */
1097      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1098          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1099 <        Thread t = new Thread(new CheckedRunnable() {
1099 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1100 >        Thread t = newStartedThread(new CheckedRunnable() {
1101              public void realRun() throws InterruptedException {
1102 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1102 >                long startTime = System.nanoTime();
1103 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1104 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1105 >
1106 >                barrier.await();
1107 >
1108                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1109 +
1110 +                Thread.currentThread().interrupt();
1111                  try {
1112                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1113                      shouldThrow();
1114                  } catch (InterruptedException success) {}
1115 +
1116 +                barrier.await();
1117 +                try {
1118 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1119 +                    shouldThrow();
1120 +                } catch (InterruptedException success) {}
1121 +                assertFalse(Thread.interrupted());
1122 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1123              }});
1124  
1125 <        t.start();
1126 <        Thread.sleep(SMALL_DELAY_MS);
1127 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1125 >        barrier.await();
1126 >        long startTime = System.nanoTime();
1127 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1128 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1129 >        barrier.await();
1130 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1131          t.interrupt();
1132 <        t.join();
1132 >        awaitTermination(t);
1133      }
1134  
1135      /**
1136       * putLast(null) throws NPE
1137       */
1138 <     public void testPutLastNull() throws InterruptedException {
1138 >    public void testPutLastNull() throws InterruptedException {
1139 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1140          try {
1004            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1141              q.putLast(null);
1142              shouldThrow();
1143          } catch (NullPointerException success) {}
1144 <     }
1144 >    }
1145  
1146      /**
1147       * all elements successfully putLast are contained
1148       */
1149 <     public void testPutLast() throws InterruptedException {
1150 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1151 <         for (int i = 0; i < SIZE; ++i) {
1152 <             Integer I = new Integer(i);
1153 <             q.putLast(I);
1154 <             assertTrue(q.contains(I));
1155 <         }
1156 <         assertEquals(0, q.remainingCapacity());
1149 >    public void testPutLast() throws InterruptedException {
1150 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1151 >        for (int i = 0; i < SIZE; ++i) {
1152 >            Integer x = new Integer(i);
1153 >            q.putLast(x);
1154 >            assertTrue(q.contains(x));
1155 >        }
1156 >        assertEquals(0, q.remainingCapacity());
1157      }
1158  
1159      /**
# Line 1025 | Line 1161 | public class LinkedBlockingDequeTest ext
1161       */
1162      public void testBlockingPutLast() throws InterruptedException {
1163          final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1164 <        Thread t = new Thread(new CheckedRunnable() {
1164 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1165 >        Thread t = newStartedThread(new CheckedRunnable() {
1166              public void realRun() throws InterruptedException {
1167                  for (int i = 0; i < SIZE; ++i)
1168                      q.putLast(i);
1169                  assertEquals(SIZE, q.size());
1170                  assertEquals(0, q.remainingCapacity());
1171 +
1172 +                Thread.currentThread().interrupt();
1173                  try {
1174                      q.putLast(99);
1175                      shouldThrow();
1176                  } catch (InterruptedException success) {}
1177 +                assertFalse(Thread.interrupted());
1178 +
1179 +                pleaseInterrupt.countDown();
1180 +                try {
1181 +                    q.putLast(99);
1182 +                    shouldThrow();
1183 +                } catch (InterruptedException success) {}
1184 +                assertFalse(Thread.interrupted());
1185              }});
1186  
1187 <        t.start();
1188 <        Thread.sleep(SHORT_DELAY_MS);
1187 >        await(pleaseInterrupt);
1188 >        assertThreadBlocks(t, Thread.State.WAITING);
1189          t.interrupt();
1190 <        t.join();
1190 >        awaitTermination(t);
1191          assertEquals(SIZE, q.size());
1192          assertEquals(0, q.remainingCapacity());
1193      }
1194  
1195      /**
1196 <     * putLast blocks waiting for take when full
1196 >     * putLast blocks interruptibly waiting for take when full
1197       */
1198      public void testPutLastWithTake() throws InterruptedException {
1199          final int capacity = 2;
1200          final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1201 <        Thread t = new Thread(new CheckedRunnable() {
1201 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1202 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1203 >        Thread t = newStartedThread(new CheckedRunnable() {
1204              public void realRun() throws InterruptedException {
1205 <                for (int i = 0; i < capacity + 1; i++)
1205 >                for (int i = 0; i < capacity; i++)
1206                      q.putLast(i);
1207 +                pleaseTake.countDown();
1208 +                q.putLast(86);
1209 +
1210 +                pleaseInterrupt.countDown();
1211                  try {
1212                      q.putLast(99);
1213                      shouldThrow();
1214                  } catch (InterruptedException success) {}
1215 +                assertFalse(Thread.interrupted());
1216              }});
1217  
1218 <        t.start();
1219 <        Thread.sleep(SHORT_DELAY_MS);
1066 <        assertEquals(q.remainingCapacity(), 0);
1218 >        await(pleaseTake);
1219 >        assertEquals(0, q.remainingCapacity());
1220          assertEquals(0, q.take());
1221 <        Thread.sleep(SHORT_DELAY_MS);
1221 >
1222 >        await(pleaseInterrupt);
1223 >        assertThreadBlocks(t, Thread.State.WAITING);
1224          t.interrupt();
1225 <        t.join();
1226 <        assertEquals(q.remainingCapacity(), 0);
1225 >        awaitTermination(t);
1226 >        assertEquals(0, q.remainingCapacity());
1227      }
1228  
1229      /**
# Line 1076 | Line 1231 | public class LinkedBlockingDequeTest ext
1231       */
1232      public void testTimedOfferLast() throws InterruptedException {
1233          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1234 <        Thread t = new Thread(new CheckedRunnable() {
1234 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1235 >        Thread t = newStartedThread(new CheckedRunnable() {
1236              public void realRun() throws InterruptedException {
1237                  q.putLast(new Object());
1238                  q.putLast(new Object());
1239 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1239 >                long startTime = System.nanoTime();
1240 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1241 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1242 >                pleaseInterrupt.countDown();
1243                  try {
1244 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1244 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1245                      shouldThrow();
1246                  } catch (InterruptedException success) {}
1247              }});
1248  
1249 <        t.start();
1250 <        Thread.sleep(SMALL_DELAY_MS);
1249 >        await(pleaseInterrupt);
1250 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1251          t.interrupt();
1252 <        t.join();
1252 >        awaitTermination(t);
1253      }
1254  
1255      /**
# Line 1099 | Line 1258 | public class LinkedBlockingDequeTest ext
1258      public void testTakeLast() throws InterruptedException {
1259          LinkedBlockingDeque q = populatedDeque(SIZE);
1260          for (int i = 0; i < SIZE; ++i) {
1261 <            assertEquals(SIZE-i-1, q.takeLast());
1261 >            assertEquals(SIZE - i - 1, q.takeLast());
1262          }
1263      }
1264  
1265      /**
1266 <     * 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
1266 >     * takeLast removes existing elements until empty, then blocks interruptibly
1267       */
1268      public void testBlockingTakeLast() throws InterruptedException {
1269          final LinkedBlockingDeque q = populatedDeque(SIZE);
1270 <        Thread t = new Thread(new CheckedRunnable() {
1270 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1271 >        Thread t = newStartedThread(new CheckedRunnable() {
1272              public void realRun() throws InterruptedException {
1273 <                for (int i = 0; i < SIZE; ++i)
1274 <                    assertEquals(SIZE - 1 - i, q.takeLast());
1273 >                for (int i = 0; i < SIZE; i++)
1274 >                    assertEquals(SIZE - i - 1, q.takeLast());
1275 >
1276 >                Thread.currentThread().interrupt();
1277                  try {
1278                      q.takeLast();
1279                      shouldThrow();
1280                  } catch (InterruptedException success) {}
1281 +                assertFalse(Thread.interrupted());
1282 +
1283 +                pleaseInterrupt.countDown();
1284 +                try {
1285 +                    q.takeLast();
1286 +                    shouldThrow();
1287 +                } catch (InterruptedException success) {}
1288 +                assertFalse(Thread.interrupted());
1289              }});
1290  
1291 <        t.start();
1292 <        Thread.sleep(SHORT_DELAY_MS);
1291 >        await(pleaseInterrupt);
1292 >        assertThreadBlocks(t, Thread.State.WAITING);
1293          t.interrupt();
1294 <        t.join();
1294 >        awaitTermination(t);
1295      }
1296  
1297      /**
# Line 1146 | Line 1300 | public class LinkedBlockingDequeTest ext
1300      public void testTimedPollLast0() throws InterruptedException {
1301          LinkedBlockingDeque q = populatedDeque(SIZE);
1302          for (int i = 0; i < SIZE; ++i) {
1303 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1303 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1304          }
1305          assertNull(q.pollLast(0, MILLISECONDS));
1306      }
# Line 1157 | Line 1311 | public class LinkedBlockingDequeTest ext
1311      public void testTimedPollLast() throws InterruptedException {
1312          LinkedBlockingDeque q = populatedDeque(SIZE);
1313          for (int i = 0; i < SIZE; ++i) {
1314 <            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1315 <        }
1316 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1314 >            long startTime = System.nanoTime();
1315 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1316 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1317 >        }
1318 >        long startTime = System.nanoTime();
1319 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1320 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1321 >        checkEmpty(q);
1322      }
1323  
1324      /**
# Line 1167 | Line 1326 | public class LinkedBlockingDequeTest ext
1326       * returning timeout status
1327       */
1328      public void testInterruptedTimedPollLast() throws InterruptedException {
1329 <        Thread t = new Thread(new CheckedRunnable() {
1329 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1330 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1331 >        Thread t = newStartedThread(new CheckedRunnable() {
1332              public void realRun() throws InterruptedException {
1333 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1333 >                long startTime = System.nanoTime();
1334                  for (int i = 0; i < SIZE; ++i) {
1335 <                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1335 >                    assertEquals(SIZE - i - 1,
1336 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1337                  }
1338 +
1339 +                Thread.currentThread().interrupt();
1340 +                try {
1341 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1342 +                    shouldThrow();
1343 +                } catch (InterruptedException success) {}
1344 +                assertFalse(Thread.interrupted());
1345 +
1346 +                pleaseInterrupt.countDown();
1347                  try {
1348 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1348 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1349                      shouldThrow();
1350                  } catch (InterruptedException success) {}
1351 +                assertFalse(Thread.interrupted());
1352 +
1353 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1354              }});
1355  
1356 <        t.start();
1357 <        Thread.sleep(SHORT_DELAY_MS);
1356 >        await(pleaseInterrupt);
1357 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1358          t.interrupt();
1359 <        t.join();
1359 >        awaitTermination(t);
1360 >        checkEmpty(q);
1361      }
1362  
1363      /**
1364 <     *  timed poll before a delayed offerLast fails; after offerLast succeeds;
1365 <     *  on interruption throws
1364 >     * timed poll before a delayed offerLast fails; after offerLast succeeds;
1365 >     * on interruption throws
1366       */
1367      public void testTimedPollWithOfferLast() throws InterruptedException {
1368          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1369 <        Thread t = new Thread(new CheckedRunnable() {
1369 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1370 >        Thread t = newStartedThread(new CheckedRunnable() {
1371              public void realRun() throws InterruptedException {
1372 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1372 >                long startTime = System.nanoTime();
1373 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1374 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1375 >
1376 >                barrier.await();
1377 >
1378                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1379 +
1380 +                Thread.currentThread().interrupt();
1381                  try {
1382                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1383                      shouldThrow();
1384                  } catch (InterruptedException success) {}
1385 +                assertFalse(Thread.interrupted());
1386 +
1387 +                barrier.await();
1388 +                try {
1389 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1390 +                    shouldThrow();
1391 +                } catch (InterruptedException success) {}
1392 +                assertFalse(Thread.interrupted());
1393 +
1394 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1395              }});
1396  
1397 <        t.start();
1398 <        Thread.sleep(SMALL_DELAY_MS);
1399 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1397 >        barrier.await();
1398 >        long startTime = System.nanoTime();
1399 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1400 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1401 >
1402 >        barrier.await();
1403 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1404          t.interrupt();
1405 <        t.join();
1405 >        awaitTermination(t);
1406      }
1407  
1211
1408      /**
1409       * element returns next element, or throws NSEE if empty
1410       */
# Line 1225 | Line 1421 | public class LinkedBlockingDequeTest ext
1421      }
1422  
1423      /**
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    /**
1424       * contains(x) reports true when elements added but not yet removed
1425       */
1426      public void testContains() {
# Line 1295 | Line 1476 | public class LinkedBlockingDequeTest ext
1476                  assertTrue(changed);
1477  
1478              assertTrue(q.containsAll(p));
1479 <            assertEquals(SIZE-i, q.size());
1479 >            assertEquals(SIZE - i, q.size());
1480              p.remove();
1481          }
1482      }
# Line 1308 | Line 1489 | public class LinkedBlockingDequeTest ext
1489              LinkedBlockingDeque q = populatedDeque(SIZE);
1490              LinkedBlockingDeque p = populatedDeque(i);
1491              assertTrue(q.removeAll(p));
1492 <            assertEquals(SIZE-i, q.size());
1492 >            assertEquals(SIZE - i, q.size());
1493              for (int j = 0; j < i; ++j) {
1494 <                Integer I = (Integer)(p.remove());
1495 <                assertFalse(q.contains(I));
1494 >                Integer x = (Integer)(p.remove());
1495 >                assertFalse(q.contains(x));
1496              }
1497          }
1498      }
1499  
1500      /**
1501 <     * toArray contains all elements
1501 >     * toArray contains all elements in FIFO order
1502       */
1503 <    public void testToArray() throws InterruptedException{
1503 >    public void testToArray() throws InterruptedException {
1504          LinkedBlockingDeque q = populatedDeque(SIZE);
1505          Object[] o = q.toArray();
1506          for (int i = 0; i < o.length; i++)
1507 <            assertEquals(o[i], q.take());
1507 >            assertSame(o[i], q.poll());
1508      }
1509  
1510      /**
1511 <     * toArray(a) contains all elements
1511 >     * toArray(a) contains all elements in FIFO order
1512       */
1513 <    public void testToArray2() throws InterruptedException {
1514 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1513 >    public void testToArray2() {
1514 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1515          Integer[] ints = new Integer[SIZE];
1516 <        ints = (Integer[])q.toArray(ints);
1516 >        Integer[] array = q.toArray(ints);
1517 >        assertSame(ints, array);
1518          for (int i = 0; i < ints.length; i++)
1519 <            assertEquals(ints[i], q.take());
1519 >            assertSame(ints[i], q.remove());
1520      }
1521  
1522      /**
1523 <     * 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) {}
1349 <    }
1350 <
1351 <    /**
1352 <     * toArray with incompatible array type throws CCE
1523 >     * toArray(incompatible array type) throws ArrayStoreException
1524       */
1525      public void testToArray1_BadArg() {
1526          LinkedBlockingDeque q = populatedDeque(SIZE);
1527          try {
1528 <            Object o[] = q.toArray(new String[10]);
1528 >            q.toArray(new String[10]);
1529              shouldThrow();
1530          } catch (ArrayStoreException success) {}
1531      }
1532  
1362
1533      /**
1534       * iterator iterates through all elements
1535       */
1536      public void testIterator() throws InterruptedException {
1537          LinkedBlockingDeque q = populatedDeque(SIZE);
1538          Iterator it = q.iterator();
1539 <        while (it.hasNext()) {
1539 >        int i;
1540 >        for (i = 0; it.hasNext(); i++)
1541 >            assertTrue(q.contains(it.next()));
1542 >        assertEquals(i, SIZE);
1543 >        assertIteratorExhausted(it);
1544 >
1545 >        it = q.iterator();
1546 >        for (i = 0; it.hasNext(); i++)
1547              assertEquals(it.next(), q.take());
1548 <        }
1548 >        assertEquals(i, SIZE);
1549 >        assertIteratorExhausted(it);
1550 >    }
1551 >
1552 >    /**
1553 >     * iterator of empty collection has no elements
1554 >     */
1555 >    public void testEmptyIterator() {
1556 >        Deque c = new LinkedBlockingDeque();
1557 >        assertIteratorExhausted(c.iterator());
1558 >        assertIteratorExhausted(c.descendingIterator());
1559      }
1560  
1561      /**
1562       * iterator.remove removes current element
1563       */
1564 <    public void testIteratorRemove () {
1564 >    public void testIteratorRemove() {
1565          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1566          q.add(two);
1567          q.add(one);
# Line 1385 | Line 1572 | public class LinkedBlockingDequeTest ext
1572          it.remove();
1573  
1574          it = q.iterator();
1575 <        assertEquals(it.next(), one);
1576 <        assertEquals(it.next(), three);
1575 >        assertSame(it.next(), one);
1576 >        assertSame(it.next(), three);
1577          assertFalse(it.hasNext());
1578      }
1579  
1393
1580      /**
1581       * iterator ordering is FIFO
1582       */
# Line 1410 | Line 1596 | public class LinkedBlockingDequeTest ext
1596      /**
1597       * Modifications do not cause iterators to fail
1598       */
1599 <    public void testWeaklyConsistentIteration () {
1599 >    public void testWeaklyConsistentIteration() {
1600          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1601          q.add(one);
1602          q.add(two);
# Line 1422 | Line 1608 | public class LinkedBlockingDequeTest ext
1608          assertEquals(0, q.size());
1609      }
1610  
1425
1611      /**
1612 <     *  Descending iterator iterates through all elements
1612 >     * Descending iterator iterates through all elements
1613       */
1614      public void testDescendingIterator() {
1615          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 1443 | Line 1628 | public class LinkedBlockingDequeTest ext
1628      }
1629  
1630      /**
1631 <     *  Descending iterator ordering is reverse FIFO
1631 >     * Descending iterator ordering is reverse FIFO
1632       */
1633      public void testDescendingIteratorOrdering() {
1634          final LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1466 | Line 1651 | public class LinkedBlockingDequeTest ext
1651      /**
1652       * descendingIterator.remove removes current element
1653       */
1654 <    public void testDescendingIteratorRemove () {
1654 >    public void testDescendingIteratorRemove() {
1655          final LinkedBlockingDeque q = new LinkedBlockingDeque();
1656          for (int iters = 0; iters < 100; ++iters) {
1657              q.add(new Integer(3));
# Line 1485 | Line 1670 | public class LinkedBlockingDequeTest ext
1670          }
1671      }
1672  
1488
1673      /**
1674       * toString contains toStrings of elements
1675       */
# Line 1493 | Line 1677 | public class LinkedBlockingDequeTest ext
1677          LinkedBlockingDeque q = populatedDeque(SIZE);
1678          String s = q.toString();
1679          for (int i = 0; i < SIZE; ++i) {
1680 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1680 >            assertTrue(s.contains(String.valueOf(i)));
1681          }
1682      }
1683  
1500
1684      /**
1685       * offer transfers elements across Executor tasks
1686       */
# Line 1505 | Line 1688 | public class LinkedBlockingDequeTest ext
1688          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1689          q.add(one);
1690          q.add(two);
1691 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1692 <        executor.execute(new CheckedRunnable() {
1693 <            public void realRun() throws InterruptedException {
1694 <                assertFalse(q.offer(three));
1695 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1696 <                assertEquals(0, q.remainingCapacity());
1697 <            }});
1698 <
1699 <        executor.execute(new CheckedRunnable() {
1700 <            public void realRun() throws InterruptedException {
1701 <                Thread.sleep(SMALL_DELAY_MS);
1702 <                assertSame(one, q.take());
1703 <            }});
1704 <
1705 <        joinPool(executor);
1691 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1692 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1693 >        try (PoolCleaner cleaner = cleaner(executor)) {
1694 >            executor.execute(new CheckedRunnable() {
1695 >                public void realRun() throws InterruptedException {
1696 >                    assertFalse(q.offer(three));
1697 >                    threadsStarted.await();
1698 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1699 >                    assertEquals(0, q.remainingCapacity());
1700 >                }});
1701 >
1702 >            executor.execute(new CheckedRunnable() {
1703 >                public void realRun() throws InterruptedException {
1704 >                    threadsStarted.await();
1705 >                    assertSame(one, q.take());
1706 >                }});
1707 >        }
1708      }
1709  
1710      /**
1711 <     * poll retrieves elements across Executor threads
1711 >     * timed poll retrieves elements across Executor threads
1712       */
1713      public void testPollInExecutor() {
1714          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1715 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1716 <        executor.execute(new CheckedRunnable() {
1717 <            public void realRun() throws InterruptedException {
1718 <                assertNull(q.poll());
1719 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1720 <                assertTrue(q.isEmpty());
1721 <            }});
1722 <
1723 <        executor.execute(new CheckedRunnable() {
1724 <            public void realRun() throws InterruptedException {
1725 <                Thread.sleep(SMALL_DELAY_MS);
1726 <                q.put(one);
1727 <            }});
1728 <
1729 <        joinPool(executor);
1715 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1716 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1717 >        try (PoolCleaner cleaner = cleaner(executor)) {
1718 >            executor.execute(new CheckedRunnable() {
1719 >                public void realRun() throws InterruptedException {
1720 >                    assertNull(q.poll());
1721 >                    threadsStarted.await();
1722 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1723 >                    checkEmpty(q);
1724 >                }});
1725 >
1726 >            executor.execute(new CheckedRunnable() {
1727 >                public void realRun() throws InterruptedException {
1728 >                    threadsStarted.await();
1729 >                    q.put(one);
1730 >                }});
1731 >        }
1732      }
1733  
1734      /**
1735       * A deserialized serialized deque has same elements in same order
1736       */
1737      public void testSerialization() throws Exception {
1738 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1739 <
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 <    }
1738 >        Queue x = populatedDeque(SIZE);
1739 >        Queue y = serialClone(x);
1740  
1741 <    /**
1742 <     * drainTo(this) throws IAE
1743 <     */
1744 <    public void testDrainToSelf() {
1745 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1746 <        try {
1747 <            q.drainTo(q);
1748 <            shouldThrow();
1749 <        } catch (IllegalArgumentException success) {}
1741 >        assertNotSame(y, x);
1742 >        assertEquals(x.size(), y.size());
1743 >        assertEquals(x.toString(), y.toString());
1744 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1745 >        while (!x.isEmpty()) {
1746 >            assertFalse(y.isEmpty());
1747 >            assertEquals(x.remove(), y.remove());
1748 >        }
1749 >        assertTrue(y.isEmpty());
1750      }
1751  
1752      /**
# Line 1592 | Line 1756 | public class LinkedBlockingDequeTest ext
1756          LinkedBlockingDeque q = populatedDeque(SIZE);
1757          ArrayList l = new ArrayList();
1758          q.drainTo(l);
1759 <        assertEquals(q.size(), 0);
1760 <        assertEquals(l.size(), SIZE);
1759 >        assertEquals(0, q.size());
1760 >        assertEquals(SIZE, l.size());
1761          for (int i = 0; i < SIZE; ++i)
1762              assertEquals(l.get(i), new Integer(i));
1763          q.add(zero);
# Line 1603 | Line 1767 | public class LinkedBlockingDequeTest ext
1767          assertTrue(q.contains(one));
1768          l.clear();
1769          q.drainTo(l);
1770 <        assertEquals(q.size(), 0);
1771 <        assertEquals(l.size(), 2);
1770 >        assertEquals(0, q.size());
1771 >        assertEquals(2, l.size());
1772          for (int i = 0; i < 2; ++i)
1773              assertEquals(l.get(i), new Integer(i));
1774      }
# Line 1616 | Line 1780 | public class LinkedBlockingDequeTest ext
1780          final LinkedBlockingDeque q = populatedDeque(SIZE);
1781          Thread t = new Thread(new CheckedRunnable() {
1782              public void realRun() throws InterruptedException {
1783 <                q.put(new Integer(SIZE+1));
1783 >                q.put(new Integer(SIZE + 1));
1784              }});
1785  
1786          t.start();
# Line 1630 | Line 1794 | public class LinkedBlockingDequeTest ext
1794      }
1795  
1796      /**
1797 <     * 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
1797 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
1798       */
1799      public void testDrainToN() {
1800          LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1661 | Line 1803 | public class LinkedBlockingDequeTest ext
1803                  assertTrue(q.offer(new Integer(j)));
1804              ArrayList l = new ArrayList();
1805              q.drainTo(l, i);
1806 <            int k = (i < SIZE)? i : SIZE;
1807 <            assertEquals(l.size(), k);
1808 <            assertEquals(q.size(), SIZE-k);
1806 >            int k = (i < SIZE) ? i : SIZE;
1807 >            assertEquals(k, l.size());
1808 >            assertEquals(SIZE - k, q.size());
1809              for (int j = 0; j < k; ++j)
1810                  assertEquals(l.get(j), new Integer(j));
1811 <            while (q.poll() != null) ;
1811 >            do {} while (q.poll() != null);
1812 >        }
1813 >    }
1814 >
1815 >    /**
1816 >     * remove(null), contains(null) always return false
1817 >     */
1818 >    public void testNeverContainsNull() {
1819 >        Deque<?>[] qs = {
1820 >            new LinkedBlockingDeque<Object>(),
1821 >            populatedDeque(2),
1822 >        };
1823 >
1824 >        for (Deque<?> q : qs) {
1825 >            assertFalse(q.contains(null));
1826 >            assertFalse(q.remove(null));
1827 >            assertFalse(q.removeFirstOccurrence(null));
1828 >            assertFalse(q.removeLastOccurrence(null));
1829          }
1830      }
1831  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines