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.39 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.76 by jsr166, Sun May 14 00:48:20 2017 UTC

# Line 4 | Line 4
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  
# Line 20 | Line 32 | public class LinkedBlockingDequeTest ext
32  
33      public static class Bounded extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new LinkedBlockingDeque(20);
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 +        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());
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.
58 >     * Returns a new deque of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingDeque<Integer> populatedDeque(int n) {
61 >    private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62          LinkedBlockingDeque<Integer> q =
63              new LinkedBlockingDeque<Integer>(n);
64          assertTrue(q.isEmpty());
# Line 47 | Line 67 | public class LinkedBlockingDequeTest ext
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 70 | 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 80 | 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 {
87            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 124 | Line 157 | public class LinkedBlockingDequeTest ext
157       */
158      public void testPollLast() {
159          LinkedBlockingDeque q = populatedDeque(SIZE);
160 <        for (int i = SIZE-1; i >= 0; --i) {
160 >        for (int i = SIZE - 1; i >= 0; --i) {
161              assertEquals(i, q.pollLast());
162          }
163          assertNull(q.pollLast());
# Line 163 | Line 196 | public class LinkedBlockingDequeTest ext
196       */
197      public void testPeekLast() {
198          LinkedBlockingDeque q = populatedDeque(SIZE);
199 <        for (int i = SIZE-1; i >= 0; --i) {
199 >        for (int i = SIZE - 1; i >= 0; --i) {
200              assertEquals(i, q.peekLast());
201              assertEquals(i, q.pollLast());
202              assertTrue(q.peekLast() == null ||
# Line 193 | Line 226 | public class LinkedBlockingDequeTest ext
226       */
227      public void testLastElement() {
228          LinkedBlockingDeque q = populatedDeque(SIZE);
229 <        for (int i = SIZE-1; i >= 0; --i) {
229 >        for (int i = SIZE - 1; i >= 0; --i) {
230              assertEquals(i, q.getLast());
231              assertEquals(i, q.pollLast());
232          }
# Line 253 | 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 268 | 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 308 | 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];
336 <            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];
347 <            for (int i = 0; i < SIZE-1; ++i)
348 <                ints[i] = new Integer(i);
349 <            LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints));
384 >            new LinkedBlockingDeque(elements);
385              shouldThrow();
386          } catch (NullPointerException success) {}
387      }
# Line 357 | 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 382 | 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      /**
399     * offer(null) throws NPE
400     */
401    public void testOfferNull() {
402        try {
403            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
404            q.offer(null);
405            shouldThrow();
406        } catch (NullPointerException success) {}
407    }
408
409    /**
410     * add(null) throws NPE
411     */
412    public void testAddNull() {
413        try {
414            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
415            q.add(null);
416            shouldThrow();
417        } catch (NullPointerException success) {}
418    }
419
420    /**
434       * push(null) throws NPE
435       */
436      public void testPushNull() {
437 +        LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438          try {
425            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
439              q.push(null);
440              shouldThrow();
441          } catch (NullPointerException success) {}
# Line 432 | 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 {
436            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
437            for (int i = 0; i < SIZE; ++i) {
438                Integer I = new Integer(i);
439                q.push(I);
440                assertEquals(I, q.peek());
441            }
442            assertEquals(0, q.remainingCapacity());
456              q.push(new Integer(SIZE));
457              shouldThrow();
458          } catch (IllegalStateException success) {}
# Line 482 | 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 {
486            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
487            for (int i = 0; i < SIZE; ++i) {
488                assertTrue(q.add(new Integer(i)));
489            }
490            assertEquals(0, q.remainingCapacity());
503              q.add(new Integer(SIZE));
504              shouldThrow();
505          } catch (IllegalStateException success) {}
506      }
507  
508      /**
497     * addAll(null) throws NPE
498     */
499    public void testAddAll1() {
500        try {
501            LinkedBlockingDeque q = new LinkedBlockingDeque(1);
502            q.addAll(null);
503            shouldThrow();
504        } catch (NullPointerException success) {}
505    }
506
507    /**
509       * addAll(this) throws IAE
510       */
511      public void testAddAllSelf() {
512 +        LinkedBlockingDeque q = populatedDeque(SIZE);
513          try {
512            LinkedBlockingDeque q = populatedDeque(SIZE);
514              q.addAll(q);
515              shouldThrow();
516          } catch (IllegalArgumentException success) {}
517      }
518  
519      /**
519     * addAll of a collection with null elements throws NPE
520     */
521    public void testAddAll2() {
522        try {
523            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
524            Integer[] ints = new Integer[SIZE];
525            q.addAll(Arrays.asList(ints));
526            shouldThrow();
527        } catch (NullPointerException success) {}
528    }
529
530    /**
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);
537 <            Integer[] ints = new Integer[SIZE];
538 <            for (int i = 0; i < SIZE-1; ++i)
539 <                ints[i] = new Integer(i);
540 <            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);
551 <            Integer[] ints = new Integer[SIZE];
552 <            for (int i = 0; i < SIZE; ++i)
553 <                ints[i] = new Integer(i);
554 <            q.addAll(Arrays.asList(ints));
545 >            q.addAll(elements);
546              shouldThrow();
547          } catch (IllegalStateException success) {}
548      }
# Line 572 | Line 563 | public class LinkedBlockingDequeTest ext
563      }
564  
565      /**
575     * put(null) throws NPE
576     */
577    public void testPutNull() throws InterruptedException {
578        try {
579            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
580            q.put(null);
581            shouldThrow();
582        } catch (NullPointerException success) {}
583    }
584
585    /**
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 624 | Line 604 | public class LinkedBlockingDequeTest ext
604              }});
605  
606          await(pleaseInterrupt);
607 <        assertThreadStaysAlive(t);
607 >        assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609          awaitTermination(t);
610          assertEquals(SIZE, q.size());
# Line 655 | Line 635 | public class LinkedBlockingDequeTest ext
635              }});
636  
637          await(pleaseTake);
638 <        assertEquals(q.remainingCapacity(), 0);
638 >        assertEquals(0, q.remainingCapacity());
639          assertEquals(0, q.take());
640  
641          await(pleaseInterrupt);
642 <        assertThreadStaysAlive(t);
642 >        assertThreadBlocks(t, Thread.State.WAITING);
643          t.interrupt();
644          awaitTermination(t);
645 <        assertEquals(q.remainingCapacity(), 0);
645 >        assertEquals(0, q.remainingCapacity());
646      }
647  
648      /**
# Line 686 | Line 666 | public class LinkedBlockingDequeTest ext
666              }});
667  
668          await(pleaseInterrupt);
669 <        assertThreadStaysAlive(t);
669 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
670          t.interrupt();
671          awaitTermination(t);
672      }
# Line 709 | Line 689 | public class LinkedBlockingDequeTest ext
689          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
690          Thread t = newStartedThread(new CheckedRunnable() {
691              public void realRun() throws InterruptedException {
692 <                for (int i = 0; i < SIZE; ++i) {
713 <                    assertEquals(i, q.take());
714 <                }
692 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
693  
694                  Thread.currentThread().interrupt();
695                  try {
# Line 729 | Line 707 | public class LinkedBlockingDequeTest ext
707              }});
708  
709          await(pleaseInterrupt);
710 <        assertThreadStaysAlive(t);
710 >        assertThreadBlocks(t, Thread.State.WAITING);
711          t.interrupt();
712          awaitTermination(t);
713      }
# Line 778 | Line 756 | public class LinkedBlockingDequeTest ext
756       */
757      public void testInterruptedTimedPoll() throws InterruptedException {
758          final BlockingQueue<Integer> q = populatedDeque(SIZE);
759 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
759 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
760          Thread t = newStartedThread(new CheckedRunnable() {
761              public void realRun() throws InterruptedException {
762 +                long startTime = System.nanoTime();
763                  for (int i = 0; i < SIZE; ++i) {
785                    long t0 = System.nanoTime();
764                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
787                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
765                  }
766 <                long t0 = System.nanoTime();
767 <                aboutToWait.countDown();
766 >
767 >                pleaseInterrupt.countDown();
768                  try {
769 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
769 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
770                      shouldThrow();
771 <                } catch (InterruptedException success) {
772 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
773 <                }
771 >                } catch (InterruptedException success) {}
772 >                assertFalse(Thread.interrupted());
773 >
774 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
775              }});
776  
777 <        aboutToWait.await();
778 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
777 >        await(pleaseInterrupt);
778 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
779          t.interrupt();
780 <        awaitTermination(t, MEDIUM_DELAY_MS);
780 >        awaitTermination(t);
781          checkEmpty(q);
782      }
783  
# Line 807 | Line 785 | public class LinkedBlockingDequeTest ext
785       * putFirst(null) throws NPE
786       */
787      public void testPutFirstNull() throws InterruptedException {
788 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
789          try {
811            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
790              q.putFirst(null);
791              shouldThrow();
792          } catch (NullPointerException success) {}
# Line 820 | Line 798 | public class LinkedBlockingDequeTest ext
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));
801 >            Integer x = new Integer(i);
802 >            q.putFirst(x);
803 >            assertTrue(q.contains(x));
804          }
805          assertEquals(0, q.remainingCapacity());
806      }
# Line 856 | Line 834 | public class LinkedBlockingDequeTest ext
834              }});
835  
836          await(pleaseInterrupt);
837 <        assertThreadStaysAlive(t);
837 >        assertThreadBlocks(t, Thread.State.WAITING);
838          t.interrupt();
839          awaitTermination(t);
840          assertEquals(SIZE, q.size());
# Line 887 | Line 865 | public class LinkedBlockingDequeTest ext
865              }});
866  
867          await(pleaseTake);
868 <        assertEquals(q.remainingCapacity(), 0);
868 >        assertEquals(0, q.remainingCapacity());
869          assertEquals(capacity - 1, q.take());
870  
871          await(pleaseInterrupt);
872 <        assertThreadStaysAlive(t);
872 >        assertThreadBlocks(t, Thread.State.WAITING);
873          t.interrupt();
874          awaitTermination(t);
875 <        assertEquals(q.remainingCapacity(), 0);
875 >        assertEquals(0, q.remainingCapacity());
876      }
877  
878      /**
# Line 918 | Line 896 | public class LinkedBlockingDequeTest ext
896              }});
897  
898          await(pleaseInterrupt);
899 <        assertThreadStaysAlive(t);
899 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
900          t.interrupt();
901          awaitTermination(t);
902      }
# Line 950 | Line 928 | public class LinkedBlockingDequeTest ext
928              }});
929  
930          await(threadStarted);
931 <        assertThreadStaysAlive(t);
931 >        assertThreadBlocks(t, Thread.State.WAITING);
932          t.interrupt();
933          awaitTermination(t);
934      }
# Line 991 | Line 969 | public class LinkedBlockingDequeTest ext
969              }});
970  
971          await(threadStarted);
972 <        assertThreadStaysAlive(t);
972 >        assertThreadBlocks(t, Thread.State.WAITING);
973          t.interrupt();
974          awaitTermination(t);
975      }
# Line 1023 | Line 1001 | public class LinkedBlockingDequeTest ext
1001          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1002          Thread t = newStartedThread(new CheckedRunnable() {
1003              public void realRun() throws InterruptedException {
1004 <                for (int i = 0; i < SIZE; ++i) {
1027 <                    assertEquals(i, q.takeFirst());
1028 <                }
1004 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1005  
1006                  Thread.currentThread().interrupt();
1007                  try {
# Line 1043 | Line 1019 | public class LinkedBlockingDequeTest ext
1019              }});
1020  
1021          await(pleaseInterrupt);
1022 <        assertThreadStaysAlive(t);
1022 >        assertThreadBlocks(t, Thread.State.WAITING);
1023          t.interrupt();
1024          awaitTermination(t);
1025      }
# Line 1080 | Line 1056 | public class LinkedBlockingDequeTest ext
1056       * returning timeout status
1057       */
1058      public void testInterruptedTimedPollFirst() throws InterruptedException {
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, 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(SMALL_DELAY_MS, MILLISECONDS);
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          await(pleaseInterrupt);
1086 <        assertThreadStaysAlive(t);
1086 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1087          t.interrupt();
1088          awaitTermination(t);
1089      }
# Line 1145 | Line 1124 | public class LinkedBlockingDequeTest ext
1124          assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1125          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1126          barrier.await();
1127 <        assertThreadStaysAlive(t);
1127 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1128          t.interrupt();
1129          awaitTermination(t);
1130      }
# Line 1154 | Line 1133 | public class LinkedBlockingDequeTest ext
1133       * putLast(null) throws NPE
1134       */
1135      public void testPutLastNull() throws InterruptedException {
1136 +        LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1137          try {
1158            LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1138              q.putLast(null);
1139              shouldThrow();
1140          } catch (NullPointerException success) {}
# Line 1167 | Line 1146 | public class LinkedBlockingDequeTest ext
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));
1149 >            Integer x = new Integer(i);
1150 >            q.putLast(x);
1151 >            assertTrue(q.contains(x));
1152          }
1153          assertEquals(0, q.remainingCapacity());
1154      }
# Line 1203 | Line 1182 | public class LinkedBlockingDequeTest ext
1182              }});
1183  
1184          await(pleaseInterrupt);
1185 <        assertThreadStaysAlive(t);
1185 >        assertThreadBlocks(t, Thread.State.WAITING);
1186          t.interrupt();
1187          awaitTermination(t);
1188          assertEquals(SIZE, q.size());
# Line 1234 | Line 1213 | public class LinkedBlockingDequeTest ext
1213              }});
1214  
1215          await(pleaseTake);
1216 <        assertEquals(q.remainingCapacity(), 0);
1216 >        assertEquals(0, q.remainingCapacity());
1217          assertEquals(0, q.take());
1218  
1219          await(pleaseInterrupt);
1220 <        assertThreadStaysAlive(t);
1220 >        assertThreadBlocks(t, Thread.State.WAITING);
1221          t.interrupt();
1222          awaitTermination(t);
1223 <        assertEquals(q.remainingCapacity(), 0);
1223 >        assertEquals(0, q.remainingCapacity());
1224      }
1225  
1226      /**
# Line 1265 | Line 1244 | public class LinkedBlockingDequeTest ext
1244              }});
1245  
1246          await(pleaseInterrupt);
1247 <        assertThreadStaysAlive(t);
1247 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1248          t.interrupt();
1249          awaitTermination(t);
1250      }
# Line 1276 | 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, q.takeLast());
1258 >            assertEquals(SIZE - i - 1, q.takeLast());
1259          }
1260      }
1261  
# Line 1288 | Line 1267 | public class LinkedBlockingDequeTest ext
1267          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1268          Thread t = newStartedThread(new CheckedRunnable() {
1269              public void realRun() throws InterruptedException {
1270 <                for (int i = 0; i < SIZE; ++i) {
1271 <                    assertEquals(SIZE-i-1, q.takeLast());
1293 <                }
1270 >                for (int i = 0; i < SIZE; i++)
1271 >                    assertEquals(SIZE - i - 1, q.takeLast());
1272  
1273                  Thread.currentThread().interrupt();
1274                  try {
# Line 1308 | Line 1286 | public class LinkedBlockingDequeTest ext
1286              }});
1287  
1288          await(pleaseInterrupt);
1289 <        assertThreadStaysAlive(t);
1289 >        assertThreadBlocks(t, Thread.State.WAITING);
1290          t.interrupt();
1291          awaitTermination(t);
1292      }
# Line 1319 | Line 1297 | public class LinkedBlockingDequeTest ext
1297      public void testTimedPollLast0() throws InterruptedException {
1298          LinkedBlockingDeque q = populatedDeque(SIZE);
1299          for (int i = 0; i < SIZE; ++i) {
1300 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1300 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1301          }
1302          assertNull(q.pollLast(0, MILLISECONDS));
1303      }
# Line 1331 | Line 1309 | public class LinkedBlockingDequeTest ext
1309          LinkedBlockingDeque q = populatedDeque(SIZE);
1310          for (int i = 0; i < SIZE; ++i) {
1311              long startTime = System.nanoTime();
1312 <            assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1312 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1313              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1314          }
1315          long startTime = System.nanoTime();
# Line 1345 | Line 1323 | public class LinkedBlockingDequeTest ext
1323       * returning timeout status
1324       */
1325      public void testInterruptedTimedPollLast() throws InterruptedException {
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, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1332 >                    assertEquals(SIZE - i - 1,
1333 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1334                  }
1335  
1336                  Thread.currentThread().interrupt();
# Line 1366 | Line 1346 | public class LinkedBlockingDequeTest ext
1346                      shouldThrow();
1347                  } catch (InterruptedException success) {}
1348                  assertFalse(Thread.interrupted());
1349 +
1350 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1351              }});
1352  
1353          await(pleaseInterrupt);
1354 <        assertThreadStaysAlive(t);
1354 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1355          t.interrupt();
1356          awaitTermination(t);
1357 +        checkEmpty(q);
1358      }
1359  
1360      /**
# Line 1404 | Line 1387 | public class LinkedBlockingDequeTest ext
1387                      shouldThrow();
1388                  } catch (InterruptedException success) {}
1389                  assertFalse(Thread.interrupted());
1390 +
1391 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1392              }});
1393  
1394          barrier.await();
# Line 1412 | Line 1397 | public class LinkedBlockingDequeTest ext
1397          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1398  
1399          barrier.await();
1400 <        assertThreadStaysAlive(t);
1400 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1401          t.interrupt();
1402          awaitTermination(t);
1403      }
# Line 1433 | Line 1418 | public class LinkedBlockingDequeTest ext
1418      }
1419  
1420      /**
1436     * remove(x) removes x and returns true if present
1437     */
1438    public void testRemoveElement() {
1439        LinkedBlockingDeque q = populatedDeque(SIZE);
1440        for (int i = 1; i < SIZE; i+=2) {
1441            assertTrue(q.contains(i));
1442            assertTrue(q.remove(i));
1443            assertFalse(q.contains(i));
1444            assertTrue(q.contains(i-1));
1445        }
1446        for (int i = 0; i < SIZE; i+=2) {
1447            assertTrue(q.contains(i));
1448            assertTrue(q.remove(i));
1449            assertFalse(q.contains(i));
1450            assertFalse(q.remove(i+1));
1451            assertFalse(q.contains(i+1));
1452        }
1453        assertTrue(q.isEmpty());
1454    }
1455
1456    /**
1421       * contains(x) reports true when elements added but not yet removed
1422       */
1423      public void testContains() {
# Line 1509 | 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 1522 | 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      }
# Line 1533 | Line 1497 | public class LinkedBlockingDequeTest ext
1497      /**
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++)
# Line 1553 | Line 1517 | public class LinkedBlockingDequeTest ext
1517      }
1518  
1519      /**
1556     * toArray(null) throws NullPointerException
1557     */
1558    public void testToArray_NullArg() {
1559        LinkedBlockingDeque q = populatedDeque(SIZE);
1560        try {
1561            q.toArray(null);
1562            shouldThrow();
1563        } catch (NullPointerException success) {}
1564    }
1565
1566    /**
1520       * toArray(incompatible array type) throws ArrayStoreException
1521       */
1522      public void testToArray1_BadArg() {
# Line 1580 | Line 1533 | public class LinkedBlockingDequeTest ext
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      /**
# Line 1715 | Line 1685 | public class LinkedBlockingDequeTest ext
1685          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1686          q.add(one);
1687          q.add(two);
1718        ExecutorService executor = Executors.newFixedThreadPool(2);
1688          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1689 <        executor.execute(new CheckedRunnable() {
1690 <            public void realRun() throws InterruptedException {
1691 <                assertFalse(q.offer(three));
1692 <                threadsStarted.await();
1693 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1694 <                assertEquals(0, q.remainingCapacity());
1695 <            }});
1696 <
1697 <        executor.execute(new CheckedRunnable() {
1698 <            public void realRun() throws InterruptedException {
1699 <                threadsStarted.await();
1700 <                assertSame(one, q.take());
1701 <            }});
1702 <
1703 <        joinPool(executor);
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      /**
# Line 1740 | Line 1710 | public class LinkedBlockingDequeTest ext
1710      public void testPollInExecutor() {
1711          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1712          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1713 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1714 <        executor.execute(new CheckedRunnable() {
1715 <            public void realRun() throws InterruptedException {
1716 <                assertNull(q.poll());
1717 <                threadsStarted.await();
1718 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1719 <                checkEmpty(q);
1720 <            }});
1721 <
1722 <        executor.execute(new CheckedRunnable() {
1723 <            public void realRun() throws InterruptedException {
1724 <                threadsStarted.await();
1725 <                q.put(one);
1726 <            }});
1727 <
1728 <        joinPool(executor);
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());
1776 <        while (!q.isEmpty())
1777 <            assertEquals(q.remove(), r.remove());
1778 <    }
1779 <
1780 <    /**
1781 <     * drainTo(null) throws NPE
1782 <     */
1783 <    public void testDrainToNull() {
1784 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1785 <        try {
1786 <            q.drainTo(null);
1787 <            shouldThrow();
1788 <        } catch (NullPointerException success) {}
1789 <    }
1790 <
1791 <    /**
1792 <     * drainTo(this) throws IAE
1793 <     */
1794 <    public void testDrainToSelf() {
1795 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1796 <        try {
1797 <            q.drainTo(q);
1798 <            shouldThrow();
1799 <        } 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 1806 | 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 1817 | 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 1830 | 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 1844 | Line 1791 | public class LinkedBlockingDequeTest ext
1791      }
1792  
1793      /**
1847     * drainTo(null, n) throws NPE
1848     */
1849    public void testDrainToNullN() {
1850        LinkedBlockingDeque q = populatedDeque(SIZE);
1851        try {
1852            q.drainTo(null, 0);
1853            shouldThrow();
1854        } catch (NullPointerException success) {}
1855    }
1856
1857    /**
1858     * drainTo(this, n) throws IAE
1859     */
1860    public void testDrainToSelfN() {
1861        LinkedBlockingDeque q = populatedDeque(SIZE);
1862        try {
1863            q.drainTo(q, 0);
1864            shouldThrow();
1865        } catch (IllegalArgumentException success) {}
1866    }
1867
1868    /**
1794       * drainTo(c, n) empties first min(n, size) elements of queue into c
1795       */
1796      public void testDrainToN() {
# Line 1876 | Line 1801 | public class LinkedBlockingDequeTest ext
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);
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