ViewVC Help

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

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

Comparing jsr166/src/test/tck/AbstractExecutorServiceTest.java (file contents):
Revision 1.30 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.37 by jsr166, Sat Apr 25 04:55:30 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
10	–	import junit.framework.*;
11	–	import java.util.*;
12	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.math.BigInteger;
11	<	import java.security.*;
10	>
11	>	import java.security.PrivilegedAction;
12	>	import java.security.PrivilegedExceptionAction;
13	>	import java.util.ArrayList;
14	>	import java.util.Collections;
15	>	import java.util.List;
16	>	import java.util.concurrent.AbstractExecutorService;
17	>	import java.util.concurrent.ArrayBlockingQueue;
18	>	import java.util.concurrent.Callable;
19	>	import java.util.concurrent.CountDownLatch;
20	>	import java.util.concurrent.ExecutionException;
21	>	import java.util.concurrent.Executors;
22	>	import java.util.concurrent.ExecutorService;
23	>	import java.util.concurrent.Future;
24	>	import java.util.concurrent.ThreadPoolExecutor;
25	>	import java.util.concurrent.TimeUnit;
26	>	import java.util.concurrent.atomic.AtomicBoolean;
27	>
28	>	import junit.framework.Test;
29	>	import junit.framework.TestSuite;
30
31		public class AbstractExecutorServiceTest extends JSR166TestCase {
32		public static void main(String[] args) {
33	<	junit.textui.TestRunner.run(suite());
33	>	main(suite(), args);
34		}
35		public static Test suite() {
36		return new TestSuite(AbstractExecutorServiceTest.class);
#	Line 46 | Line 60 | public class AbstractExecutorServiceTest
60		*/
61		public void testExecuteRunnable() throws Exception {
62		ExecutorService e = new DirectExecutorService();
63	<	TrackedShortRunnable task = new TrackedShortRunnable();
64	<	assertFalse(task.done);
65	<	Future<?> future = e.submit(task);
66	<	future.get();
67	<	assertTrue(task.done);
63	>	final AtomicBoolean done = new AtomicBoolean(false);
64	>	Future<?> future = e.submit(new CheckedRunnable() {
65	>	public void realRun() {
66	>	done.set(true);
67	>	}});
68	>	assertNull(future.get());
69	>	assertNull(future.get(0, MILLISECONDS));
70	>	assertTrue(done.get());
71	>	assertTrue(future.isDone());
72	>	assertFalse(future.isCancelled());
73		}
74
56	–
75		/**
76		* Completed submit(callable) returns result
77		*/
#	Line 84 | Line 102 | public class AbstractExecutorServiceTest
102		assertSame(TEST_STRING, result);
103		}
104
87	–
105		/**
106		* A submitted privileged action runs to completion
107		*/
#	Line 150 | Line 167 | public class AbstractExecutorServiceTest
167		* execute(null runnable) throws NPE
168		*/
169		public void testExecuteNullRunnable() {
170	+	ExecutorService e = new DirectExecutorService();
171		try {
154	–	ExecutorService e = new DirectExecutorService();
172		e.submit((Runnable) null);
173		shouldThrow();
174		} catch (NullPointerException success) {}
175		}
176
160	–
177		/**
178		* submit(null callable) throws NPE
179		*/
180		public void testSubmitNullCallable() {
181	+	ExecutorService e = new DirectExecutorService();
182		try {
166	–	ExecutorService e = new DirectExecutorService();
183		e.submit((Callable) null);
184		shouldThrow();
185		} catch (NullPointerException success) {}
#	Line 211 | Line 227 | public class AbstractExecutorServiceTest
227		new ArrayBlockingQueue<Runnable>(10));
228
229		Callable c = new Callable() {
230	<	public Object call() { return 5/0; }};
230	>	public Object call() { throw new ArithmeticException(); }};
231
232		try {
233		p.submit(c).get();
#	Line 255 | Line 271 | public class AbstractExecutorServiceTest
271		*/
272		public void testInvokeAny3() throws Exception {
273		ExecutorService e = new DirectExecutorService();
274	<	List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
275	<	l.add(new Callable<Integer>() {
276	<	public Integer call() { return 5/0; }});
274	>	List<Callable<Long>> l = new ArrayList<Callable<Long>>();
275	>	l.add(new Callable<Long>() {
276	>	public Long call() { throw new ArithmeticException(); }});
277		l.add(null);
278		try {
279		e.invokeAny(l);
#	Line 384 | Line 400 | public class AbstractExecutorServiceTest
400		}
401		}
402
387	–
403		/**
404		* timed invokeAny(null) throws NPE
405		*/
#	Line 434 | Line 449 | public class AbstractExecutorServiceTest
449		*/
450		public void testTimedInvokeAny3() throws Exception {
451		ExecutorService e = new DirectExecutorService();
452	<	List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
453	<	l.add(new Callable<Integer>() {
454	<	public Integer call() { return 5/0; }});
452	>	List<Callable<Long>> l = new ArrayList<Callable<Long>>();
453	>	l.add(new Callable<Long>() {
454	>	public Long call() { throw new ArithmeticException(); }});
455		l.add(null);
456		try {
457		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 593 | Line 608 | public class AbstractExecutorServiceTest
608		l.add(new StringTask());
609		List<Future<String>> futures =
610		e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
611	<	assertEquals(3, futures.size());
612	<	Iterator<Future<String>> it = futures.iterator();
613	<	Future<String> f1 = it.next();
614	<	Future<String> f2 = it.next();
615	<	Future<String> f3 = it.next();
616	<	assertTrue(f1.isDone());
602	<	assertFalse(f1.isCancelled());
603	<	assertTrue(f2.isDone());
604	<	assertFalse(f2.isCancelled());
605	<	assertTrue(f3.isDone());
606	<	assertTrue(f3.isCancelled());
611	>	assertEquals(l.size(), futures.size());
612	>	for (Future future : futures)
613	>	assertTrue(future.isDone());
614	>	assertFalse(futures.get(0).isCancelled());
615	>	assertFalse(futures.get(1).isCancelled());
616	>	assertTrue(futures.get(2).isCancelled());
617		} finally {
618		joinPool(e);
619		}

Diff Legend

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