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

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.52 by jsr166, Mon Sep 14 03:27:11 2015 UTC vs.
Revision 1.56 by jsr166, Mon Sep 28 02:41:29 2015 UTC

# Line 7 | Line 7
7   */
8  
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.SECONDS;
11  
12   import java.util.ArrayList;
13 + import java.util.HashSet;
14   import java.util.List;
15   import java.util.concurrent.BlockingQueue;
16   import java.util.concurrent.Callable;
# Line 651 | Line 653 | public class ScheduledExecutorTest exten
653      }
654  
655      /**
656 <     * shutdownNow returns a list containing tasks that were not run
656 >     * shutdownNow returns a list containing tasks that were not run,
657 >     * and those tasks are drained from the queue
658       */
659 <    public void testShutdownNow() {
659 >    public void testShutdownNow() throws InterruptedException {
660 >        final int poolSize = 2;
661 >        final int count = 5;
662 >        final AtomicInteger ran = new AtomicInteger(0);
663 >        final ScheduledThreadPoolExecutor p =
664 >            new ScheduledThreadPoolExecutor(poolSize);
665 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
666 >        CheckedRunnable waiter = new CheckedRunnable() { public void realRun() {
667 >            threadsStarted.countDown();
668 >            try {
669 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
670 >            } catch (InterruptedException success) {}
671 >            ran.getAndIncrement();
672 >        }};
673 >        for (int i = 0; i < count; i++)
674 >            p.execute(waiter);
675 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
676 >        final List<Runnable> queuedTasks;
677 >        try {
678 >            queuedTasks = p.shutdownNow();
679 >        } catch (SecurityException ok) {
680 >            return; // Allowed in case test doesn't have privs
681 >        }
682 >        assertTrue(p.isShutdown());
683 >        assertTrue(p.getQueue().isEmpty());
684 >        assertEquals(count - poolSize, queuedTasks.size());
685 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
686 >        assertTrue(p.isTerminated());
687 >        assertEquals(poolSize, ran.get());
688 >    }
689 >
690 >    /**
691 >     * shutdownNow returns a list containing tasks that were not run,
692 >     * and those tasks are drained from the queue
693 >     */
694 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
695          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
696 <        for (int i = 0; i < 5; i++)
697 <            p.schedule(new SmallPossiblyInterruptedRunnable(),
698 <                       LONG_DELAY_MS, MILLISECONDS);
696 >        List<ScheduledFuture> tasks = new ArrayList<>();
697 >        for (int i = 0; i < 3; i++) {
698 >            Runnable r = new NoOpRunnable();
699 >            tasks.add(p.schedule(r, 9, SECONDS));
700 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
701 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
702 >        }
703 >        if (testImplementationDetails)
704 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
705 >        final List<Runnable> queuedTasks;
706          try {
707 <            List<Runnable> l = p.shutdownNow();
663 <            assertTrue(p.isShutdown());
664 <            assertEquals(5, l.size());
707 >            queuedTasks = p.shutdownNow();
708          } catch (SecurityException ok) {
709 <            // Allowed in case test doesn't have privs
667 <        } finally {
668 <            joinPool(p);
709 >            return; // Allowed in case test doesn't have privs
710          }
711 +        assertTrue(p.isShutdown());
712 +        assertTrue(p.getQueue().isEmpty());
713 +        if (testImplementationDetails)
714 +            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
715 +        assertEquals(tasks.size(), queuedTasks.size());
716 +        for (ScheduledFuture task : tasks) {
717 +            assertFalse(task.isDone());
718 +            assertFalse(task.isCancelled());
719 +        }
720 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
721 +        assertTrue(p.isTerminated());
722      }
723  
724      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines