ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ScheduledExecutorSubclassTest.java

Comparing jsr166/src/test/tck/ScheduledExecutorSubclassTest.java (file contents):
Revision 1.33 by jsr166, Wed Sep 25 07:39:17 2013 UTC vs.
Revision 1.39 by jsr166, Mon Sep 28 02:32:57 2015 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	–	import junit.framework.*;
8	–	import java.util.*;
9	–	import java.util.concurrent.*;
7		import static java.util.concurrent.TimeUnit.MILLISECONDS;
8	+	import static java.util.concurrent.TimeUnit.SECONDS;
9	+
10	+	import java.util.ArrayList;
11	+	import java.util.HashSet;
12	+	import java.util.List;
13	+	import java.util.concurrent.BlockingQueue;
14	+	import java.util.concurrent.Callable;
15	+	import java.util.concurrent.CancellationException;
16	+	import java.util.concurrent.CountDownLatch;
17	+	import java.util.concurrent.Delayed;
18	+	import java.util.concurrent.ExecutionException;
19	+	import java.util.concurrent.Executors;
20	+	import java.util.concurrent.ExecutorService;
21	+	import java.util.concurrent.Future;
22	+	import java.util.concurrent.RejectedExecutionException;
23	+	import java.util.concurrent.RejectedExecutionHandler;
24	+	import java.util.concurrent.RunnableScheduledFuture;
25	+	import java.util.concurrent.ScheduledFuture;
26	+	import java.util.concurrent.ScheduledThreadPoolExecutor;
27	+	import java.util.concurrent.ThreadFactory;
28	+	import java.util.concurrent.ThreadPoolExecutor;
29	+	import java.util.concurrent.TimeoutException;
30	+	import java.util.concurrent.TimeUnit;
31		import java.util.concurrent.atomic.AtomicInteger;
32
33	+	import junit.framework.Test;
34	+	import junit.framework.TestSuite;
35	+
36		public class ScheduledExecutorSubclassTest extends JSR166TestCase {
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run(suite());
38	>	main(suite(), args);
39		}
40		public static Test suite() {
41		return new TestSuite(ScheduledExecutorSubclassTest.class);
#	Line 684 | Line 707 | public class ScheduledExecutorSubclassTe
707		}
708
709		/**
710	<	* shutdownNow returns a list containing tasks that were not run
710	>	* shutdownNow returns a list containing tasks that were not run,
711	>	* and those tasks are drained from the queue
712		*/
713	<	public void testShutdownNow() {
713	>	public void testShutdownNow_delayedTasks() throws InterruptedException {
714		CustomExecutor p = new CustomExecutor(1);
715	<	for (int i = 0; i < 5; i++)
716	<	p.schedule(new SmallPossiblyInterruptedRunnable(),
717	<	LONG_DELAY_MS, MILLISECONDS);
715	>	List<ScheduledFuture> tasks = new ArrayList<>();
716	>	for (int i = 0; i < 3; i++) {
717	>	Runnable r = new NoOpRunnable();
718	>	tasks.add(p.schedule(r, 9, SECONDS));
719	>	tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
720	>	tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
721	>	}
722	>	if (testImplementationDetails)
723	>	assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
724	>	final List<Runnable> queuedTasks;
725		try {
726	<	List<Runnable> l = p.shutdownNow();
696	<	assertTrue(p.isShutdown());
697	<	assertEquals(5, l.size());
726	>	queuedTasks = p.shutdownNow();
727		} catch (SecurityException ok) {
728	<	// Allowed in case test doesn't have privs
700	<	} finally {
701	<	joinPool(p);
728	>	return; // Allowed in case test doesn't have privs
729		}
730	+	assertTrue(p.isShutdown());
731	+	assertTrue(p.getQueue().isEmpty());
732	+	if (testImplementationDetails)
733	+	assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
734	+	assertEquals(tasks.size(), queuedTasks.size());
735	+	for (ScheduledFuture task : tasks) {
736	+	assertFalse(((CustomTask)task).ran);
737	+	assertFalse(task.isDone());
738	+	assertFalse(task.isCancelled());
739	+	}
740	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
741	+	assertTrue(p.isTerminated());
742		}
743
744		/**
#	Line 1220 | Line 1259 | public class ScheduledExecutorSubclassTe
1259		public void testTimedInvokeAll6() throws Exception {
1260		ExecutorService e = new CustomExecutor(2);
1261		try {
1262	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1263	<	l.add(new StringTask());
1264	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1265	<	l.add(new StringTask());
1266	<	List<Future<String>> futures =
1267	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1268	<	assertEquals(l.size(), futures.size());
1269	<	for (Future future : futures)
1270	<	assertTrue(future.isDone());
1271	<	assertFalse(futures.get(0).isCancelled());
1272	<	assertTrue(futures.get(1).isCancelled());
1262	>	for (long timeout = timeoutMillis();;) {
1263	>	List<Callable<String>> tasks = new ArrayList<>();
1264	>	tasks.add(new StringTask("0"));
1265	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1266	>	tasks.add(new StringTask("2"));
1267	>	long startTime = System.nanoTime();
1268	>	List<Future<String>> futures =
1269	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1270	>	assertEquals(tasks.size(), futures.size());
1271	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1272	>	for (Future future : futures)
1273	>	assertTrue(future.isDone());
1274	>	assertTrue(futures.get(1).isCancelled());
1275	>	try {
1276	>	assertEquals("0", futures.get(0).get());
1277	>	assertEquals("2", futures.get(2).get());
1278	>	break;
1279	>	} catch (CancellationException retryWithLongerTimeout) {
1280	>	timeout *= 2;
1281	>	if (timeout >= LONG_DELAY_MS / 2)
1282	>	fail("expected exactly one task to be cancelled");
1283	>	}
1284	>	}
1285		} finally {
1286		joinPool(e);
1287		}

Diff Legend

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