ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.29 by jsr166, Fri Sep 17 16:49:25 2010 UTC vs.
Revision 1.34 by jsr166, Thu Nov 18 19:14:34 2010 UTC

#	Line 259 | Line 259 | public class ForkJoinPoolTest extends JS
259		public void testisQuiescent() throws InterruptedException {
260		ForkJoinPool p = new ForkJoinPool(2);
261		try {
262	+	assertTrue(p.isQuiescent());
263		p.invoke(new FibTask(20));
264		assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265		p.getFactory());
266	<	Thread.sleep(MEDIUM_DELAY_MS);
266	>	Thread.sleep(SMALL_DELAY_MS);
267		assertTrue(p.isQuiescent());
268		assertFalse(p.getAsyncMode());
269		assertEquals(0, p.getActiveThreadCount());
#	Line 315 | Line 316 | public class ForkJoinPoolTest extends JS
316		try {
317		ReentrantLock lock = new ReentrantLock();
318		ManagedLocker locker = new ManagedLocker(lock);
319	<	ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
319	>	ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
320		p.execute(f);
321	<	assertEquals(832040, (int) f.get());
321	>	assertEquals(6765, (int) f.get());
322		} finally {
323		p.shutdownNow(); // don't wait out shutdown
324		}
#	Line 329 | Line 330 | public class ForkJoinPoolTest extends JS
330		public void testPollSubmission() {
331		SubFJP p = new SubFJP();
332		try {
333	<	ForkJoinTask a = p.submit(new MediumRunnable());
334	<	ForkJoinTask b = p.submit(new MediumRunnable());
335	<	ForkJoinTask c = p.submit(new MediumRunnable());
333	>	ForkJoinTask a = p.submit(new ShortRunnable());
334	>	ForkJoinTask b = p.submit(new ShortRunnable());
335	>	ForkJoinTask c = p.submit(new ShortRunnable());
336		ForkJoinTask r = p.pollSubmission();
337		assertTrue(r == a || r == b || r == c);
338		assertFalse(r.isDone());
#	Line 346 | Line 347 | public class ForkJoinPoolTest extends JS
347		public void testDrainTasksTo() {
348		SubFJP p = new SubFJP();
349		try {
350	<	ForkJoinTask a = p.submit(new MediumRunnable());
351	<	ForkJoinTask b = p.submit(new MediumRunnable());
352	<	ForkJoinTask c = p.submit(new MediumRunnable());
350	>	ForkJoinTask a = p.submit(new ShortRunnable());
351	>	ForkJoinTask b = p.submit(new ShortRunnable());
352	>	ForkJoinTask c = p.submit(new ShortRunnable());
353		ArrayList<ForkJoinTask> al = new ArrayList();
354		p.drainTasksTo(al);
355		assertTrue(al.size() > 0);
#	Line 370 | Line 371 | public class ForkJoinPoolTest extends JS
371		public void testExecuteRunnable() throws Throwable {
372		ExecutorService e = new ForkJoinPool(1);
373		try {
374	<	TrackedShortRunnable task = new TrackedShortRunnable();
375	<	assertFalse(task.done);
374	>	TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
375	>	assertFalse(task.isDone());
376		Future<?> future = e.submit(task);
377	<	future.get();
378	<	assertTrue(task.done);
377	>	assertNull(future.get());
378	>	assertTrue(task.isDone());
379	>	assertFalse(future.isCancelled());
380		} finally {
381		joinPool(e);
382		}
#	Line 388 | Line 390 | public class ForkJoinPoolTest extends JS
390		ExecutorService e = new ForkJoinPool(1);
391		try {
392		Future<String> future = e.submit(new StringTask());
393	<	String result = future.get();
394	<	assertSame(TEST_STRING, result);
393	>	assertSame(TEST_STRING, future.get());
394	>	assertTrue(future.isDone());
395	>	assertFalse(future.isCancelled());
396		} finally {
397		joinPool(e);
398		}
#	Line 402 | Line 405 | public class ForkJoinPoolTest extends JS
405		ExecutorService e = new ForkJoinPool(1);
406		try {
407		Future<?> future = e.submit(new NoOpRunnable());
408	<	future.get();
408	>	assertNull(future.get());
409		assertTrue(future.isDone());
410	+	assertFalse(future.isCancelled());
411		} finally {
412		joinPool(e);
413		}
#	Line 416 | Line 420 | public class ForkJoinPoolTest extends JS
420		ExecutorService e = new ForkJoinPool(1);
421		try {
422		Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
423	<	String result = future.get();
424	<	assertSame(TEST_STRING, result);
423	>	assertSame(TEST_STRING, future.get());
424	>	assertTrue(future.isDone());
425	>	assertFalse(future.isCancelled());
426		} finally {
427		joinPool(e);
428		}
#	Line 425 | Line 430 | public class ForkJoinPoolTest extends JS
430
431
432		/**
433	<	* A submitted privileged action to completion
433	>	* A submitted privileged action runs to completion
434		*/
435		public void testSubmitPrivilegedAction() throws Throwable {
436		Policy savedPolicy = null;
#	Line 458 | Line 463 | public class ForkJoinPoolTest extends JS
463		}
464
465		/**
466	<	* A submitted a privileged exception action runs to completion
466	>	* A submitted privileged exception action runs to completion
467		*/
468		public void testSubmitPrivilegedExceptionAction() throws Throwable {
469		Policy savedPolicy = null;
#	Line 530 | Line 535 | public class ForkJoinPoolTest extends JS
535		*/
536		public void testExecuteNullRunnable() {
537		ExecutorService e = new ForkJoinPool(1);
533	–	TrackedShortRunnable task = null;
538		try {
539	<	Future<?> future = e.submit(task);
539	>	Future<?> future = e.submit((Runnable) null);
540		shouldThrow();
541		} catch (NullPointerException success) {
542		} finally {
#	Line 546 | Line 550 | public class ForkJoinPoolTest extends JS
550		*/
551		public void testSubmitNullCallable() {
552		ExecutorService e = new ForkJoinPool(1);
549	–	StringTask t = null;
553		try {
554	<	Future<String> future = e.submit(t);
554	>	Future<String> future = e.submit((Callable) null);
555		shouldThrow();
556		} catch (NullPointerException success) {
557		} finally {

Diff Legend

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