ViewVC Help

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

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

Comparing jsr166/src/test/tck/ExecutorCompletionServiceTest.java (file contents):
Revision 1.4 by dl, Fri Jul 8 20:00:10 2005 UTC vs.
Revision 1.11 by jsr166, Wed Aug 25 00:07:03 2010 UTC

#	Line 2 | Line 2
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4		* http://creativecommons.org/licenses/publicdomain
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9
10		import junit.framework.*;
11		import java.util.*;
12		import java.util.concurrent.*;
13	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
14	+	import java.util.concurrent.atomic.*;
15		import java.math.BigInteger;
16		import java.security.*;
17
18	<	public class ExecutorCompletionServiceTest extends JSR166TestCase{
18	>	public class ExecutorCompletionServiceTest extends JSR166TestCase {
19		public static void main(String[] args) {
20	<	junit.textui.TestRunner.run (suite());
20	>	junit.textui.TestRunner.run(suite());
21		}
22		public static Test suite() {
23		return new TestSuite(ExecutorCompletionServiceTest.class);
#	Line 24 | Line 26 | public class ExecutorCompletionServiceTe
26
27		/**
28		* Creating a new ECS with null Executor throw NPE
29	<	*/
29	>	*/
30		public void testConstructorNPE() {
31		try {
32		ExecutorCompletionService ecs = new ExecutorCompletionService(null);
33		shouldThrow();
34	<	} catch (NullPointerException success) {
33	<	}
34	>	} catch (NullPointerException success) {}
35		}
36
37		/**
38		* Creating a new ECS with null queue throw NPE
39	<	*/
39	>	*/
40		public void testConstructorNPE2() {
41		try {
42		ExecutorService e = Executors.newCachedThreadPool();
43		ExecutorCompletionService ecs = new ExecutorCompletionService(e, null);
44		shouldThrow();
45	<	} catch (NullPointerException success) {
45	<	}
45	>	} catch (NullPointerException success) {}
46		}
47
48		/**
49		* Submitting a null callable throws NPE
50	<	*/
50	>	*/
51		public void testSubmitNPE() {
52		ExecutorService e = Executors.newCachedThreadPool();
53		ExecutorCompletionService ecs = new ExecutorCompletionService(e);
#	Line 63 | Line 63 | public class ExecutorCompletionServiceTe
63
64		/**
65		* Submitting a null runnable throws NPE
66	<	*/
66	>	*/
67		public void testSubmitNPE2() {
68		ExecutorService e = Executors.newCachedThreadPool();
69		ExecutorCompletionService ecs = new ExecutorCompletionService(e);
#	Line 79 | Line 79 | public class ExecutorCompletionServiceTe
79
80		/**
81		* A taken submitted task is completed
82	<	*/
83	<	public void testTake() {
82	>	*/
83	>	public void testTake() throws InterruptedException {
84		ExecutorService e = Executors.newCachedThreadPool();
85		ExecutorCompletionService ecs = new ExecutorCompletionService(e);
86		try {
#	Line 88 | Line 88 | public class ExecutorCompletionServiceTe
88		ecs.submit(c);
89		Future f = ecs.take();
90		assertTrue(f.isDone());
91	–	} catch (Exception ex) {
92	–	unexpectedException();
91		} finally {
92		joinPool(e);
93		}
#	Line 97 | Line 95 | public class ExecutorCompletionServiceTe
95
96		/**
97		* Take returns the same future object returned by submit
98	<	*/
99	<	public void testTake2() {
98	>	*/
99	>	public void testTake2() throws InterruptedException {
100		ExecutorService e = Executors.newCachedThreadPool();
101		ExecutorCompletionService ecs = new ExecutorCompletionService(e);
102		try {
#	Line 106 | Line 104 | public class ExecutorCompletionServiceTe
104		Future f1 = ecs.submit(c);
105		Future f2 = ecs.take();
106		assertSame(f1, f2);
109	–	} catch (Exception ex) {
110	–	unexpectedException();
107		} finally {
108		joinPool(e);
109		}
#	Line 115 | Line 111 | public class ExecutorCompletionServiceTe
111
112		/**
113		* If poll returns non-null, the returned task is completed
114	<	*/
115	<	public void testPoll1() {
114	>	*/
115	>	public void testPoll1() throws InterruptedException {
116		ExecutorService e = Executors.newCachedThreadPool();
117		ExecutorCompletionService ecs = new ExecutorCompletionService(e);
118		try {
#	Line 131 | Line 127 | public class ExecutorCompletionServiceTe
127		break;
128		}
129		}
134	–	} catch (Exception ex) {
135	–	unexpectedException();
130		} finally {
131		joinPool(e);
132		}
#	Line 140 | Line 134 | public class ExecutorCompletionServiceTe
134
135		/**
136		* If timed poll returns non-null, the returned task is completed
137	<	*/
138	<	public void testPoll2() {
137	>	*/
138	>	public void testPoll2() throws InterruptedException {
139		ExecutorService e = Executors.newCachedThreadPool();
140		ExecutorCompletionService ecs = new ExecutorCompletionService(e);
141		try {
142		assertNull(ecs.poll());
143		Callable c = new StringTask();
144		ecs.submit(c);
145	<	Future f = ecs.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
146	<	if (f != null)
145	>	Future f = ecs.poll(SHORT_DELAY_MS, MILLISECONDS);
146	>	if (f != null)
147		assertTrue(f.isDone());
154	–	} catch (Exception ex) {
155	–	unexpectedException();
148		} finally {
149		joinPool(e);
150		}
#	Line 161 | Line 153 | public class ExecutorCompletionServiceTe
153		* Submitting to underlying AES that overrides newTaskFor(Callable)
154		* returns and eventually runs Future returned by newTaskFor.
155		*/
156	<	public void testNewTaskForCallable() {
156	>	public void testNewTaskForCallable() throws InterruptedException {
157		final AtomicBoolean done = new AtomicBoolean(false);
158		class MyCallableFuture<V> extends FutureTask<V> {
159		MyCallableFuture(Callable<V> c) { super(c); }
#	Line 185 | Line 177 | public class ExecutorCompletionServiceTe
177		Future f2 = ecs.take();
178		assertSame("submit and take must return same objects", f1, f2);
179		assertTrue("completed task must have set done", done.get());
188	–	} catch (Exception ex) {
189	–	unexpectedException();
180		} finally {
181		joinPool(e);
182		}
#	Line 196 | Line 186 | public class ExecutorCompletionServiceTe
186		* Submitting to underlying AES that overrides newTaskFor(Runnable,T)
187		* returns and eventually runs Future returned by newTaskFor.
188		*/
189	<	public void testNewTaskForRunnable() {
189	>	public void testNewTaskForRunnable() throws InterruptedException {
190		final AtomicBoolean done = new AtomicBoolean(false);
191		class MyRunnableFuture<V> extends FutureTask<V> {
192		MyRunnableFuture(Runnable t, V r) { super(t, r); }
#	Line 213 | Line 203 | public class ExecutorCompletionServiceTe
203		new ExecutorCompletionService<String>(e);
204		try {
205		assertNull(ecs.poll());
206	<	Callable<String> c = new StringTask();
207	<	Future f1 = ecs.submit(c);
206	>	Runnable r = new NoOpRunnable();
207	>	Future f1 = ecs.submit(r, null);
208		assertTrue("submit must return MyRunnableFuture",
209		f1 instanceof MyRunnableFuture);
210		Future f2 = ecs.take();
211		assertSame("submit and take must return same objects", f1, f2);
212		assertTrue("completed task must have set done", done.get());
223	–	} catch (Exception ex) {
224	–	unexpectedException();
213		} finally {
214		joinPool(e);
215		}
216		}
217
230	–
231	–
218		}

Diff Legend

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