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.90 by jsr166, Tue Oct 6 05:22:25 2015 UTC vs.
Revision 1.91 by jsr166, Tue Oct 6 05:30:44 2015 UTC

# Line 262 | Line 262 | public class ThreadPoolExecutorSubclassT
262                      assertEquals(1, p.getActiveCount());
263                      await(done);
264                  }});
265 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
265 >            await(threadStarted);
266              assertEquals(1, p.getActiveCount());
267              done.countDown();
268          }
# Line 534 | Line 534 | public class ThreadPoolExecutorSubclassT
534                      assertEquals(1, p.getPoolSize());
535                      await(done);
536                  }});
537 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
537 >            await(threadStarted);
538              assertEquals(1, p.getPoolSize());
539          }
540      }
# Line 558 | Line 558 | public class ThreadPoolExecutorSubclassT
558                      threadStarted.countDown();
559                      await(done);
560                  }});
561 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
561 >            await(threadStarted);
562              assertEquals(1, p.getTaskCount());
563              assertEquals(0, p.getCompletedTaskCount());
564              for (int i = 0; i < TASKS; i++) {
# Line 610 | Line 610 | public class ThreadPoolExecutorSubclassT
610                      threadStarted.countDown();
611                      await(done);
612                  }});
613 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
613 >            await(threadStarted);
614              assertFalse(p.isTerminating());
615              done.countDown();
616              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 638 | Line 638 | public class ThreadPoolExecutorSubclassT
638                      threadStarted.countDown();
639                      await(done);
640                  }});
641 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
641 >            await(threadStarted);
642              assertFalse(p.isTerminating());
643              done.countDown();
644              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 672 | Line 672 | public class ThreadPoolExecutorSubclassT
672                  tasks[i] = new FutureTask(task);
673                  p.execute(tasks[i]);
674              }
675 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
675 >            await(threadStarted);
676              assertSame(q, p.getQueue());
677              assertFalse(q.contains(tasks[0]));
678              assertTrue(q.contains(tasks[tasks.length - 1]));
# Line 702 | Line 702 | public class ThreadPoolExecutorSubclassT
702                      }};
703                  p.execute(tasks[i]);
704              }
705 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
705 >            await(threadStarted);
706              assertFalse(p.remove(tasks[0]));
707              assertTrue(q.contains(tasks[4]));
708              assertTrue(q.contains(tasks[3]));
# Line 739 | Line 739 | public class ThreadPoolExecutorSubclassT
739                  tasks[i] = new FutureTask(task);
740                  p.execute(tasks[i]);
741              }
742 <            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
742 >            await(threadStarted);
743              assertEquals(tasks.length, p.getTaskCount());
744              assertEquals(tasks.length - 1, q.size());
745              assertEquals(1L, p.getActiveCount());
# Line 2012 | Line 2012 | public class ThreadPoolExecutorSubclassT
2012                  }};
2013                  futures.add(e.submit(r));
2014              }
2015 <            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2015 >            await(blockerStarted);
2016              for (Future<?> future : futures) future.cancel(false);
2017              for (Future<?> future : futures) {
2018                  try {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines