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

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.87 by jsr166, Mon Oct 5 22:19:00 2015 UTC vs.
Revision 1.93 by jsr166, Tue Oct 6 16:39:06 2015 UTC

# Line 248 | Line 248 | public class ThreadPoolExecutorSubclassT
248       * thread becomes active
249       */
250      public void testGetActiveCount() throws InterruptedException {
251 +        final CountDownLatch done = new CountDownLatch(1);
252          final ThreadPoolExecutor p =
253              new CustomTPE(2, 2,
254                            LONG_DELAY_MS, MILLISECONDS,
255                            new ArrayBlockingQueue<Runnable>(10));
256 <        try (PoolCleaner cleaner = cleaner(p)) {
256 >        try (PoolCleaner cleaner = cleaner(p, done)) {
257              final CountDownLatch threadStarted = new CountDownLatch(1);
257 –            final CountDownLatch done = new CountDownLatch(1);
258              assertEquals(0, p.getActiveCount());
259              p.execute(new CheckedRunnable() {
260                  public void realRun() throws InterruptedException {
261                      threadStarted.countDown();
262                      assertEquals(1, p.getActiveCount());
263 <                    done.await();
263 >                    await(done);
264                  }});
265 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
265 >            await(threadStarted);
266              assertEquals(1, p.getActiveCount());
267 –            done.countDown();
267          }
268      }
269  
# Line 488 | Line 487 | public class ThreadPoolExecutorSubclassT
487                  p.execute(new CheckedRunnable() {
488                      public void realRun() throws InterruptedException {
489                          threadsStarted.countDown();
490 <                        done.await();
490 >                        await(done);
491                          assertEquals(THREADS, p.getLargestPoolSize());
492                      }});
493 <            assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
493 >            await(threadsStarted);
494              assertEquals(THREADS, p.getLargestPoolSize());
495          }
496          assertEquals(THREADS, p.getLargestPoolSize());
# Line 532 | Line 531 | public class ThreadPoolExecutorSubclassT
531                  public void realRun() throws InterruptedException {
532                      threadStarted.countDown();
533                      assertEquals(1, p.getPoolSize());
534 <                    done.await();
534 >                    await(done);
535                  }});
536 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
536 >            await(threadStarted);
537              assertEquals(1, p.getPoolSize());
538          }
539      }
# Line 556 | Line 555 | public class ThreadPoolExecutorSubclassT
555              p.execute(new CheckedRunnable() {
556                  public void realRun() throws InterruptedException {
557                      threadStarted.countDown();
558 <                    done.await();
558 >                    await(done);
559                  }});
560 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
560 >            await(threadStarted);
561              assertEquals(1, p.getTaskCount());
562              assertEquals(0, p.getCompletedTaskCount());
563              for (int i = 0; i < TASKS; i++) {
# Line 567 | Line 566 | public class ThreadPoolExecutorSubclassT
566                      public void realRun() throws InterruptedException {
567                          threadStarted.countDown();
568                          assertEquals(1 + TASKS, p.getTaskCount());
569 <                        done.await();
569 >                        await(done);
570                      }});
571              }
572              assertEquals(1 + TASKS, p.getTaskCount());
# Line 608 | Line 607 | public class ThreadPoolExecutorSubclassT
607                  public void realRun() throws InterruptedException {
608                      assertFalse(p.isTerminating());
609                      threadStarted.countDown();
610 <                    done.await();
610 >                    await(done);
611                  }});
612 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
612 >            await(threadStarted);
613              assertFalse(p.isTerminating());
614              done.countDown();
615              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 636 | Line 635 | public class ThreadPoolExecutorSubclassT
635                  public void realRun() throws InterruptedException {
636                      assertFalse(p.isTerminating());
637                      threadStarted.countDown();
638 <                    done.await();
638 >                    await(done);
639                  }});
640 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
640 >            await(threadStarted);
641              assertFalse(p.isTerminating());
642              done.countDown();
643              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 652 | Line 651 | public class ThreadPoolExecutorSubclassT
651       * getQueue returns the work queue, which contains queued tasks
652       */
653      public void testGetQueue() throws InterruptedException {
654 +        final CountDownLatch done = new CountDownLatch(1);
655          final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
656          final ThreadPoolExecutor p =
657              new CustomTPE(1, 1,
658                            LONG_DELAY_MS, MILLISECONDS,
659                            q);
660 <        try (PoolCleaner cleaner = cleaner(p)) {
660 >        try (PoolCleaner cleaner = cleaner(p, done)) {
661              final CountDownLatch threadStarted = new CountDownLatch(1);
662 –            final CountDownLatch done = new CountDownLatch(1);
662              FutureTask[] tasks = new FutureTask[5];
663              for (int i = 0; i < tasks.length; i++) {
664                  Callable task = new CheckedCallable<Boolean>() {
665                      public Boolean realCall() throws InterruptedException {
666                          threadStarted.countDown();
667                          assertSame(q, p.getQueue());
668 <                        done.await();
668 >                        await(done);
669                          return Boolean.TRUE;
670                      }};
671                  tasks[i] = new FutureTask(task);
672                  p.execute(tasks[i]);
673              }
674 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
674 >            await(threadStarted);
675              assertSame(q, p.getQueue());
676              assertFalse(q.contains(tasks[0]));
677              assertTrue(q.contains(tasks[tasks.length - 1]));
678              assertEquals(tasks.length - 1, q.size());
680 –            done.countDown();
679          }
680      }
681  
# Line 685 | Line 683 | public class ThreadPoolExecutorSubclassT
683       * remove(task) removes queued task, and fails to remove active task
684       */
685      public void testRemove() throws InterruptedException {
686 +        final CountDownLatch done = new CountDownLatch(1);
687          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
688          final ThreadPoolExecutor p =
689              new CustomTPE(1, 1,
690                            LONG_DELAY_MS, MILLISECONDS,
691                            q);
692 <        try (PoolCleaner cleaner = cleaner(p)) {
692 >        try (PoolCleaner cleaner = cleaner(p, done)) {
693              Runnable[] tasks = new Runnable[6];
694              final CountDownLatch threadStarted = new CountDownLatch(1);
696 –            final CountDownLatch done = new CountDownLatch(1);
695              for (int i = 0; i < tasks.length; i++) {
696                  tasks[i] = new CheckedRunnable() {
697                      public void realRun() throws InterruptedException {
698                          threadStarted.countDown();
699 <                        done.await();
699 >                        await(done);
700                      }};
701                  p.execute(tasks[i]);
702              }
703 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
703 >            await(threadStarted);
704              assertFalse(p.remove(tasks[0]));
705              assertTrue(q.contains(tasks[4]));
706              assertTrue(q.contains(tasks[3]));
# Line 712 | Line 710 | public class ThreadPoolExecutorSubclassT
710              assertTrue(q.contains(tasks[3]));
711              assertTrue(p.remove(tasks[3]));
712              assertFalse(q.contains(tasks[3]));
715 –            done.countDown();
713          }
714      }
715  
# Line 733 | Line 730 | public class ThreadPoolExecutorSubclassT
730                  Callable task = new CheckedCallable<Boolean>() {
731                      public Boolean realCall() throws InterruptedException {
732                          threadStarted.countDown();
733 <                        done.await();
733 >                        await(done);
734                          return Boolean.TRUE;
735                      }};
736                  tasks[i] = new FutureTask(task);
737                  p.execute(tasks[i]);
738              }
739 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
739 >            await(threadStarted);
740              assertEquals(tasks.length, p.getTaskCount());
741              assertEquals(tasks.length - 1, q.size());
742              assertEquals(1L, p.getActiveCount());
# Line 777 | Line 774 | public class ThreadPoolExecutorSubclassT
774          }};
775          for (int i = 0; i < count; i++)
776              p.execute(waiter);
777 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
777 >        await(threadsStarted);
778          assertEquals(poolSize, p.getActiveCount());
779          assertEquals(0, p.getCompletedTaskCount());
780          final List<Runnable> queuedTasks;
# Line 1136 | Line 1133 | public class ThreadPoolExecutorSubclassT
1133       * execute throws RejectedExecutionException if saturated.
1134       */
1135      public void testSaturatedExecute() {
1136 +        final CountDownLatch done = new CountDownLatch(1);
1137          final ThreadPoolExecutor p =
1138              new CustomTPE(1, 1,
1139                            LONG_DELAY_MS, MILLISECONDS,
1140                            new ArrayBlockingQueue<Runnable>(1));
1141 <        try (PoolCleaner cleaner = cleaner(p)) {
1144 <            final CountDownLatch done = new CountDownLatch(1);
1141 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1142              Runnable task = new CheckedRunnable() {
1143                  public void realRun() throws InterruptedException {
1144 <                    done.await();
1144 >                    await(done);
1145                  }};
1146              for (int i = 0; i < 2; ++i)
1147                  p.execute(task);
# Line 1155 | Line 1152 | public class ThreadPoolExecutorSubclassT
1152                  } catch (RejectedExecutionException success) {}
1153                  assertTrue(p.getTaskCount() <= 2);
1154              }
1158 –            done.countDown();
1155          }
1156      }
1157  
# Line 1163 | Line 1159 | public class ThreadPoolExecutorSubclassT
1159       * executor using CallerRunsPolicy runs task if saturated.
1160       */
1161      public void testSaturatedExecute2() {
1162 +        final CountDownLatch done = new CountDownLatch(1);
1163          final ThreadPoolExecutor p =
1164              new CustomTPE(1, 1,
1165                            LONG_DELAY_MS, MILLISECONDS,
1166                            new ArrayBlockingQueue<Runnable>(1),
1167                            new CustomTPE.CallerRunsPolicy());
1168 <        try (PoolCleaner cleaner = cleaner(p)) {
1172 <            final CountDownLatch done = new CountDownLatch(1);
1168 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1169              Runnable blocker = new CheckedRunnable() {
1170                  public void realRun() throws InterruptedException {
1171 <                    done.await();
1171 >                    await(done);
1172                  }};
1173              p.execute(blocker);
1174              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
# Line 1183 | Line 1179 | public class ThreadPoolExecutorSubclassT
1179              for (int i = 1; i < tasks.length; i++)
1180                  assertTrue(tasks[i].done);
1181              assertFalse(tasks[0].done); // waiting in queue
1186 –            done.countDown();
1182          }
1183      }
1184  
# Line 1194 | Line 1189 | public class ThreadPoolExecutorSubclassT
1189          final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1190          for (int i = 0; i < tasks.length; ++i)
1191              tasks[i] = new TrackedNoOpRunnable();
1192 +        final CountDownLatch done = new CountDownLatch(1);
1193          final ThreadPoolExecutor p =
1194              new CustomTPE(1, 1,
1195                            LONG_DELAY_MS, MILLISECONDS,
1196                            new ArrayBlockingQueue<Runnable>(1),
1197                            new CustomTPE.DiscardPolicy());
1198 <        try (PoolCleaner cleaner = cleaner(p)) {
1203 <            final CountDownLatch done = new CountDownLatch(1);
1198 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1199              p.execute(awaiter(done));
1200  
1201              for (TrackedNoOpRunnable task : tasks)
1202                  p.execute(task);
1203              for (int i = 1; i < tasks.length; i++)
1204                  assertFalse(tasks[i].done);
1210 –            done.countDown();
1205          }
1206          for (int i = 1; i < tasks.length; i++)
1207              assertFalse(tasks[i].done);
# Line 1227 | Line 1221 | public class ThreadPoolExecutorSubclassT
1221                            LONG_DELAY_MS, MILLISECONDS,
1222                            new ArrayBlockingQueue<Runnable>(1),
1223                            new CustomTPE.DiscardOldestPolicy());
1224 <        try (PoolCleaner cleaner = cleaner(p)) {
1224 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1225              assertEquals(LatchAwaiter.NEW, r1.state);
1226              assertEquals(LatchAwaiter.NEW, r2.state);
1227              assertEquals(LatchAwaiter.NEW, r3.state);
# Line 1237 | Line 1231 | public class ThreadPoolExecutorSubclassT
1231              p.execute(r3);
1232              assertFalse(p.getQueue().contains(r2));
1233              assertTrue(p.getQueue().contains(r3));
1240 –            done.countDown();
1234          }
1235          assertEquals(LatchAwaiter.DONE, r1.state);
1236          assertEquals(LatchAwaiter.NEW, r2.state);
# Line 1840 | Line 1833 | public class ThreadPoolExecutorSubclassT
1833              List<Callable<String>> l = new ArrayList<Callable<String>>();
1834              l.add(new NPETask());
1835              List<Future<String>> futures =
1836 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1836 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1837              assertEquals(1, futures.size());
1838              try {
1839                  futures.get(0).get();
# Line 1875 | Line 1868 | public class ThreadPoolExecutorSubclassT
1868       * timed invokeAll(c) cancels tasks not completed by timeout
1869       */
1870      public void testTimedInvokeAll6() throws Exception {
1871 <        final ExecutorService e =
1872 <            new CustomTPE(2, 2,
1873 <                          LONG_DELAY_MS, MILLISECONDS,
1874 <                          new ArrayBlockingQueue<Runnable>(10));
1875 <        try (PoolCleaner cleaner = cleaner(e)) {
1876 <            for (long timeout = timeoutMillis();;) {
1871 >        for (long timeout = timeoutMillis();;) {
1872 >            final CountDownLatch done = new CountDownLatch(1);
1873 >            final Callable<String> waiter = new CheckedCallable<String>() {
1874 >                public String realCall() {
1875 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1876 >                    catch (InterruptedException ok) {}
1877 >                    return "1"; }};
1878 >            final ExecutorService p =
1879 >                new CustomTPE(2, 2,
1880 >                              LONG_DELAY_MS, MILLISECONDS,
1881 >                              new ArrayBlockingQueue<Runnable>(10));
1882 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1883                  List<Callable<String>> tasks = new ArrayList<>();
1884                  tasks.add(new StringTask("0"));
1885 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1885 >                tasks.add(waiter);
1886                  tasks.add(new StringTask("2"));
1887                  long startTime = System.nanoTime();
1888                  List<Future<String>> futures =
1889 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1889 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1890                  assertEquals(tasks.size(), futures.size());
1891                  assertTrue(millisElapsedSince(startTime) >= timeout);
1892                  for (Future future : futures)
# Line 1996 | Line 1995 | public class ThreadPoolExecutorSubclassT
1995       * (in part, a test of CustomTPE itself)
1996       */
1997      public void testGet_cancelled() throws Exception {
1998 +        final CountDownLatch done = new CountDownLatch(1);
1999          final ExecutorService e =
2000              new CustomTPE(1, 1,
2001                            LONG_DELAY_MS, MILLISECONDS,
2002                            new LinkedBlockingQueue<Runnable>());
2003 <        try (PoolCleaner cleaner = cleaner(e)) {
2003 >        try (PoolCleaner cleaner = cleaner(e, done)) {
2004              final CountDownLatch blockerStarted = new CountDownLatch(1);
2005 –            final CountDownLatch done = new CountDownLatch(1);
2005              final List<Future<?>> futures = new ArrayList<>();
2006              for (int i = 0; i < 2; i++) {
2007                  Runnable r = new CheckedRunnable() { public void realRun()
# Line 2012 | Line 2011 | public class ThreadPoolExecutorSubclassT
2011                  }};
2012                  futures.add(e.submit(r));
2013              }
2014 <            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2014 >            await(blockerStarted);
2015              for (Future<?> future : futures) future.cancel(false);
2016              for (Future<?> future : futures) {
2017                  try {
# Line 2026 | Line 2025 | public class ThreadPoolExecutorSubclassT
2025                  assertTrue(future.isCancelled());
2026                  assertTrue(future.isDone());
2027              }
2029 –            done.countDown();
2028          }
2029      }
2030  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines