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.49 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.85 by jsr166, Thu Sep 5 20:54:24 2019 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
8 < import java.util.Arrays;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
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;
# Line 17 | Line 19 | import java.util.concurrent.CountDownLat
19   import java.util.concurrent.Executors;
20   import java.util.concurrent.ExecutorService;
21   import java.util.concurrent.LinkedBlockingDeque;
22 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingDequeTest extends JSR166TestCase {
26  
# Line 34 | Line 37 | public class LinkedBlockingDequeTest ext
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       * Returns a new deque of given size containing consecutive
59 <     * Integers 0 ... n.
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 56 | 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 79 | 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 144 | 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 183 | 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 213 | 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 273 | 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 288 | 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 364 | Line 377 | public class LinkedBlockingDequeTest ext
377       */
378      public void testConstructor5() {
379          Integer[] ints = new Integer[SIZE];
380 <        for (int i = 0; i < SIZE-1; ++i)
380 >        for (int i = 0; i < SIZE - 1; ++i)
381              ints[i] = i;
382          Collection<Integer> elements = Arrays.asList(ints);
383          try {
# Line 404 | 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  
# Line 421 | Line 434 | public class LinkedBlockingDequeTest ext
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) {}
442      }
443  
444      /**
445 <     * push succeeds if not full; throws ISE if full
445 >     * push succeeds if not full; throws IllegalStateException 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 479 | Line 492 | public class LinkedBlockingDequeTest ext
492      }
493  
494      /**
495 <     * add succeeds if not full; throws ISE if full
495 >     * add succeeds if not full; throws IllegalStateException if full
496       */
497      public void testAdd() {
498          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
# Line 493 | Line 506 | public class LinkedBlockingDequeTest ext
506      }
507  
508      /**
509 <     * addAll(this) throws IAE
509 >     * addAll(this) throws IllegalArgumentException
510       */
511      public void testAddAllSelf() {
512          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 510 | Line 523 | public class LinkedBlockingDequeTest ext
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)
526 >        for (int i = 0; i < SIZE - 1; ++i)
527              ints[i] = new Integer(i);
528          Collection<Integer> elements = Arrays.asList(ints);
529          try {
# Line 555 | Line 568 | public class LinkedBlockingDequeTest ext
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 591 | Line 604 | public class LinkedBlockingDequeTest ext
604              }});
605  
606          await(pleaseInterrupt);
607 <        assertThreadStaysAlive(t);
607 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
608          t.interrupt();
609          awaitTermination(t);
610          assertEquals(SIZE, q.size());
# Line 613 | Line 626 | public class LinkedBlockingDequeTest ext
626                  pleaseTake.countDown();
627                  q.put(86);
628  
629 +                Thread.currentThread().interrupt();
630 +                try {
631 +                    q.put(99);
632 +                    shouldThrow();
633 +                } catch (InterruptedException success) {}
634 +                assertFalse(Thread.interrupted());
635 +
636                  pleaseInterrupt.countDown();
637                  try {
638                      q.put(99);
# Line 626 | Line 646 | public class LinkedBlockingDequeTest ext
646          assertEquals(0, q.take());
647  
648          await(pleaseInterrupt);
649 <        assertThreadStaysAlive(t);
649 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
650          t.interrupt();
651          awaitTermination(t);
652          assertEquals(0, q.remainingCapacity());
# Line 635 | Line 655 | public class LinkedBlockingDequeTest ext
655      /**
656       * timed offer times out if full and elements not taken
657       */
658 <    public void testTimedOffer() throws InterruptedException {
658 >    public void testTimedOffer() {
659          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
660          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
661          Thread t = newStartedThread(new CheckedRunnable() {
# Line 643 | Line 663 | public class LinkedBlockingDequeTest ext
663                  q.put(new Object());
664                  q.put(new Object());
665                  long startTime = System.nanoTime();
666 +
667                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
668                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
669 +
670 +                Thread.currentThread().interrupt();
671 +                try {
672 +                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
673 +                    shouldThrow();
674 +                } catch (InterruptedException success) {}
675 +                assertFalse(Thread.interrupted());
676 +
677                  pleaseInterrupt.countDown();
678                  try {
679 <                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
679 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
680                      shouldThrow();
681                  } catch (InterruptedException success) {}
682 +                assertFalse(Thread.interrupted());
683              }});
684  
685          await(pleaseInterrupt);
686 <        assertThreadStaysAlive(t);
686 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
687          t.interrupt();
688          awaitTermination(t);
689      }
# Line 676 | Line 706 | public class LinkedBlockingDequeTest ext
706          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
707          Thread t = newStartedThread(new CheckedRunnable() {
708              public void realRun() throws InterruptedException {
709 <                for (int i = 0; i < SIZE; ++i) {
680 <                    assertEquals(i, q.take());
681 <                }
709 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
710  
711                  Thread.currentThread().interrupt();
712                  try {
# Line 696 | Line 724 | public class LinkedBlockingDequeTest ext
724              }});
725  
726          await(pleaseInterrupt);
727 <        assertThreadStaysAlive(t);
727 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
728          t.interrupt();
729          awaitTermination(t);
730      }
# Line 745 | Line 773 | public class LinkedBlockingDequeTest ext
773       */
774      public void testInterruptedTimedPoll() throws InterruptedException {
775          final BlockingQueue<Integer> q = populatedDeque(SIZE);
776 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
776 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
777          Thread t = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                for (int i = 0; i < SIZE; ++i) {
780 <                    long t0 = System.nanoTime();
779 >                long startTime = System.nanoTime();
780 >                for (int i = 0; i < SIZE; i++)
781                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
782 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
783 <                }
756 <                long t0 = System.nanoTime();
757 <                aboutToWait.countDown();
782 >
783 >                Thread.currentThread().interrupt();
784                  try {
785 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
785 >                    q.poll(randomTimeout(), randomTimeUnit());
786                      shouldThrow();
787 <                } catch (InterruptedException success) {
788 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
789 <                }
787 >                } catch (InterruptedException success) {}
788 >                assertFalse(Thread.interrupted());
789 >
790 >                pleaseInterrupt.countDown();
791 >                try {
792 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
793 >                    shouldThrow();
794 >                } catch (InterruptedException success) {}
795 >                assertFalse(Thread.interrupted());
796 >
797 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
798              }});
799  
800 <        aboutToWait.await();
801 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
800 >        await(pleaseInterrupt);
801 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
802          t.interrupt();
803 <        awaitTermination(t, MEDIUM_DELAY_MS);
803 >        awaitTermination(t);
804          checkEmpty(q);
805      }
806  
# Line 787 | Line 821 | public class LinkedBlockingDequeTest ext
821      public void testPutFirst() throws InterruptedException {
822          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
823          for (int i = 0; i < SIZE; ++i) {
824 <            Integer I = new Integer(i);
825 <            q.putFirst(I);
826 <            assertTrue(q.contains(I));
824 >            Integer x = new Integer(i);
825 >            q.putFirst(x);
826 >            assertTrue(q.contains(x));
827          }
828          assertEquals(0, q.remainingCapacity());
829      }
# Line 823 | Line 857 | public class LinkedBlockingDequeTest ext
857              }});
858  
859          await(pleaseInterrupt);
860 <        assertThreadStaysAlive(t);
860 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
861          t.interrupt();
862          awaitTermination(t);
863          assertEquals(SIZE, q.size());
# Line 858 | Line 892 | public class LinkedBlockingDequeTest ext
892          assertEquals(capacity - 1, q.take());
893  
894          await(pleaseInterrupt);
895 <        assertThreadStaysAlive(t);
895 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
896          t.interrupt();
897          awaitTermination(t);
898          assertEquals(0, q.remainingCapacity());
# Line 867 | Line 901 | public class LinkedBlockingDequeTest ext
901      /**
902       * timed offerFirst times out if full and elements not taken
903       */
904 <    public void testTimedOfferFirst() throws InterruptedException {
904 >    public void testTimedOfferFirst() {
905          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
906          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
907          Thread t = newStartedThread(new CheckedRunnable() {
# Line 875 | Line 909 | public class LinkedBlockingDequeTest ext
909                  q.putFirst(new Object());
910                  q.putFirst(new Object());
911                  long startTime = System.nanoTime();
912 +
913                  assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
914                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
915 +
916 +                Thread.currentThread().interrupt();
917 +                try {
918 +                    q.offerFirst(new Object(), randomTimeout(), randomTimeUnit());
919 +                    shouldThrow();
920 +                } catch (InterruptedException success) {}
921 +                assertFalse(Thread.interrupted());
922 +
923                  pleaseInterrupt.countDown();
924                  try {
925 <                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
925 >                    q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
926                      shouldThrow();
927                  } catch (InterruptedException success) {}
928 +                assertFalse(Thread.interrupted());
929 +
930 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
931              }});
932  
933          await(pleaseInterrupt);
934 <        assertThreadStaysAlive(t);
934 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
935          t.interrupt();
936          awaitTermination(t);
937      }
# Line 917 | Line 963 | public class LinkedBlockingDequeTest ext
963              }});
964  
965          await(threadStarted);
966 <        assertThreadStaysAlive(t);
966 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
967          t.interrupt();
968          awaitTermination(t);
969      }
# Line 958 | Line 1004 | public class LinkedBlockingDequeTest ext
1004              }});
1005  
1006          await(threadStarted);
1007 <        assertThreadStaysAlive(t);
1007 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1008          t.interrupt();
1009          awaitTermination(t);
1010      }
# Line 990 | Line 1036 | public class LinkedBlockingDequeTest ext
1036          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1037          Thread t = newStartedThread(new CheckedRunnable() {
1038              public void realRun() throws InterruptedException {
1039 <                for (int i = 0; i < SIZE; ++i) {
994 <                    assertEquals(i, q.takeFirst());
995 <                }
1039 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1040  
1041                  Thread.currentThread().interrupt();
1042                  try {
# Line 1010 | Line 1054 | public class LinkedBlockingDequeTest ext
1054              }});
1055  
1056          await(pleaseInterrupt);
1057 <        assertThreadStaysAlive(t);
1057 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1058          t.interrupt();
1059          awaitTermination(t);
1060      }
# Line 1047 | Line 1091 | public class LinkedBlockingDequeTest ext
1091       * returning timeout status
1092       */
1093      public void testInterruptedTimedPollFirst() throws InterruptedException {
1094 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1095          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1096          Thread t = newStartedThread(new CheckedRunnable() {
1097              public void realRun() throws InterruptedException {
1098 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1099 <                for (int i = 0; i < SIZE; ++i) {
1098 >                long startTime = System.nanoTime();
1099 >                for (int i = 0; i < SIZE; i++)
1100                      assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1056                }
1101  
1102                  Thread.currentThread().interrupt();
1103                  try {
1104 <                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1104 >                    q.pollFirst(randomTimeout(), randomTimeUnit());
1105                      shouldThrow();
1106                  } catch (InterruptedException success) {}
1107                  assertFalse(Thread.interrupted());
# Line 1068 | Line 1112 | public class LinkedBlockingDequeTest ext
1112                      shouldThrow();
1113                  } catch (InterruptedException success) {}
1114                  assertFalse(Thread.interrupted());
1115 +
1116 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1117              }});
1118  
1119          await(pleaseInterrupt);
1120 <        assertThreadStaysAlive(t);
1120 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1121          t.interrupt();
1122          awaitTermination(t);
1123      }
# Line 1095 | Line 1141 | public class LinkedBlockingDequeTest ext
1141  
1142                  Thread.currentThread().interrupt();
1143                  try {
1144 <                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1144 >                    q.pollFirst(randomTimeout(), randomTimeUnit());
1145                      shouldThrow();
1146                  } catch (InterruptedException success) {}
1147  
# Line 1104 | Line 1150 | public class LinkedBlockingDequeTest ext
1150                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1151                      shouldThrow();
1152                  } catch (InterruptedException success) {}
1153 +                assertFalse(Thread.interrupted());
1154 +
1155                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1156              }});
1157  
# Line 1112 | Line 1160 | public class LinkedBlockingDequeTest ext
1160          assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1161          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1162          barrier.await();
1163 <        assertThreadStaysAlive(t);
1163 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1164          t.interrupt();
1165          awaitTermination(t);
1166      }
# Line 1134 | Line 1182 | public class LinkedBlockingDequeTest ext
1182      public void testPutLast() throws InterruptedException {
1183          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1184          for (int i = 0; i < SIZE; ++i) {
1185 <            Integer I = new Integer(i);
1186 <            q.putLast(I);
1187 <            assertTrue(q.contains(I));
1185 >            Integer x = new Integer(i);
1186 >            q.putLast(x);
1187 >            assertTrue(q.contains(x));
1188          }
1189          assertEquals(0, q.remainingCapacity());
1190      }
# Line 1170 | Line 1218 | public class LinkedBlockingDequeTest ext
1218              }});
1219  
1220          await(pleaseInterrupt);
1221 <        assertThreadStaysAlive(t);
1221 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1222          t.interrupt();
1223          awaitTermination(t);
1224          assertEquals(SIZE, q.size());
# Line 1192 | Line 1240 | public class LinkedBlockingDequeTest ext
1240                  pleaseTake.countDown();
1241                  q.putLast(86);
1242  
1243 +                Thread.currentThread().interrupt();
1244 +                try {
1245 +                    q.putLast(99);
1246 +                    shouldThrow();
1247 +                } catch (InterruptedException success) {}
1248 +                assertFalse(Thread.interrupted());
1249 +
1250                  pleaseInterrupt.countDown();
1251                  try {
1252                      q.putLast(99);
# Line 1205 | Line 1260 | public class LinkedBlockingDequeTest ext
1260          assertEquals(0, q.take());
1261  
1262          await(pleaseInterrupt);
1263 <        assertThreadStaysAlive(t);
1263 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1264          t.interrupt();
1265          awaitTermination(t);
1266          assertEquals(0, q.remainingCapacity());
# Line 1214 | Line 1269 | public class LinkedBlockingDequeTest ext
1269      /**
1270       * timed offerLast times out if full and elements not taken
1271       */
1272 <    public void testTimedOfferLast() throws InterruptedException {
1272 >    public void testTimedOfferLast() {
1273          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1274          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1275          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1222 | Line 1277 | public class LinkedBlockingDequeTest ext
1277                  q.putLast(new Object());
1278                  q.putLast(new Object());
1279                  long startTime = System.nanoTime();
1280 +
1281                  assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1282                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1283 +
1284 +                Thread.currentThread().interrupt();
1285 +                try {
1286 +                    q.offerLast(new Object(), randomTimeout(), randomTimeUnit());
1287 +                    shouldThrow();
1288 +                } catch (InterruptedException success) {}
1289 +
1290                  pleaseInterrupt.countDown();
1291                  try {
1292 <                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1292 >                    q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1293                      shouldThrow();
1294                  } catch (InterruptedException success) {}
1295 +
1296 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1297              }});
1298  
1299          await(pleaseInterrupt);
1300 <        assertThreadStaysAlive(t);
1300 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1301          t.interrupt();
1302          awaitTermination(t);
1303      }
# Line 1243 | Line 1308 | public class LinkedBlockingDequeTest ext
1308      public void testTakeLast() throws InterruptedException {
1309          LinkedBlockingDeque q = populatedDeque(SIZE);
1310          for (int i = 0; i < SIZE; ++i) {
1311 <            assertEquals(SIZE-i-1, q.takeLast());
1311 >            assertEquals(SIZE - i - 1, q.takeLast());
1312          }
1313      }
1314  
# Line 1255 | Line 1320 | public class LinkedBlockingDequeTest ext
1320          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1321          Thread t = newStartedThread(new CheckedRunnable() {
1322              public void realRun() throws InterruptedException {
1323 <                for (int i = 0; i < SIZE; ++i) {
1324 <                    assertEquals(SIZE-i-1, q.takeLast());
1260 <                }
1323 >                for (int i = 0; i < SIZE; i++)
1324 >                    assertEquals(SIZE - i - 1, q.takeLast());
1325  
1326                  Thread.currentThread().interrupt();
1327                  try {
# Line 1275 | Line 1339 | public class LinkedBlockingDequeTest ext
1339              }});
1340  
1341          await(pleaseInterrupt);
1342 <        assertThreadStaysAlive(t);
1342 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1343          t.interrupt();
1344          awaitTermination(t);
1345      }
# Line 1286 | Line 1350 | public class LinkedBlockingDequeTest ext
1350      public void testTimedPollLast0() throws InterruptedException {
1351          LinkedBlockingDeque q = populatedDeque(SIZE);
1352          for (int i = 0; i < SIZE; ++i) {
1353 <            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1353 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1354          }
1355          assertNull(q.pollLast(0, MILLISECONDS));
1356      }
# Line 1298 | Line 1362 | public class LinkedBlockingDequeTest ext
1362          LinkedBlockingDeque q = populatedDeque(SIZE);
1363          for (int i = 0; i < SIZE; ++i) {
1364              long startTime = System.nanoTime();
1365 <            assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1365 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1366              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1367          }
1368          long startTime = System.nanoTime();
# Line 1312 | Line 1376 | public class LinkedBlockingDequeTest ext
1376       * returning timeout status
1377       */
1378      public void testInterruptedTimedPollLast() throws InterruptedException {
1379 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1380          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1381          Thread t = newStartedThread(new CheckedRunnable() {
1382              public void realRun() throws InterruptedException {
1383 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1384 <                for (int i = 0; i < SIZE; ++i) {
1385 <                    assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1386 <                }
1383 >                long startTime = System.nanoTime();
1384 >                for (int i = 0; i < SIZE; i++)
1385 >                    assertEquals(SIZE - i - 1,
1386 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1387  
1388                  Thread.currentThread().interrupt();
1389                  try {
1390 <                    q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1390 >                    q.pollLast(randomTimeout(), randomTimeUnit());
1391                      shouldThrow();
1392                  } catch (InterruptedException success) {}
1393                  assertFalse(Thread.interrupted());
# Line 1333 | Line 1398 | public class LinkedBlockingDequeTest ext
1398                      shouldThrow();
1399                  } catch (InterruptedException success) {}
1400                  assertFalse(Thread.interrupted());
1401 +
1402 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1403              }});
1404  
1405          await(pleaseInterrupt);
1406 <        assertThreadStaysAlive(t);
1406 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1407          t.interrupt();
1408          awaitTermination(t);
1409 +        checkEmpty(q);
1410      }
1411  
1412      /**
# Line 1360 | Line 1428 | public class LinkedBlockingDequeTest ext
1428  
1429                  Thread.currentThread().interrupt();
1430                  try {
1431 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
1431 >                    q.poll(randomTimeout(), randomTimeUnit());
1432                      shouldThrow();
1433                  } catch (InterruptedException success) {}
1434                  assertFalse(Thread.interrupted());
# Line 1371 | Line 1439 | public class LinkedBlockingDequeTest ext
1439                      shouldThrow();
1440                  } catch (InterruptedException success) {}
1441                  assertFalse(Thread.interrupted());
1442 +
1443 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1444              }});
1445  
1446          barrier.await();
# Line 1379 | Line 1449 | public class LinkedBlockingDequeTest ext
1449          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1450  
1451          barrier.await();
1452 <        assertThreadStaysAlive(t);
1452 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1453          t.interrupt();
1454          awaitTermination(t);
1455      }
# Line 1455 | Line 1525 | public class LinkedBlockingDequeTest ext
1525                  assertTrue(changed);
1526  
1527              assertTrue(q.containsAll(p));
1528 <            assertEquals(SIZE-i, q.size());
1528 >            assertEquals(SIZE - i, q.size());
1529              p.remove();
1530          }
1531      }
# Line 1468 | Line 1538 | public class LinkedBlockingDequeTest ext
1538              LinkedBlockingDeque q = populatedDeque(SIZE);
1539              LinkedBlockingDeque p = populatedDeque(i);
1540              assertTrue(q.removeAll(p));
1541 <            assertEquals(SIZE-i, q.size());
1541 >            assertEquals(SIZE - i, q.size());
1542              for (int j = 0; j < i; ++j) {
1543 <                Integer I = (Integer)(p.remove());
1544 <                assertFalse(q.contains(I));
1543 >                Integer x = (Integer)(p.remove());
1544 >                assertFalse(q.contains(x));
1545              }
1546          }
1547      }
# Line 1481 | Line 1551 | public class LinkedBlockingDequeTest ext
1551       */
1552      public void testToArray() throws InterruptedException {
1553          LinkedBlockingDeque q = populatedDeque(SIZE);
1554 <        Object[] o = q.toArray();
1555 <        for (int i = 0; i < o.length; i++)
1556 <            assertSame(o[i], q.poll());
1554 >        Object[] a = q.toArray();
1555 >        assertSame(Object[].class, a.getClass());
1556 >        for (Object o : a)
1557 >            assertSame(o, q.poll());
1558 >        assertTrue(q.isEmpty());
1559      }
1560  
1561      /**
# Line 1494 | Line 1566 | public class LinkedBlockingDequeTest ext
1566          Integer[] ints = new Integer[SIZE];
1567          Integer[] array = q.toArray(ints);
1568          assertSame(ints, array);
1569 <        for (int i = 0; i < ints.length; i++)
1570 <            assertSame(ints[i], q.remove());
1569 >        for (Integer o : ints)
1570 >            assertSame(o, q.remove());
1571 >        assertTrue(q.isEmpty());
1572      }
1573  
1574      /**
# Line 1515 | Line 1588 | public class LinkedBlockingDequeTest ext
1588      public void testIterator() throws InterruptedException {
1589          LinkedBlockingDeque q = populatedDeque(SIZE);
1590          Iterator it = q.iterator();
1591 <        while (it.hasNext()) {
1591 >        int i;
1592 >        for (i = 0; it.hasNext(); i++)
1593 >            assertTrue(q.contains(it.next()));
1594 >        assertEquals(i, SIZE);
1595 >        assertIteratorExhausted(it);
1596 >
1597 >        it = q.iterator();
1598 >        for (i = 0; it.hasNext(); i++)
1599              assertEquals(it.next(), q.take());
1600 <        }
1600 >        assertEquals(i, SIZE);
1601 >        assertIteratorExhausted(it);
1602 >    }
1603 >
1604 >    /**
1605 >     * iterator of empty collection has no elements
1606 >     */
1607 >    public void testEmptyIterator() {
1608 >        Deque c = new LinkedBlockingDeque();
1609 >        assertIteratorExhausted(c.iterator());
1610 >        assertIteratorExhausted(c.descendingIterator());
1611      }
1612  
1613      /**
# Line 1650 | Line 1740 | public class LinkedBlockingDequeTest ext
1740          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1741          q.add(one);
1742          q.add(two);
1653        ExecutorService executor = Executors.newFixedThreadPool(2);
1743          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1744 <        executor.execute(new CheckedRunnable() {
1745 <            public void realRun() throws InterruptedException {
1746 <                assertFalse(q.offer(three));
1747 <                threadsStarted.await();
1748 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1749 <                assertEquals(0, q.remainingCapacity());
1750 <            }});
1751 <
1752 <        executor.execute(new CheckedRunnable() {
1753 <            public void realRun() throws InterruptedException {
1754 <                threadsStarted.await();
1755 <                assertSame(one, q.take());
1756 <            }});
1757 <
1758 <        joinPool(executor);
1744 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1745 >        try (PoolCleaner cleaner = cleaner(executor)) {
1746 >            executor.execute(new CheckedRunnable() {
1747 >                public void realRun() throws InterruptedException {
1748 >                    assertFalse(q.offer(three));
1749 >                    threadsStarted.await();
1750 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1751 >                    assertEquals(0, q.remainingCapacity());
1752 >                }});
1753 >
1754 >            executor.execute(new CheckedRunnable() {
1755 >                public void realRun() throws InterruptedException {
1756 >                    threadsStarted.await();
1757 >                    assertSame(one, q.take());
1758 >                }});
1759 >        }
1760      }
1761  
1762      /**
# Line 1675 | Line 1765 | public class LinkedBlockingDequeTest ext
1765      public void testPollInExecutor() {
1766          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1767          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1768 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1769 <        executor.execute(new CheckedRunnable() {
1770 <            public void realRun() throws InterruptedException {
1771 <                assertNull(q.poll());
1772 <                threadsStarted.await();
1773 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1774 <                checkEmpty(q);
1775 <            }});
1776 <
1777 <        executor.execute(new CheckedRunnable() {
1778 <            public void realRun() throws InterruptedException {
1779 <                threadsStarted.await();
1780 <                q.put(one);
1781 <            }});
1782 <
1783 <        joinPool(executor);
1768 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1769 >        try (PoolCleaner cleaner = cleaner(executor)) {
1770 >            executor.execute(new CheckedRunnable() {
1771 >                public void realRun() throws InterruptedException {
1772 >                    assertNull(q.poll());
1773 >                    threadsStarted.await();
1774 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1775 >                    checkEmpty(q);
1776 >                }});
1777 >
1778 >            executor.execute(new CheckedRunnable() {
1779 >                public void realRun() throws InterruptedException {
1780 >                    threadsStarted.await();
1781 >                    q.put(one);
1782 >                }});
1783 >        }
1784      }
1785  
1786      /**
1787 <     * A deserialized serialized deque has same elements in same order
1787 >     * A deserialized/reserialized deque has same elements in same order
1788       */
1789      public void testSerialization() throws Exception {
1790          Queue x = populatedDeque(SIZE);
# Line 1742 | Line 1832 | public class LinkedBlockingDequeTest ext
1832          final LinkedBlockingDeque q = populatedDeque(SIZE);
1833          Thread t = new Thread(new CheckedRunnable() {
1834              public void realRun() throws InterruptedException {
1835 <                q.put(new Integer(SIZE+1));
1835 >                q.put(new Integer(SIZE + 1));
1836              }});
1837  
1838          t.start();
# Line 1767 | Line 1857 | public class LinkedBlockingDequeTest ext
1857              q.drainTo(l, i);
1858              int k = (i < SIZE) ? i : SIZE;
1859              assertEquals(k, l.size());
1860 <            assertEquals(SIZE-k, q.size());
1860 >            assertEquals(SIZE - k, q.size());
1861              for (int j = 0; j < k; ++j)
1862                  assertEquals(l.get(j), new Integer(j));
1863 <            while (q.poll() != null) ;
1863 >            do {} while (q.poll() != null);
1864 >        }
1865 >    }
1866 >
1867 >    /**
1868 >     * remove(null), contains(null) always return false
1869 >     */
1870 >    public void testNeverContainsNull() {
1871 >        Deque<?>[] qs = {
1872 >            new LinkedBlockingDeque<Object>(),
1873 >            populatedDeque(2),
1874 >        };
1875 >
1876 >        for (Deque<?> q : qs) {
1877 >            assertFalse(q.contains(null));
1878 >            assertFalse(q.remove(null));
1879 >            assertFalse(q.removeFirstOccurrence(null));
1880 >            assertFalse(q.removeLastOccurrence(null));
1881          }
1882      }
1883  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines