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

Comparing jsr166/src/test/tck/ScheduledExecutorSubclassTest.java (file contents):
Revision 1.50 by jsr166, Mon Oct 5 22:09:02 2015 UTC vs.
Revision 1.51 by jsr166, Tue Oct 6 05:03:23 2015 UTC

# Line 105 | Line 105 | public class ScheduledExecutorSubclassTe
105              final Runnable task = new CheckedRunnable() {
106                  public void realRun() { done.countDown(); }};
107              p.execute(task);
108 <            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
108 >            await(done);
109          }
110      }
111  
# Line 113 | Line 113 | public class ScheduledExecutorSubclassTe
113       * delayed schedule of callable successfully executes after delay
114       */
115      public void testSchedule1() throws Exception {
116 +        final CountDownLatch done = new CountDownLatch(1);
117          final CustomExecutor p = new CustomExecutor(1);
118 <        try (PoolCleaner cleaner = cleaner(p)) {
118 >        try (PoolCleaner cleaner = cleaner(p, done)) {
119              final long startTime = System.nanoTime();
119 –            final CountDownLatch done = new CountDownLatch(1);
120              Callable task = new CheckedCallable<Boolean>() {
121                  public Boolean realCall() {
122                      done.countDown();
# Line 126 | Line 126 | public class ScheduledExecutorSubclassTe
126              Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
127              assertSame(Boolean.TRUE, f.get());
128              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
129 –            assertTrue(done.await(0L, MILLISECONDS));
129          }
130      }
131  
# Line 213 | Line 212 | public class ScheduledExecutorSubclassTe
212                      public void realRun() { done.countDown(); }};
213                  ScheduledFuture h =
214                      p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
215 <                done.await();
215 >                await(done);
216                  h.cancel(true);
217                  double normalizedTime =
218                      (double) millisElapsedSince(startTime) / delay;
# Line 239 | Line 238 | public class ScheduledExecutorSubclassTe
238                      public void realRun() { done.countDown(); }};
239                  ScheduledFuture h =
240                      p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
241 <                done.await();
241 >                await(done);
242                  h.cancel(true);
243                  double normalizedTime =
244                      (double) millisElapsedSince(startTime) / delay;
# Line 363 | Line 362 | public class ScheduledExecutorSubclassTe
362       * thread becomes active
363       */
364      public void testGetActiveCount() throws InterruptedException {
365 +        final CountDownLatch done = new CountDownLatch(1);
366          final ThreadPoolExecutor p = new CustomExecutor(2);
367 <        try (PoolCleaner cleaner = cleaner(p)) {
367 >        try (PoolCleaner cleaner = cleaner(p, done)) {
368              final CountDownLatch threadStarted = new CountDownLatch(1);
369 –            final CountDownLatch done = new CountDownLatch(1);
369              assertEquals(0, p.getActiveCount());
370              p.execute(new CheckedRunnable() {
371                  public void realRun() throws InterruptedException {
372                      threadStarted.countDown();
373                      assertEquals(1, p.getActiveCount());
374 <                    done.await();
374 >                    await(done);
375                  }});
376 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
376 >            await(threadStarted);
377              assertEquals(1, p.getActiveCount());
379 –            done.countDown();
378          }
379      }
380  
# Line 427 | Line 425 | public class ScheduledExecutorSubclassTe
425       */
426      public void testGetLargestPoolSize() throws InterruptedException {
427          final int THREADS = 3;
428 +        final CountDownLatch done = new CountDownLatch(1);
429          final ThreadPoolExecutor p = new CustomExecutor(THREADS);
430 <        try (PoolCleaner cleaner = cleaner(p)) {
430 >        try (PoolCleaner cleaner = cleaner(p, done)) {
431              final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
433 –            final CountDownLatch done = new CountDownLatch(1);
432              assertEquals(0, p.getLargestPoolSize());
433              for (int i = 0; i < THREADS; i++)
434                  p.execute(new CheckedRunnable() {
435                      public void realRun() throws InterruptedException {
436                          threadsStarted.countDown();
437 <                        done.await();
437 >                        await(done);
438                          assertEquals(THREADS, p.getLargestPoolSize());
439                      }});
440              assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
441              assertEquals(THREADS, p.getLargestPoolSize());
444 –            done.countDown();
442          }
443          assertEquals(THREADS, p.getLargestPoolSize());
444      }
# Line 451 | Line 448 | public class ScheduledExecutorSubclassTe
448       * become active
449       */
450      public void testGetPoolSize() throws InterruptedException {
451 +        final CountDownLatch done = new CountDownLatch(1);
452          final ThreadPoolExecutor p = new CustomExecutor(1);
453 <        try (PoolCleaner cleaner = cleaner(p)) {
453 >        try (PoolCleaner cleaner = cleaner(p, done)) {
454              final CountDownLatch threadStarted = new CountDownLatch(1);
457 –            final CountDownLatch done = new CountDownLatch(1);
455              assertEquals(0, p.getPoolSize());
456              p.execute(new CheckedRunnable() {
457                  public void realRun() throws InterruptedException {
458                      threadStarted.countDown();
459                      assertEquals(1, p.getPoolSize());
460 <                    done.await();
460 >                    await(done);
461                  }});
462 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
462 >            await(threadStarted);
463              assertEquals(1, p.getPoolSize());
467 –            done.countDown();
464          }
465      }
466  
# Line 483 | Line 479 | public class ScheduledExecutorSubclassTe
479              p.execute(new CheckedRunnable() {
480                  public void realRun() throws InterruptedException {
481                      threadStarted.countDown();
482 <                    done.await();
482 >                    await(done);
483                  }});
484 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
484 >            await(threadStarted);
485              assertEquals(1, p.getTaskCount());
486              assertEquals(0, p.getCompletedTaskCount());
487              for (int i = 0; i < TASKS; i++) {
# Line 494 | Line 490 | public class ScheduledExecutorSubclassTe
490                      public void realRun() throws InterruptedException {
491                          threadStarted.countDown();
492                          assertEquals(1 + TASKS, p.getTaskCount());
493 <                        done.await();
493 >                        await(done);
494                      }});
495              }
496              assertEquals(1 + TASKS, p.getTaskCount());
# Line 556 | Line 552 | public class ScheduledExecutorSubclassTe
552       * isTerminated is false before termination, true after
553       */
554      public void testIsTerminated() throws InterruptedException {
555 +        final CountDownLatch done = new CountDownLatch(1);
556          final ThreadPoolExecutor p = new CustomExecutor(1);
557          try (PoolCleaner cleaner = cleaner(p)) {
558              final CountDownLatch threadStarted = new CountDownLatch(1);
562 –            final CountDownLatch done = new CountDownLatch(1);
563 –            assertFalse(p.isTerminated());
559              p.execute(new CheckedRunnable() {
560                  public void realRun() throws InterruptedException {
561                      assertFalse(p.isTerminated());
562                      threadStarted.countDown();
563 <                    done.await();
563 >                    await(done);
564                  }});
565 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
565 >            await(threadStarted);
566 >            assertFalse(p.isTerminated());
567              assertFalse(p.isTerminating());
568              done.countDown();
569              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 580 | Line 576 | public class ScheduledExecutorSubclassTe
576       * isTerminating is not true when running or when terminated
577       */
578      public void testIsTerminating() throws InterruptedException {
579 +        final CountDownLatch done = new CountDownLatch(1);
580          final ThreadPoolExecutor p = new CustomExecutor(1);
581          try (PoolCleaner cleaner = cleaner(p)) {
582              final CountDownLatch threadStarted = new CountDownLatch(1);
586 –            final CountDownLatch done = new CountDownLatch(1);
583              assertFalse(p.isTerminating());
584              p.execute(new CheckedRunnable() {
585                  public void realRun() throws InterruptedException {
586                      assertFalse(p.isTerminating());
587                      threadStarted.countDown();
588 <                    done.await();
588 >                    await(done);
589                  }});
590              assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
591              assertFalse(p.isTerminating());

Diff Legend

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