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.51 by jsr166, Tue Oct 6 05:03:23 2015 UTC vs.
Revision 1.54 by jsr166, Tue Oct 6 05:30:44 2015 UTC

# Line 437 | Line 437 | public class ScheduledExecutorSubclassTe
437                          await(done);
438                          assertEquals(THREADS, p.getLargestPoolSize());
439                      }});
440 <            assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
440 >            await(threadsStarted);
441              assertEquals(THREADS, p.getLargestPoolSize());
442          }
443          assertEquals(THREADS, p.getLargestPoolSize());
# Line 587 | Line 587 | public class ScheduledExecutorSubclassTe
587                      threadStarted.countDown();
588                      await(done);
589                  }});
590 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
590 >            await(threadStarted);
591              assertFalse(p.isTerminating());
592              done.countDown();
593              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 610 | Line 610 | public class ScheduledExecutorSubclassTe
610                  Runnable r = new CheckedRunnable() {
611                      public void realRun() throws InterruptedException {
612                          threadStarted.countDown();
613 <                        done.await();
613 >                        await(done);
614                      }};
615                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
616              }
617 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
617 >            await(threadStarted);
618              BlockingQueue<Runnable> q = p.getQueue();
619              assertTrue(q.contains(tasks[tasks.length - 1]));
620              assertFalse(q.contains(tasks[0]));
# Line 635 | Line 635 | public class ScheduledExecutorSubclassTe
635                  Runnable r = new CheckedRunnable() {
636                      public void realRun() throws InterruptedException {
637                          threadStarted.countDown();
638 <                        done.await();
638 >                        await(done);
639                      }};
640                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
641              }
642 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
642 >            await(threadStarted);
643              BlockingQueue<Runnable> q = p.getQueue();
644              assertFalse(p.remove((Runnable)tasks[0]));
645              assertTrue(q.contains((Runnable)tasks[4]));
# Line 702 | Line 702 | public class ScheduledExecutorSubclassTe
702          }};
703          for (int i = 0; i < count; i++)
704              p.execute(waiter);
705 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
705 >        await(threadsStarted);
706          assertEquals(poolSize, p.getActiveCount());
707          assertEquals(0, p.getCompletedTaskCount());
708          final List<Runnable> queuedTasks;

Diff Legend

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