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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.16 by jsr166, Sat Nov 21 22:00:46 2009 UTC vs.
Revision 1.76 by jsr166, Sun May 14 00:48:20 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);
149          for (int i = 0; i < SIZE; ++i) {
150 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
150 >            assertEquals(i, q.pollFirst());
151          }
152          assertNull(q.pollFirst());
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) {
161 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
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);
171          for (int i = 0; i < SIZE; ++i) {
172 <            assertEquals(i, ((Integer)q.peekFirst()).intValue());
173 <            q.pollFirst();
172 >            assertEquals(i, q.peekFirst());
173 >            assertEquals(i, q.pollFirst());
174              assertTrue(q.peekFirst() == null ||
175 <                       i != ((Integer)q.peekFirst()).intValue());
175 >                       !q.peekFirst().equals(i));
176          }
177          assertNull(q.peekFirst());
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);
185          for (int i = 0; i < SIZE; ++i) {
186 <            assertEquals(i, ((Integer)q.peek()).intValue());
187 <            q.pollFirst();
186 >            assertEquals(i, q.peek());
187 >            assertEquals(i, q.pollFirst());
188              assertTrue(q.peek() == null ||
189 <                       i != ((Integer)q.peek()).intValue());
189 >                       !q.peek().equals(i));
190          }
191          assertNull(q.peek());
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) {
200 <            assertEquals(i, ((Integer)q.peekLast()).intValue());
201 <            q.pollLast();
199 >        for (int i = SIZE - 1; i >= 0; --i) {
200 >            assertEquals(i, q.peekLast());
201 >            assertEquals(i, q.pollLast());
202              assertTrue(q.peekLast() == null ||
203 <                       i != ((Integer)q.peekLast()).intValue());
203 >                       !q.peekLast().equals(i));
204          }
205          assertNull(q.peekLast());
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);
213          for (int i = 0; i < SIZE; ++i) {
214 <            assertEquals(i, ((Integer)q.getFirst()).intValue());
215 <            q.pollFirst();
214 >            assertEquals(i, q.getFirst());
215 >            assertEquals(i, q.pollFirst());
216          }
217          try {
218              q.getFirst();
# 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) {
230 <            assertEquals(i, ((Integer)q.getLast()).intValue());
231 <            q.pollLast();
229 >        for (int i = SIZE - 1; i >= 0; --i) {
230 >            assertEquals(i, q.getLast());
231 >            assertEquals(i, q.pollLast());
232          }
233          try {
234              q.getLast();
# 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);
245          for (int i = 0; i < SIZE; ++i) {
246 <            assertEquals(i, ((Integer)q.removeFirst()).intValue());
246 >            assertEquals(i, q.removeFirst());
247          }
248          try {
249              q.removeFirst();
# 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);
260          for (int i = SIZE - 1; i >= 0; --i) {
261 <            assertEquals(i, ((Integer)q.removeLast()).intValue());
261 >            assertEquals(i, q.removeLast());
262          }
263          try {
264              q.removeLast();
# 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);
275          for (int i = 0; i < SIZE; ++i) {
276 <            assertEquals(i, ((Integer)q.remove()).intValue());
276 >            assertEquals(i, q.remove());
277          }
278          try {
279              q.remove();
# 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);
476          for (int i = 0; i < SIZE; ++i) {
477 <            assertEquals(i, ((Integer)q.pop()).intValue());
477 >            assertEquals(i, q.pop());
478          }
479          try {
480              q.pop();
# 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 585 | Line 579 | public class LinkedBlockingDequeTest ext
579       * put blocks interruptibly if full
580       */
581      public void testBlockingPut() throws InterruptedException {
582 <        Thread t = new Thread(new CheckedRunnable() {
583 <            public void realRun() {
584 <                int added = 0;
582 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
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 <                    LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
594 <                    for (int i = 0; i < SIZE; ++i) {
595 <                        q.put(new Integer(i));
596 <                        ++added;
597 <                    }
598 <                    q.put(new Integer(SIZE));
599 <                    threadShouldThrow();
600 <                } catch (InterruptedException success) {
601 <                    threadAssertEquals(added, SIZE);
602 <                }
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 LinkedBlockingDeque q = new LinkedBlockingDeque(2);
619 <        Thread t = new Thread(new CheckedRunnable() {
620 <            public void realRun() {
621 <                int added = 0;
618 >        final int capacity = 2;
619 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
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; i++)
625 >                    q.put(i);
626 >                pleaseTake.countDown();
627 >                q.put(86);
628 >
629 >                pleaseInterrupt.countDown();
630                  try {
631 <                    q.put(new Object());
632 <                    ++added;
633 <                    q.put(new Object());
634 <                    ++added;
623 <                    q.put(new Object());
624 <                    ++added;
625 <                    q.put(new Object());
626 <                    ++added;
627 <                    threadShouldThrow();
628 <                } catch (InterruptedException success) {
629 <                    threadAssertTrue(added >= 2);
630 <                }
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);
639 <        q.take();
637 >        await(pleaseTake);
638 >        assertEquals(0, q.remainingCapacity());
639 >        assertEquals(0, q.take());
640 >
641 >        await(pleaseInterrupt);
642 >        assertThreadBlocks(t, Thread.State.WAITING);
643          t.interrupt();
644 <        t.join();
644 >        awaitTermination(t);
645 >        assertEquals(0, q.remainingCapacity());
646      }
647  
648      /**
# Line 642 | 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 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
670          t.interrupt();
671 <        t.join();
671 >        awaitTermination(t);
672      }
673  
674      /**
# Line 665 | Line 677 | public class LinkedBlockingDequeTest ext
677      public void testTake() throws InterruptedException {
678          LinkedBlockingDeque q = populatedDeque(SIZE);
679          for (int i = 0; i < SIZE; ++i) {
680 <            assertEquals(i, ((Integer)q.take()).intValue());
680 >            assertEquals(i, q.take());
681          }
682      }
683  
684      /**
685 <     * take blocks interruptibly when empty
685 >     * take removes existing elements until empty, then blocks interruptibly
686       */
687 <    public void testTakeFromEmpty() throws InterruptedException {
688 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
689 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
687 >    public void testBlockingTake() throws InterruptedException {
688 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
689 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
690 >        Thread t = newStartedThread(new CheckedRunnable() {
691              public void realRun() throws InterruptedException {
692 <                q.take();
680 <            }};
692 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
693  
694 <        t.start();
695 <        Thread.sleep(SHORT_DELAY_MS);
696 <        t.interrupt();
697 <        t.join();
698 <    }
694 >                Thread.currentThread().interrupt();
695 >                try {
696 >                    q.take();
697 >                    shouldThrow();
698 >                } catch (InterruptedException success) {}
699 >                assertFalse(Thread.interrupted());
700  
701 <    /**
702 <     * Take removes existing elements until empty, then blocks interruptibly
703 <     */
704 <    public void testBlockingTake() throws InterruptedException {
705 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
706 <            public void realRun() throws InterruptedException {
707 <                LinkedBlockingDeque q = populatedDeque(SIZE);
695 <                for (int i = 0; i < SIZE; ++i) {
696 <                    assertEquals(i, ((Integer)q.take()).intValue());
697 <                }
698 <                q.take();
699 <            }};
701 >                pleaseInterrupt.countDown();
702 >                try {
703 >                    q.take();
704 >                    shouldThrow();
705 >                } catch (InterruptedException success) {}
706 >                assertFalse(Thread.interrupted());
707 >            }});
708  
709 <        t.start();
710 <        Thread.sleep(SHORT_DELAY_MS);
709 >        await(pleaseInterrupt);
710 >        assertThreadBlocks(t, Thread.State.WAITING);
711          t.interrupt();
712 <        t.join();
712 >        awaitTermination(t);
713      }
714  
707
715      /**
716       * poll succeeds unless empty
717       */
718      public void testPoll() {
719          LinkedBlockingDeque q = populatedDeque(SIZE);
720          for (int i = 0; i < SIZE; ++i) {
721 <            assertEquals(i, ((Integer)q.poll()).intValue());
721 >            assertEquals(i, q.poll());
722          }
723          assertNull(q.poll());
724      }
# Line 722 | Line 729 | public class LinkedBlockingDequeTest ext
729      public void testTimedPoll0() throws InterruptedException {
730          LinkedBlockingDeque q = populatedDeque(SIZE);
731          for (int i = 0; i < SIZE; ++i) {
732 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
732 >            assertEquals(i, q.poll(0, MILLISECONDS));
733          }
734          assertNull(q.poll(0, MILLISECONDS));
735      }
# Line 733 | Line 740 | public class LinkedBlockingDequeTest ext
740      public void testTimedPoll() throws InterruptedException {
741          LinkedBlockingDeque q = populatedDeque(SIZE);
742          for (int i = 0; i < SIZE; ++i) {
743 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
744 <        }
745 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
743 >            long startTime = System.nanoTime();
744 >            assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
745 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
746 >        }
747 >        long startTime = System.nanoTime();
748 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
749 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
750 >        checkEmpty(q);
751      }
752  
753      /**
# Line 743 | Line 755 | public class LinkedBlockingDequeTest ext
755       * returning timeout status
756       */
757      public void testInterruptedTimedPoll() throws InterruptedException {
758 <        Thread t = new Thread(new CheckedRunnable() {
758 >        final BlockingQueue<Integer> q = populatedDeque(SIZE);
759 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
760 >        Thread t = newStartedThread(new CheckedRunnable() {
761              public void realRun() throws InterruptedException {
762 <                LinkedBlockingDeque q = populatedDeque(SIZE);
762 >                long startTime = System.nanoTime();
763                  for (int i = 0; i < SIZE; ++i) {
764 <                    assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
764 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
765                  }
752                try {
753                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
754                    shouldThrow();
755                } catch (InterruptedException success) {}
756            }});
757
758        t.start();
759        Thread.sleep(SHORT_DELAY_MS);
760        t.interrupt();
761        t.join();
762    }
766  
767 <    /**
765 <     *  timed poll before a delayed offer fails; after offer succeeds;
766 <     *  on interruption throws
767 <     */
768 <    public void testTimedPollWithOffer() throws InterruptedException {
769 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
770 <        Thread t = new Thread(new CheckedRunnable() {
771 <            public void realRun() throws InterruptedException {
772 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
773 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
767 >                pleaseInterrupt.countDown();
768                  try {
769                      q.poll(LONG_DELAY_MS, MILLISECONDS);
770                      shouldThrow();
771                  } catch (InterruptedException success) {}
772 +                assertFalse(Thread.interrupted());
773 +
774 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
775              }});
776  
777 <        t.start();
778 <        Thread.sleep(SMALL_DELAY_MS);
782 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
777 >        await(pleaseInterrupt);
778 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
779          t.interrupt();
780 <        t.join();
780 >        awaitTermination(t);
781 >        checkEmpty(q);
782      }
783  
787
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 {
793            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      /**
809       * putFirst blocks interruptibly if full
810       */
811      public void testBlockingPutFirst() throws InterruptedException {
812 <        Thread t = new Thread(new CheckedRunnable() {
813 <            public void realRun() {
814 <                int added = 0;
812 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
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 <                    LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
824 <                    for (int i = 0; i < SIZE; ++i) {
825 <                        q.putFirst(new Integer(i));
826 <                        ++added;
827 <                    }
828 <                    q.putFirst(new Integer(SIZE));
829 <                    threadShouldThrow();
830 <                } catch (InterruptedException success) {
831 <                    threadAssertEquals(added, SIZE);
832 <                }
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 >        assertThreadBlocks(t, Thread.State.WAITING);
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 LinkedBlockingDeque q = new LinkedBlockingDeque(2);
849 <        Thread t = new Thread(new CheckedRunnable() {
850 <            public void realRun() {
851 <                int added = 0;
848 >        final int capacity = 2;
849 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
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; i++)
855 >                    q.putFirst(i);
856 >                pleaseTake.countDown();
857 >                q.putFirst(86);
858 >
859 >                pleaseInterrupt.countDown();
860                  try {
861 <                    q.putFirst(new Object());
862 <                    ++added;
863 <                    q.putFirst(new Object());
864 <                    ++added;
851 <                    q.putFirst(new Object());
852 <                    ++added;
853 <                    q.putFirst(new Object());
854 <                    ++added;
855 <                    threadShouldThrow();
856 <                } catch (InterruptedException success) {
857 <                    threadAssertTrue(added >= 2);
858 <                }
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);
869 <        q.take();
867 >        await(pleaseTake);
868 >        assertEquals(0, q.remainingCapacity());
869 >        assertEquals(capacity - 1, q.take());
870 >
871 >        await(pleaseInterrupt);
872 >        assertThreadBlocks(t, Thread.State.WAITING);
873          t.interrupt();
874 <        t.join();
874 >        awaitTermination(t);
875 >        assertEquals(0, q.remainingCapacity());
876      }
877  
878      /**
# Line 870 | 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 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
900          t.interrupt();
901 <        t.join();
901 >        awaitTermination(t);
902      }
903  
904      /**
# Line 893 | Line 907 | public class LinkedBlockingDequeTest ext
907      public void testTakeFirst() throws InterruptedException {
908          LinkedBlockingDeque q = populatedDeque(SIZE);
909          for (int i = 0; i < SIZE; ++i) {
910 <            assertEquals(i, ((Integer)q.takeFirst()).intValue());
910 >            assertEquals(i, q.takeFirst());
911          }
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 >        assertThreadBlocks(t, Thread.State.WAITING);
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 >        assertThreadBlocks(t, Thread.State.WAITING);
973 >        t.interrupt();
974 >        awaitTermination(t);
975      }
976  
977      /**
978 <     * TakeFirst removes existing elements until empty, then blocks interruptibly
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
998       */
999      public void testBlockingTakeFirst() throws InterruptedException {
1000 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1000 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1001 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1002 >        Thread t = newStartedThread(new CheckedRunnable() {
1003              public void realRun() throws InterruptedException {
1004 <                LinkedBlockingDeque q = populatedDeque(SIZE);
923 <                for (int i = 0; i < SIZE; ++i) {
924 <                    assertEquals(i, ((Integer)q.takeFirst()).intValue());
925 <                }
926 <                q.takeFirst();
927 <            }};
1004 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1005  
1006 <        t.start();
1007 <        Thread.sleep(SHORT_DELAY_MS);
1006 >                Thread.currentThread().interrupt();
1007 >                try {
1008 >                    q.takeFirst();
1009 >                    shouldThrow();
1010 >                } catch (InterruptedException success) {}
1011 >                assertFalse(Thread.interrupted());
1012 >
1013 >                pleaseInterrupt.countDown();
1014 >                try {
1015 >                    q.takeFirst();
1016 >                    shouldThrow();
1017 >                } catch (InterruptedException success) {}
1018 >                assertFalse(Thread.interrupted());
1019 >            }});
1020 >
1021 >        await(pleaseInterrupt);
1022 >        assertThreadBlocks(t, Thread.State.WAITING);
1023          t.interrupt();
1024 <        t.join();
1024 >        awaitTermination(t);
1025      }
1026  
935
1027      /**
1028       * timed pollFirst with zero timeout succeeds when non-empty, else times out
1029       */
1030      public void testTimedPollFirst0() throws InterruptedException {
1031          LinkedBlockingDeque q = populatedDeque(SIZE);
1032          for (int i = 0; i < SIZE; ++i) {
1033 <            assertEquals(i, ((Integer)q.pollFirst(0, MILLISECONDS)).intValue());
1033 >            assertEquals(i, q.pollFirst(0, MILLISECONDS));
1034          }
1035          assertNull(q.pollFirst(0, MILLISECONDS));
1036      }
# Line 950 | Line 1041 | public class LinkedBlockingDequeTest ext
1041      public void testTimedPollFirst() throws InterruptedException {
1042          LinkedBlockingDeque q = populatedDeque(SIZE);
1043          for (int i = 0; i < SIZE; ++i) {
1044 <            assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1045 <        }
1046 <        assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1044 >            long startTime = System.nanoTime();
1045 >            assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1046 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1047 >        }
1048 >        long startTime = System.nanoTime();
1049 >        assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1050 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1051 >        checkEmpty(q);
1052      }
1053  
1054      /**
# Line 960 | Line 1056 | public class LinkedBlockingDequeTest ext
1056       * returning timeout status
1057       */
1058      public void testInterruptedTimedPollFirst() throws InterruptedException {
1059 <        Thread t = new Thread(new CheckedRunnable() {
1059 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1060 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1061 >        Thread t = newStartedThread(new CheckedRunnable() {
1062              public void realRun() throws InterruptedException {
1063 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1063 >                long startTime = System.nanoTime();
1064                  for (int i = 0; i < SIZE; ++i) {
1065 <                    assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1065 >                    assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1066                  }
1067 +
1068 +                Thread.currentThread().interrupt();
1069                  try {
1070 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1070 >                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1071                      shouldThrow();
1072                  } catch (InterruptedException success) {}
1073 +                assertFalse(Thread.interrupted());
1074 +
1075 +                pleaseInterrupt.countDown();
1076 +                try {
1077 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1078 +                    shouldThrow();
1079 +                } catch (InterruptedException success) {}
1080 +                assertFalse(Thread.interrupted());
1081 +
1082 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1083              }});
1084  
1085 <        t.start();
1086 <        Thread.sleep(SHORT_DELAY_MS);
1085 >        await(pleaseInterrupt);
1086 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1087          t.interrupt();
1088 <        t.join();
1088 >        awaitTermination(t);
1089      }
1090  
1091      /**
1092 <     *  timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1093 <     *  on interruption throws
1092 >     * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
1093 >     * on interruption throws
1094       */
1095      public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
1096          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1097 <        Thread t = new Thread(new CheckedRunnable() {
1097 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1098 >        Thread t = newStartedThread(new CheckedRunnable() {
1099              public void realRun() throws InterruptedException {
1100 <                assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
1100 >                long startTime = System.nanoTime();
1101 >                assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS));
1102 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1103 >
1104 >                barrier.await();
1105 >
1106                  assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1107 +
1108 +                Thread.currentThread().interrupt();
1109 +                try {
1110 +                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1111 +                    shouldThrow();
1112 +                } catch (InterruptedException success) {}
1113 +
1114 +                barrier.await();
1115                  try {
1116                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1117                      shouldThrow();
1118                  } catch (InterruptedException success) {}
1119 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1120              }});
1121  
1122 <        t.start();
1123 <        Thread.sleep(SMALL_DELAY_MS);
1124 <        assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS));
1122 >        barrier.await();
1123 >        long startTime = System.nanoTime();
1124 >        assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1125 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1126 >        barrier.await();
1127 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1128          t.interrupt();
1129 <        t.join();
1129 >        awaitTermination(t);
1130      }
1131  
1132      /**
1133       * putLast(null) throws NPE
1134       */
1135 <     public void testPutLastNull() throws InterruptedException {
1135 >    public void testPutLastNull() throws InterruptedException {
1136 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1137          try {
1009            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1138              q.putLast(null);
1139              shouldThrow();
1140          } catch (NullPointerException success) {}
1141 <     }
1141 >    }
1142  
1143      /**
1144       * all elements successfully putLast are contained
1145       */
1146 <     public void testPutLast() throws InterruptedException {
1147 <         LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1148 <         for (int i = 0; i < SIZE; ++i) {
1149 <             Integer I = new Integer(i);
1150 <             q.putLast(I);
1151 <             assertTrue(q.contains(I));
1152 <         }
1153 <         assertEquals(0, q.remainingCapacity());
1146 >    public void testPutLast() throws InterruptedException {
1147 >        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1148 >        for (int i = 0; i < SIZE; ++i) {
1149 >            Integer x = new Integer(i);
1150 >            q.putLast(x);
1151 >            assertTrue(q.contains(x));
1152 >        }
1153 >        assertEquals(0, q.remainingCapacity());
1154      }
1155  
1156      /**
1157       * putLast blocks interruptibly if full
1158       */
1159      public void testBlockingPutLast() throws InterruptedException {
1160 <        Thread t = new Thread(new CheckedRunnable() {
1161 <            public void realRun() {
1162 <                int added = 0;
1160 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1161 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1162 >        Thread t = newStartedThread(new CheckedRunnable() {
1163 >            public void realRun() throws InterruptedException {
1164 >                for (int i = 0; i < SIZE; ++i)
1165 >                    q.putLast(i);
1166 >                assertEquals(SIZE, q.size());
1167 >                assertEquals(0, q.remainingCapacity());
1168 >
1169 >                Thread.currentThread().interrupt();
1170                  try {
1171 <                    LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1172 <                    for (int i = 0; i < SIZE; ++i) {
1173 <                        q.putLast(new Integer(i));
1174 <                        ++added;
1175 <                    }
1176 <                    q.putLast(new Integer(SIZE));
1177 <                    threadShouldThrow();
1178 <                } catch (InterruptedException success) {
1179 <                    threadAssertEquals(added, SIZE);
1180 <                }
1171 >                    q.putLast(99);
1172 >                    shouldThrow();
1173 >                } catch (InterruptedException success) {}
1174 >                assertFalse(Thread.interrupted());
1175 >
1176 >                pleaseInterrupt.countDown();
1177 >                try {
1178 >                    q.putLast(99);
1179 >                    shouldThrow();
1180 >                } catch (InterruptedException success) {}
1181 >                assertFalse(Thread.interrupted());
1182              }});
1183  
1184 <        t.start();
1185 <        Thread.sleep(SHORT_DELAY_MS);
1184 >        await(pleaseInterrupt);
1185 >        assertThreadBlocks(t, Thread.State.WAITING);
1186          t.interrupt();
1187 <        t.join();
1187 >        awaitTermination(t);
1188 >        assertEquals(SIZE, q.size());
1189 >        assertEquals(0, q.remainingCapacity());
1190      }
1191  
1192      /**
1193 <     * putLast blocks waiting for take when full
1193 >     * putLast blocks interruptibly waiting for take when full
1194       */
1195      public void testPutLastWithTake() throws InterruptedException {
1196 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1197 <        Thread t = new Thread(new CheckedRunnable() {
1198 <            public void realRun() {
1199 <                int added = 0;
1196 >        final int capacity = 2;
1197 >        final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity);
1198 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
1199 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1200 >        Thread t = newStartedThread(new CheckedRunnable() {
1201 >            public void realRun() throws InterruptedException {
1202 >                for (int i = 0; i < capacity; i++)
1203 >                    q.putLast(i);
1204 >                pleaseTake.countDown();
1205 >                q.putLast(86);
1206 >
1207 >                pleaseInterrupt.countDown();
1208                  try {
1209 <                    q.putLast(new Object());
1210 <                    ++added;
1211 <                    q.putLast(new Object());
1212 <                    ++added;
1067 <                    q.putLast(new Object());
1068 <                    ++added;
1069 <                    q.putLast(new Object());
1070 <                    ++added;
1071 <                    threadShouldThrow();
1072 <                } catch (InterruptedException success) {
1073 <                    threadAssertTrue(added >= 2);
1074 <                }
1209 >                    q.putLast(99);
1210 >                    shouldThrow();
1211 >                } catch (InterruptedException success) {}
1212 >                assertFalse(Thread.interrupted());
1213              }});
1214  
1215 <        t.start();
1216 <        Thread.sleep(SHORT_DELAY_MS);
1217 <        q.take();
1215 >        await(pleaseTake);
1216 >        assertEquals(0, q.remainingCapacity());
1217 >        assertEquals(0, q.take());
1218 >
1219 >        await(pleaseInterrupt);
1220 >        assertThreadBlocks(t, Thread.State.WAITING);
1221          t.interrupt();
1222 <        t.join();
1222 >        awaitTermination(t);
1223 >        assertEquals(0, q.remainingCapacity());
1224      }
1225  
1226      /**
# Line 1086 | Line 1228 | public class LinkedBlockingDequeTest ext
1228       */
1229      public void testTimedOfferLast() throws InterruptedException {
1230          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1231 <        Thread t = new Thread(new CheckedRunnable() {
1231 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1232 >        Thread t = newStartedThread(new CheckedRunnable() {
1233              public void realRun() throws InterruptedException {
1234                  q.putLast(new Object());
1235                  q.putLast(new Object());
1236 <                assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS));
1236 >                long startTime = System.nanoTime();
1237 >                assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1238 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1239 >                pleaseInterrupt.countDown();
1240                  try {
1241 <                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1241 >                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1242                      shouldThrow();
1243                  } catch (InterruptedException success) {}
1244              }});
1245  
1246 <        t.start();
1247 <        Thread.sleep(SMALL_DELAY_MS);
1246 >        await(pleaseInterrupt);
1247 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1248          t.interrupt();
1249 <        t.join();
1249 >        awaitTermination(t);
1250      }
1251  
1252      /**
# Line 1109 | Line 1255 | public class LinkedBlockingDequeTest ext
1255      public void testTakeLast() throws InterruptedException {
1256          LinkedBlockingDeque q = populatedDeque(SIZE);
1257          for (int i = 0; i < SIZE; ++i) {
1258 <            assertEquals(SIZE-i-1, ((Integer)q.takeLast()).intValue());
1258 >            assertEquals(SIZE - i - 1, q.takeLast());
1259          }
1260      }
1261  
1262      /**
1263 <     * takeLast blocks interruptibly when empty
1263 >     * takeLast removes existing elements until empty, then blocks interruptibly
1264       */
1265 <    public void testTakeLastFromEmpty() throws InterruptedException {
1266 <        final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1267 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1265 >    public void testBlockingTakeLast() throws InterruptedException {
1266 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1267 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1268 >        Thread t = newStartedThread(new CheckedRunnable() {
1269              public void realRun() throws InterruptedException {
1270 <                q.takeLast();
1271 <            }};
1270 >                for (int i = 0; i < SIZE; i++)
1271 >                    assertEquals(SIZE - i - 1, q.takeLast());
1272  
1273 <        t.start();
1274 <        Thread.sleep(SHORT_DELAY_MS);
1275 <        t.interrupt();
1276 <        t.join();
1277 <    }
1273 >                Thread.currentThread().interrupt();
1274 >                try {
1275 >                    q.takeLast();
1276 >                    shouldThrow();
1277 >                } catch (InterruptedException success) {}
1278 >                assertFalse(Thread.interrupted());
1279  
1280 <    /**
1281 <     * TakeLast removes existing elements until empty, then blocks interruptibly
1282 <     */
1283 <    public void testBlockingTakeLast() throws InterruptedException {
1284 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
1285 <            public void realRun() throws InterruptedException {
1286 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1139 <                for (int i = 0; i < SIZE; ++i) {
1140 <                    assertEquals(SIZE-i-1, ((Integer)q.takeLast()).intValue());
1141 <                }
1142 <                q.takeLast();
1143 <            }};
1280 >                pleaseInterrupt.countDown();
1281 >                try {
1282 >                    q.takeLast();
1283 >                    shouldThrow();
1284 >                } catch (InterruptedException success) {}
1285 >                assertFalse(Thread.interrupted());
1286 >            }});
1287  
1288 <        t.start();
1289 <        Thread.sleep(SHORT_DELAY_MS);
1288 >        await(pleaseInterrupt);
1289 >        assertThreadBlocks(t, Thread.State.WAITING);
1290          t.interrupt();
1291 <        t.join();
1291 >        awaitTermination(t);
1292      }
1293  
1151
1294      /**
1295       * timed pollLast with zero timeout succeeds when non-empty, else times out
1296       */
1297      public void testTimedPollLast0() throws InterruptedException {
1298          LinkedBlockingDeque q = populatedDeque(SIZE);
1299          for (int i = 0; i < SIZE; ++i) {
1300 <            assertEquals(SIZE-i-1, ((Integer)q.pollLast(0, MILLISECONDS)).intValue());
1300 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1301          }
1302          assertNull(q.pollLast(0, MILLISECONDS));
1303      }
# Line 1166 | Line 1308 | public class LinkedBlockingDequeTest ext
1308      public void testTimedPollLast() throws InterruptedException {
1309          LinkedBlockingDeque q = populatedDeque(SIZE);
1310          for (int i = 0; i < SIZE; ++i) {
1311 <            assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1312 <        }
1313 <        assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1311 >            long startTime = System.nanoTime();
1312 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1313 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1314 >        }
1315 >        long startTime = System.nanoTime();
1316 >        assertNull(q.pollLast(timeoutMillis(), MILLISECONDS));
1317 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1318 >        checkEmpty(q);
1319      }
1320  
1321      /**
# Line 1176 | Line 1323 | public class LinkedBlockingDequeTest ext
1323       * returning timeout status
1324       */
1325      public void testInterruptedTimedPollLast() throws InterruptedException {
1326 <        Thread t = new Thread(new CheckedRunnable() {
1326 >        final LinkedBlockingDeque q = populatedDeque(SIZE);
1327 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1328 >        Thread t = newStartedThread(new CheckedRunnable() {
1329              public void realRun() throws InterruptedException {
1330 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1330 >                long startTime = System.nanoTime();
1331                  for (int i = 0; i < SIZE; ++i) {
1332 <                    assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1332 >                    assertEquals(SIZE - i - 1,
1333 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1334                  }
1335 +
1336 +                Thread.currentThread().interrupt();
1337                  try {
1338 <                    q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
1338 >                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1339                      shouldThrow();
1340                  } catch (InterruptedException success) {}
1341 +                assertFalse(Thread.interrupted());
1342 +
1343 +                pleaseInterrupt.countDown();
1344 +                try {
1345 +                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1346 +                    shouldThrow();
1347 +                } catch (InterruptedException success) {}
1348 +                assertFalse(Thread.interrupted());
1349 +
1350 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1351              }});
1352  
1353 <        t.start();
1354 <        Thread.sleep(SHORT_DELAY_MS);
1353 >        await(pleaseInterrupt);
1354 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1355          t.interrupt();
1356 <        t.join();
1356 >        awaitTermination(t);
1357 >        checkEmpty(q);
1358      }
1359  
1360      /**
1361 <     *  timed poll before a delayed offerLast fails; after offerLast succeeds;
1362 <     *  on interruption throws
1361 >     * timed poll before a delayed offerLast fails; after offerLast succeeds;
1362 >     * on interruption throws
1363       */
1364      public void testTimedPollWithOfferLast() throws InterruptedException {
1365          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1366 <        Thread t = new Thread(new CheckedRunnable() {
1366 >        final CheckedBarrier barrier = new CheckedBarrier(2);
1367 >        Thread t = newStartedThread(new CheckedRunnable() {
1368              public void realRun() throws InterruptedException {
1369 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
1369 >                long startTime = System.nanoTime();
1370 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
1371 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1372 >
1373 >                barrier.await();
1374 >
1375                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
1376 +
1377 +                Thread.currentThread().interrupt();
1378 +                try {
1379 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1380 +                    shouldThrow();
1381 +                } catch (InterruptedException success) {}
1382 +                assertFalse(Thread.interrupted());
1383 +
1384 +                barrier.await();
1385                  try {
1386                      q.poll(LONG_DELAY_MS, MILLISECONDS);
1387                      shouldThrow();
1388                  } catch (InterruptedException success) {}
1389 +                assertFalse(Thread.interrupted());
1390 +
1391 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1392              }});
1393  
1394 <        t.start();
1395 <        Thread.sleep(SMALL_DELAY_MS);
1396 <        assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS));
1394 >        barrier.await();
1395 >        long startTime = System.nanoTime();
1396 >        assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS));
1397 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1398 >
1399 >        barrier.await();
1400 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1401          t.interrupt();
1402 <        t.join();
1402 >        awaitTermination(t);
1403      }
1404  
1220
1405      /**
1406       * element returns next element, or throws NSEE if empty
1407       */
1408      public void testElement() {
1409          LinkedBlockingDeque q = populatedDeque(SIZE);
1410          for (int i = 0; i < SIZE; ++i) {
1411 <            assertEquals(i, ((Integer)q.element()).intValue());
1411 >            assertEquals(i, q.element());
1412              q.poll();
1413          }
1414          try {
# Line 1234 | Line 1418 | public class LinkedBlockingDequeTest ext
1418      }
1419  
1420      /**
1237     * remove(x) removes x and returns true if present
1238     */
1239    public void testRemoveElement() {
1240        LinkedBlockingDeque q = populatedDeque(SIZE);
1241        for (int i = 1; i < SIZE; i+=2) {
1242            assertTrue(q.remove(new Integer(i)));
1243        }
1244        for (int i = 0; i < SIZE; i+=2) {
1245            assertTrue(q.remove(new Integer(i)));
1246            assertFalse(q.remove(new Integer(i+1)));
1247        }
1248        assertTrue(q.isEmpty());
1249    }
1250
1251    /**
1421       * contains(x) reports true when elements added but not yet removed
1422       */
1423      public void testContains() {
# Line 1304 | Line 1473 | public class LinkedBlockingDequeTest ext
1473                  assertTrue(changed);
1474  
1475              assertTrue(q.containsAll(p));
1476 <            assertEquals(SIZE-i, q.size());
1476 >            assertEquals(SIZE - i, q.size());
1477              p.remove();
1478          }
1479      }
# Line 1317 | Line 1486 | public class LinkedBlockingDequeTest ext
1486              LinkedBlockingDeque q = populatedDeque(SIZE);
1487              LinkedBlockingDeque p = populatedDeque(i);
1488              assertTrue(q.removeAll(p));
1489 <            assertEquals(SIZE-i, q.size());
1489 >            assertEquals(SIZE - i, q.size());
1490              for (int j = 0; j < i; ++j) {
1491 <                Integer I = (Integer)(p.remove());
1492 <                assertFalse(q.contains(I));
1491 >                Integer x = (Integer)(p.remove());
1492 >                assertFalse(q.contains(x));
1493              }
1494          }
1495      }
1496  
1497      /**
1498 <     * toArray contains all elements
1498 >     * toArray contains all elements in FIFO order
1499       */
1500 <    public void testToArray() throws InterruptedException{
1500 >    public void testToArray() throws InterruptedException {
1501          LinkedBlockingDeque q = populatedDeque(SIZE);
1502          Object[] o = q.toArray();
1503          for (int i = 0; i < o.length; i++)
1504 <            assertEquals(o[i], q.take());
1504 >            assertSame(o[i], q.poll());
1505      }
1506  
1507      /**
1508 <     * toArray(a) contains all elements
1508 >     * toArray(a) contains all elements in FIFO order
1509       */
1510 <    public void testToArray2() throws InterruptedException {
1511 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1510 >    public void testToArray2() {
1511 >        LinkedBlockingDeque<Integer> q = populatedDeque(SIZE);
1512          Integer[] ints = new Integer[SIZE];
1513 <        ints = (Integer[])q.toArray(ints);
1513 >        Integer[] array = q.toArray(ints);
1514 >        assertSame(ints, array);
1515          for (int i = 0; i < ints.length; i++)
1516 <            assertEquals(ints[i], q.take());
1347 <    }
1348 <
1349 <    /**
1350 <     * toArray(null) throws NPE
1351 <     */
1352 <    public void testToArray_BadArg() {
1353 <        try {
1354 <            LinkedBlockingDeque q = populatedDeque(SIZE);
1355 <            Object o[] = q.toArray(null);
1356 <            shouldThrow();
1357 <        } catch (NullPointerException success) {}
1516 >            assertSame(ints[i], q.remove());
1517      }
1518  
1519      /**
1520 <     * toArray with incompatible array type throws CCE
1520 >     * toArray(incompatible array type) throws ArrayStoreException
1521       */
1522      public void testToArray1_BadArg() {
1523 +        LinkedBlockingDeque q = populatedDeque(SIZE);
1524          try {
1525 <            LinkedBlockingDeque q = populatedDeque(SIZE);
1366 <            Object o[] = q.toArray(new String[10] );
1525 >            q.toArray(new String[10]);
1526              shouldThrow();
1527          } catch (ArrayStoreException success) {}
1528      }
1529  
1371
1530      /**
1531       * iterator iterates through all elements
1532       */
1533      public void testIterator() throws InterruptedException {
1534          LinkedBlockingDeque q = populatedDeque(SIZE);
1535          Iterator it = q.iterator();
1536 <        while (it.hasNext()) {
1536 >        int i;
1537 >        for (i = 0; it.hasNext(); i++)
1538 >            assertTrue(q.contains(it.next()));
1539 >        assertEquals(i, SIZE);
1540 >        assertIteratorExhausted(it);
1541 >
1542 >        it = q.iterator();
1543 >        for (i = 0; it.hasNext(); i++)
1544              assertEquals(it.next(), q.take());
1545 <        }
1545 >        assertEquals(i, SIZE);
1546 >        assertIteratorExhausted(it);
1547 >    }
1548 >
1549 >    /**
1550 >     * iterator of empty collection has no elements
1551 >     */
1552 >    public void testEmptyIterator() {
1553 >        Deque c = new LinkedBlockingDeque();
1554 >        assertIteratorExhausted(c.iterator());
1555 >        assertIteratorExhausted(c.descendingIterator());
1556      }
1557  
1558      /**
1559       * iterator.remove removes current element
1560       */
1561 <    public void testIteratorRemove () {
1561 >    public void testIteratorRemove() {
1562          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1563          q.add(two);
1564          q.add(one);
# Line 1394 | Line 1569 | public class LinkedBlockingDequeTest ext
1569          it.remove();
1570  
1571          it = q.iterator();
1572 <        assertEquals(it.next(), one);
1573 <        assertEquals(it.next(), three);
1572 >        assertSame(it.next(), one);
1573 >        assertSame(it.next(), three);
1574          assertFalse(it.hasNext());
1575      }
1576  
1402
1577      /**
1578       * iterator ordering is FIFO
1579       */
# Line 1411 | Line 1585 | public class LinkedBlockingDequeTest ext
1585          assertEquals(0, q.remainingCapacity());
1586          int k = 0;
1587          for (Iterator it = q.iterator(); it.hasNext();) {
1588 <            int i = ((Integer)(it.next())).intValue();
1415 <            assertEquals(++k, i);
1588 >            assertEquals(++k, it.next());
1589          }
1590          assertEquals(3, k);
1591      }
# Line 1420 | Line 1593 | public class LinkedBlockingDequeTest ext
1593      /**
1594       * Modifications do not cause iterators to fail
1595       */
1596 <    public void testWeaklyConsistentIteration () {
1596 >    public void testWeaklyConsistentIteration() {
1597          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1598          q.add(one);
1599          q.add(two);
# Line 1432 | Line 1605 | public class LinkedBlockingDequeTest ext
1605          assertEquals(0, q.size());
1606      }
1607  
1435
1608      /**
1609 <     *  Descending iterator iterates through all elements
1609 >     * Descending iterator iterates through all elements
1610       */
1611      public void testDescendingIterator() {
1612          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 1453 | Line 1625 | public class LinkedBlockingDequeTest ext
1625      }
1626  
1627      /**
1628 <     *  Descending iterator ordering is reverse FIFO
1628 >     * Descending iterator ordering is reverse FIFO
1629       */
1630      public void testDescendingIteratorOrdering() {
1631          final LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1463 | Line 1635 | public class LinkedBlockingDequeTest ext
1635              q.add(new Integer(1));
1636              int k = 0;
1637              for (Iterator it = q.descendingIterator(); it.hasNext();) {
1638 <                int i = ((Integer)(it.next())).intValue();
1467 <                assertEquals(++k, i);
1638 >                assertEquals(++k, it.next());
1639              }
1640  
1641              assertEquals(3, k);
# Line 1477 | Line 1648 | public class LinkedBlockingDequeTest ext
1648      /**
1649       * descendingIterator.remove removes current element
1650       */
1651 <    public void testDescendingIteratorRemove () {
1651 >    public void testDescendingIteratorRemove() {
1652          final LinkedBlockingDeque q = new LinkedBlockingDeque();
1653          for (int iters = 0; iters < 100; ++iters) {
1654              q.add(new Integer(3));
# Line 1496 | Line 1667 | public class LinkedBlockingDequeTest ext
1667          }
1668      }
1669  
1499
1670      /**
1671       * toString contains toStrings of elements
1672       */
# Line 1504 | Line 1674 | public class LinkedBlockingDequeTest ext
1674          LinkedBlockingDeque q = populatedDeque(SIZE);
1675          String s = q.toString();
1676          for (int i = 0; i < SIZE; ++i) {
1677 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1677 >            assertTrue(s.contains(String.valueOf(i)));
1678          }
1679      }
1680  
1511
1681      /**
1682       * offer transfers elements across Executor tasks
1683       */
# Line 1516 | Line 1685 | public class LinkedBlockingDequeTest ext
1685          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1686          q.add(one);
1687          q.add(two);
1688 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1689 <        executor.execute(new CheckedRunnable() {
1690 <            public void realRun() throws InterruptedException {
1691 <                threadAssertFalse(q.offer(three));
1692 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1693 <                threadAssertEquals(0, q.remainingCapacity());
1694 <            }});
1695 <
1696 <        executor.execute(new CheckedRunnable() {
1697 <            public void realRun() throws InterruptedException {
1698 <                Thread.sleep(SMALL_DELAY_MS);
1699 <                threadAssertEquals(one, q.take());
1700 <            }});
1701 <
1702 <        joinPool(executor);
1688 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1689 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1690 >        try (PoolCleaner cleaner = cleaner(executor)) {
1691 >            executor.execute(new CheckedRunnable() {
1692 >                public void realRun() throws InterruptedException {
1693 >                    assertFalse(q.offer(three));
1694 >                    threadsStarted.await();
1695 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1696 >                    assertEquals(0, q.remainingCapacity());
1697 >                }});
1698 >
1699 >            executor.execute(new CheckedRunnable() {
1700 >                public void realRun() throws InterruptedException {
1701 >                    threadsStarted.await();
1702 >                    assertSame(one, q.take());
1703 >                }});
1704 >        }
1705      }
1706  
1707      /**
1708 <     * poll retrieves elements across Executor threads
1708 >     * timed poll retrieves elements across Executor threads
1709       */
1710      public void testPollInExecutor() {
1711          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1712 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1713 <        executor.execute(new CheckedRunnable() {
1714 <            public void realRun() throws InterruptedException {
1715 <                threadAssertNull(q.poll());
1716 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1717 <                threadAssertTrue(q.isEmpty());
1718 <            }});
1719 <
1720 <        executor.execute(new CheckedRunnable() {
1721 <            public void realRun() throws InterruptedException {
1722 <                Thread.sleep(SMALL_DELAY_MS);
1723 <                q.put(one);
1724 <            }});
1725 <
1726 <        joinPool(executor);
1712 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1713 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1714 >        try (PoolCleaner cleaner = cleaner(executor)) {
1715 >            executor.execute(new CheckedRunnable() {
1716 >                public void realRun() throws InterruptedException {
1717 >                    assertNull(q.poll());
1718 >                    threadsStarted.await();
1719 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1720 >                    checkEmpty(q);
1721 >                }});
1722 >
1723 >            executor.execute(new CheckedRunnable() {
1724 >                public void realRun() throws InterruptedException {
1725 >                    threadsStarted.await();
1726 >                    q.put(one);
1727 >                }});
1728 >        }
1729      }
1730  
1731      /**
1732       * A deserialized serialized deque has same elements in same order
1733       */
1734      public void testSerialization() throws Exception {
1735 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1735 >        Queue x = populatedDeque(SIZE);
1736 >        Queue y = serialClone(x);
1737  
1738 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1739 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1740 <        out.writeObject(q);
1741 <        out.close();
1742 <
1743 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1744 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1745 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1746 <        assertEquals(q.size(), r.size());
1573 <        while (!q.isEmpty())
1574 <            assertEquals(q.remove(), r.remove());
1575 <    }
1576 <
1577 <    /**
1578 <     * drainTo(null) throws NPE
1579 <     */
1580 <    public void testDrainToNull() {
1581 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1582 <        try {
1583 <            q.drainTo(null);
1584 <            shouldThrow();
1585 <        } catch (NullPointerException success) {}
1586 <    }
1587 <
1588 <    /**
1589 <     * drainTo(this) throws IAE
1590 <     */
1591 <    public void testDrainToSelf() {
1592 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1593 <        try {
1594 <            q.drainTo(q);
1595 <            shouldThrow();
1596 <        } catch (IllegalArgumentException success) {}
1738 >        assertNotSame(y, x);
1739 >        assertEquals(x.size(), y.size());
1740 >        assertEquals(x.toString(), y.toString());
1741 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1742 >        while (!x.isEmpty()) {
1743 >            assertFalse(y.isEmpty());
1744 >            assertEquals(x.remove(), y.remove());
1745 >        }
1746 >        assertTrue(y.isEmpty());
1747      }
1748  
1749      /**
# Line 1603 | Line 1753 | public class LinkedBlockingDequeTest ext
1753          LinkedBlockingDeque q = populatedDeque(SIZE);
1754          ArrayList l = new ArrayList();
1755          q.drainTo(l);
1756 <        assertEquals(q.size(), 0);
1757 <        assertEquals(l.size(), SIZE);
1756 >        assertEquals(0, q.size());
1757 >        assertEquals(SIZE, l.size());
1758          for (int i = 0; i < SIZE; ++i)
1759              assertEquals(l.get(i), new Integer(i));
1760          q.add(zero);
# Line 1614 | Line 1764 | public class LinkedBlockingDequeTest ext
1764          assertTrue(q.contains(one));
1765          l.clear();
1766          q.drainTo(l);
1767 <        assertEquals(q.size(), 0);
1768 <        assertEquals(l.size(), 2);
1767 >        assertEquals(0, q.size());
1768 >        assertEquals(2, l.size());
1769          for (int i = 0; i < 2; ++i)
1770              assertEquals(l.get(i), new Integer(i));
1771      }
# Line 1627 | Line 1777 | public class LinkedBlockingDequeTest ext
1777          final LinkedBlockingDeque q = populatedDeque(SIZE);
1778          Thread t = new Thread(new CheckedRunnable() {
1779              public void realRun() throws InterruptedException {
1780 <                q.put(new Integer(SIZE+1));
1780 >                q.put(new Integer(SIZE + 1));
1781              }});
1782  
1783          t.start();
# Line 1641 | Line 1791 | public class LinkedBlockingDequeTest ext
1791      }
1792  
1793      /**
1794 <     * drainTo(null, n) throws NPE
1645 <     */
1646 <    public void testDrainToNullN() {
1647 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1648 <        try {
1649 <            q.drainTo(null, 0);
1650 <            shouldThrow();
1651 <        } catch (NullPointerException success) {}
1652 <    }
1653 <
1654 <    /**
1655 <     * drainTo(this, n) throws IAE
1656 <     */
1657 <    public void testDrainToSelfN() {
1658 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1659 <        try {
1660 <            q.drainTo(q, 0);
1661 <            shouldThrow();
1662 <        } catch (IllegalArgumentException success) {}
1663 <    }
1664 <
1665 <    /**
1666 <     * drainTo(c, n) empties first max {n, size} elements of deque into c
1794 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
1795       */
1796      public void testDrainToN() {
1797          LinkedBlockingDeque q = new LinkedBlockingDeque();
# Line 1672 | Line 1800 | public class LinkedBlockingDequeTest ext
1800                  assertTrue(q.offer(new Integer(j)));
1801              ArrayList l = new ArrayList();
1802              q.drainTo(l, i);
1803 <            int k = (i < SIZE)? i : SIZE;
1804 <            assertEquals(l.size(), k);
1805 <            assertEquals(q.size(), SIZE-k);
1803 >            int k = (i < SIZE) ? i : SIZE;
1804 >            assertEquals(k, l.size());
1805 >            assertEquals(SIZE - k, q.size());
1806              for (int j = 0; j < k; ++j)
1807                  assertEquals(l.get(j), new Integer(j));
1808 <            while (q.poll() != null) ;
1808 >            do {} while (q.poll() != null);
1809 >        }
1810 >    }
1811 >
1812 >    /**
1813 >     * remove(null), contains(null) always return false
1814 >     */
1815 >    public void testNeverContainsNull() {
1816 >        Deque<?>[] qs = {
1817 >            new LinkedBlockingDeque<Object>(),
1818 >            populatedDeque(2),
1819 >        };
1820 >
1821 >        for (Deque<?> q : qs) {
1822 >            assertFalse(q.contains(null));
1823 >            assertFalse(q.remove(null));
1824 >            assertFalse(q.removeFirstOccurrence(null));
1825 >            assertFalse(q.removeLastOccurrence(null));
1826          }
1827      }
1828  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines