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.59 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.78 by jsr166, Sun May 14 01:30:34 2017 UTC

# Line 41 | Line 41 | public class LinkedBlockingDequeTest ext
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 59 | 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 281 | Line 291 | public class LinkedBlockingDequeTest ext
291          }
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 296 | Line 306 | public class LinkedBlockingDequeTest ext
306          }
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 594 | 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 629 | Line 639 | public class LinkedBlockingDequeTest ext
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(0, q.remainingCapacity());
# Line 653 | Line 663 | public class LinkedBlockingDequeTest ext
663                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
664                      shouldThrow();
665                  } catch (InterruptedException success) {}
666 +                assertFalse(Thread.interrupted());
667              }});
668  
669          await(pleaseInterrupt);
670 <        assertThreadStaysAlive(t);
670 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
671          t.interrupt();
672          awaitTermination(t);
673      }
# Line 679 | Line 690 | public class LinkedBlockingDequeTest ext
690          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
691          Thread t = newStartedThread(new CheckedRunnable() {
692              public void realRun() throws InterruptedException {
693 <                for (int i = 0; i < SIZE; ++i) {
683 <                    assertEquals(i, q.take());
684 <                }
693 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
694  
695                  Thread.currentThread().interrupt();
696                  try {
# Line 699 | Line 708 | public class LinkedBlockingDequeTest ext
708              }});
709  
710          await(pleaseInterrupt);
711 <        assertThreadStaysAlive(t);
711 >        assertThreadBlocks(t, Thread.State.WAITING);
712          t.interrupt();
713          awaitTermination(t);
714      }
# Line 748 | Line 757 | public class LinkedBlockingDequeTest ext
757       */
758      public void testInterruptedTimedPoll() throws InterruptedException {
759          final BlockingQueue<Integer> q = populatedDeque(SIZE);
760 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
760 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
761          Thread t = newStartedThread(new CheckedRunnable() {
762              public void realRun() throws InterruptedException {
763 <                for (int i = 0; i < SIZE; ++i) {
764 <                    long t0 = System.nanoTime();
763 >                long startTime = System.nanoTime();
764 >                for (int i = 0; i < SIZE; i++)
765                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
766 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
767 <                }
759 <                long t0 = System.nanoTime();
760 <                aboutToWait.countDown();
766 >
767 >                Thread.currentThread().interrupt();
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 >                pleaseInterrupt.countDown();
775 >                try {
776 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
777 >                    shouldThrow();
778 >                } catch (InterruptedException success) {}
779 >                assertFalse(Thread.interrupted());
780 >
781 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
782              }});
783  
784 <        aboutToWait.await();
785 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
784 >        await(pleaseInterrupt);
785 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
786          t.interrupt();
787 <        awaitTermination(t, MEDIUM_DELAY_MS);
787 >        awaitTermination(t);
788          checkEmpty(q);
789      }
790  
# Line 826 | Line 841 | public class LinkedBlockingDequeTest ext
841              }});
842  
843          await(pleaseInterrupt);
844 <        assertThreadStaysAlive(t);
844 >        assertThreadBlocks(t, Thread.State.WAITING);
845          t.interrupt();
846          awaitTermination(t);
847          assertEquals(SIZE, q.size());
# Line 861 | Line 876 | public class LinkedBlockingDequeTest ext
876          assertEquals(capacity - 1, q.take());
877  
878          await(pleaseInterrupt);
879 <        assertThreadStaysAlive(t);
879 >        assertThreadBlocks(t, Thread.State.WAITING);
880          t.interrupt();
881          awaitTermination(t);
882          assertEquals(0, q.remainingCapacity());
# Line 885 | Line 900 | public class LinkedBlockingDequeTest ext
900                      q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
901                      shouldThrow();
902                  } catch (InterruptedException success) {}
903 +                assertFalse(Thread.interrupted());
904              }});
905  
906          await(pleaseInterrupt);
907 <        assertThreadStaysAlive(t);
907 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
908          t.interrupt();
909          awaitTermination(t);
910      }
# Line 920 | Line 936 | public class LinkedBlockingDequeTest ext
936              }});
937  
938          await(threadStarted);
939 <        assertThreadStaysAlive(t);
939 >        assertThreadBlocks(t, Thread.State.WAITING);
940          t.interrupt();
941          awaitTermination(t);
942      }
# Line 961 | Line 977 | public class LinkedBlockingDequeTest ext
977              }});
978  
979          await(threadStarted);
980 <        assertThreadStaysAlive(t);
980 >        assertThreadBlocks(t, Thread.State.WAITING);
981          t.interrupt();
982          awaitTermination(t);
983      }
# Line 993 | Line 1009 | public class LinkedBlockingDequeTest ext
1009          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1010          Thread t = newStartedThread(new CheckedRunnable() {
1011              public void realRun() throws InterruptedException {
1012 <                for (int i = 0; i < SIZE; ++i) {
997 <                    assertEquals(i, q.takeFirst());
998 <                }
1012 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1013  
1014                  Thread.currentThread().interrupt();
1015                  try {
# Line 1013 | Line 1027 | public class LinkedBlockingDequeTest ext
1027              }});
1028  
1029          await(pleaseInterrupt);
1030 <        assertThreadStaysAlive(t);
1030 >        assertThreadBlocks(t, Thread.State.WAITING);
1031          t.interrupt();
1032          awaitTermination(t);
1033      }
# Line 1050 | Line 1064 | public class LinkedBlockingDequeTest ext
1064       * returning timeout status
1065       */
1066      public void testInterruptedTimedPollFirst() throws InterruptedException {
1067 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1068          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1069          Thread t = newStartedThread(new CheckedRunnable() {
1070              public void realRun() throws InterruptedException {
1071 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1072 <                for (int i = 0; i < SIZE; ++i) {
1071 >                long startTime = System.nanoTime();
1072 >                for (int i = 0; i < SIZE; i++)
1073                      assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1059                }
1074  
1075                  Thread.currentThread().interrupt();
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());
# Line 1071 | Line 1085 | public class LinkedBlockingDequeTest ext
1085                      shouldThrow();
1086                  } catch (InterruptedException success) {}
1087                  assertFalse(Thread.interrupted());
1088 +
1089 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1090              }});
1091  
1092          await(pleaseInterrupt);
1093 <        assertThreadStaysAlive(t);
1093 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1094          t.interrupt();
1095          awaitTermination(t);
1096      }
# Line 1107 | Line 1123 | public class LinkedBlockingDequeTest ext
1123                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1124                      shouldThrow();
1125                  } catch (InterruptedException success) {}
1126 +                assertFalse(Thread.interrupted());
1127                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1128              }});
1129  
# Line 1115 | Line 1132 | public class LinkedBlockingDequeTest ext
1132          assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1133          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1134          barrier.await();
1135 <        assertThreadStaysAlive(t);
1135 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1136          t.interrupt();
1137          awaitTermination(t);
1138      }
# Line 1173 | Line 1190 | public class LinkedBlockingDequeTest ext
1190              }});
1191  
1192          await(pleaseInterrupt);
1193 <        assertThreadStaysAlive(t);
1193 >        assertThreadBlocks(t, Thread.State.WAITING);
1194          t.interrupt();
1195          awaitTermination(t);
1196          assertEquals(SIZE, q.size());
# Line 1208 | Line 1225 | public class LinkedBlockingDequeTest ext
1225          assertEquals(0, q.take());
1226  
1227          await(pleaseInterrupt);
1228 <        assertThreadStaysAlive(t);
1228 >        assertThreadBlocks(t, Thread.State.WAITING);
1229          t.interrupt();
1230          awaitTermination(t);
1231          assertEquals(0, q.remainingCapacity());
# Line 1235 | Line 1252 | public class LinkedBlockingDequeTest ext
1252              }});
1253  
1254          await(pleaseInterrupt);
1255 <        assertThreadStaysAlive(t);
1255 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1256          t.interrupt();
1257          awaitTermination(t);
1258      }
# Line 1246 | Line 1263 | public class LinkedBlockingDequeTest ext
1263      public void testTakeLast() throws InterruptedException {
1264          LinkedBlockingDeque q = populatedDeque(SIZE);
1265          for (int i = 0; i < SIZE; ++i) {
1266 <            assertEquals(SIZE - i-1, q.takeLast());
1266 >            assertEquals(SIZE - i - 1, q.takeLast());
1267          }
1268      }
1269  
# Line 1258 | Line 1275 | public class LinkedBlockingDequeTest ext
1275          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1276          Thread t = newStartedThread(new CheckedRunnable() {
1277              public void realRun() throws InterruptedException {
1278 <                for (int i = 0; i < SIZE; ++i) {
1279 <                    assertEquals(SIZE - i-1, q.takeLast());
1263 <                }
1278 >                for (int i = 0; i < SIZE; i++)
1279 >                    assertEquals(SIZE - i - 1, q.takeLast());
1280  
1281                  Thread.currentThread().interrupt();
1282                  try {
# Line 1278 | Line 1294 | public class LinkedBlockingDequeTest ext
1294              }});
1295  
1296          await(pleaseInterrupt);
1297 <        assertThreadStaysAlive(t);
1297 >        assertThreadBlocks(t, Thread.State.WAITING);
1298          t.interrupt();
1299          awaitTermination(t);
1300      }
# Line 1289 | Line 1305 | public class LinkedBlockingDequeTest ext
1305      public void testTimedPollLast0() throws InterruptedException {
1306          LinkedBlockingDeque q = populatedDeque(SIZE);
1307          for (int i = 0; i < SIZE; ++i) {
1308 <            assertEquals(SIZE - i-1, q.pollLast(0, MILLISECONDS));
1308 >            assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1309          }
1310          assertNull(q.pollLast(0, MILLISECONDS));
1311      }
# Line 1301 | Line 1317 | public class LinkedBlockingDequeTest ext
1317          LinkedBlockingDeque q = populatedDeque(SIZE);
1318          for (int i = 0; i < SIZE; ++i) {
1319              long startTime = System.nanoTime();
1320 <            assertEquals(SIZE - i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1320 >            assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1321              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1322          }
1323          long startTime = System.nanoTime();
# Line 1315 | Line 1331 | public class LinkedBlockingDequeTest ext
1331       * returning timeout status
1332       */
1333      public void testInterruptedTimedPollLast() throws InterruptedException {
1334 +        final LinkedBlockingDeque q = populatedDeque(SIZE);
1335          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1336          Thread t = newStartedThread(new CheckedRunnable() {
1337              public void realRun() throws InterruptedException {
1338 <                LinkedBlockingDeque q = populatedDeque(SIZE);
1339 <                for (int i = 0; i < SIZE; ++i) {
1340 <                    assertEquals(SIZE - i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1341 <                }
1338 >                long startTime = System.nanoTime();
1339 >                for (int i = 0; i < SIZE; i++)
1340 >                    assertEquals(SIZE - i - 1,
1341 >                                 q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1342  
1343                  Thread.currentThread().interrupt();
1344                  try {
# Line 1336 | Line 1353 | public class LinkedBlockingDequeTest ext
1353                      shouldThrow();
1354                  } catch (InterruptedException success) {}
1355                  assertFalse(Thread.interrupted());
1356 +
1357 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1358              }});
1359  
1360          await(pleaseInterrupt);
1361 <        assertThreadStaysAlive(t);
1361 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1362          t.interrupt();
1363          awaitTermination(t);
1364 +        checkEmpty(q);
1365      }
1366  
1367      /**
# Line 1374 | Line 1394 | public class LinkedBlockingDequeTest ext
1394                      shouldThrow();
1395                  } catch (InterruptedException success) {}
1396                  assertFalse(Thread.interrupted());
1397 +
1398 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1399              }});
1400  
1401          barrier.await();
# Line 1382 | Line 1404 | public class LinkedBlockingDequeTest ext
1404          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1405  
1406          barrier.await();
1407 <        assertThreadStaysAlive(t);
1407 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1408          t.interrupt();
1409          awaitTermination(t);
1410      }
# Line 1670 | Line 1692 | public class LinkedBlockingDequeTest ext
1692          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1693          q.add(one);
1694          q.add(two);
1673        ExecutorService executor = Executors.newFixedThreadPool(2);
1695          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1696 <        executor.execute(new CheckedRunnable() {
1697 <            public void realRun() throws InterruptedException {
1698 <                assertFalse(q.offer(three));
1699 <                threadsStarted.await();
1700 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1701 <                assertEquals(0, q.remainingCapacity());
1702 <            }});
1703 <
1704 <        executor.execute(new CheckedRunnable() {
1705 <            public void realRun() throws InterruptedException {
1706 <                threadsStarted.await();
1707 <                assertSame(one, q.take());
1708 <            }});
1709 <
1710 <        joinPool(executor);
1696 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1697 >        try (PoolCleaner cleaner = cleaner(executor)) {
1698 >            executor.execute(new CheckedRunnable() {
1699 >                public void realRun() throws InterruptedException {
1700 >                    assertFalse(q.offer(three));
1701 >                    threadsStarted.await();
1702 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1703 >                    assertEquals(0, q.remainingCapacity());
1704 >                }});
1705 >
1706 >            executor.execute(new CheckedRunnable() {
1707 >                public void realRun() throws InterruptedException {
1708 >                    threadsStarted.await();
1709 >                    assertSame(one, q.take());
1710 >                }});
1711 >        }
1712      }
1713  
1714      /**
# Line 1695 | Line 1717 | public class LinkedBlockingDequeTest ext
1717      public void testPollInExecutor() {
1718          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1719          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1720 <        ExecutorService executor = Executors.newFixedThreadPool(2);
1721 <        executor.execute(new CheckedRunnable() {
1722 <            public void realRun() throws InterruptedException {
1723 <                assertNull(q.poll());
1724 <                threadsStarted.await();
1725 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1726 <                checkEmpty(q);
1727 <            }});
1728 <
1729 <        executor.execute(new CheckedRunnable() {
1730 <            public void realRun() throws InterruptedException {
1731 <                threadsStarted.await();
1732 <                q.put(one);
1733 <            }});
1734 <
1735 <        joinPool(executor);
1720 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
1721 >        try (PoolCleaner cleaner = cleaner(executor)) {
1722 >            executor.execute(new CheckedRunnable() {
1723 >                public void realRun() throws InterruptedException {
1724 >                    assertNull(q.poll());
1725 >                    threadsStarted.await();
1726 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1727 >                    checkEmpty(q);
1728 >                }});
1729 >
1730 >            executor.execute(new CheckedRunnable() {
1731 >                public void realRun() throws InterruptedException {
1732 >                    threadsStarted.await();
1733 >                    q.put(one);
1734 >                }});
1735 >        }
1736      }
1737  
1738      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines