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.28 by jsr166, Mon Oct 11 07:21:32 2010 UTC vs.
Revision 1.31 by jsr166, Sat May 28 22:33:35 2011 UTC

#	Line 1 | Line 1
1		/*
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
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
9		import junit.framework.*;
10		import java.util.*;
11		import java.util.concurrent.*;
#	Line 53 | Line 52 | public class AbstractExecutorServiceTest
52		assertTrue(task.done);
53		}
54
56	–
55		/**
56		* Completed submit(callable) returns result
57		*/
#	Line 84 | Line 82 | public class AbstractExecutorServiceTest
82		assertSame(TEST_STRING, result);
83		}
84
87	–
85		/**
86		* A submitted privileged action runs to completion
87		*/
#	Line 157 | Line 154 | public class AbstractExecutorServiceTest
154		} catch (NullPointerException success) {}
155		}
156
160	–
157		/**
158		* submit(null callable) throws NPE
159		*/
#	Line 384 | Line 380 | public class AbstractExecutorServiceTest
380		}
381		}
382
387	–
383		/**
384		* timed invokeAny(null) throws NPE
385		*/
#	Line 589 | Line 584 | public class AbstractExecutorServiceTest
584		try {
585		List<Callable<String>> l = new ArrayList<Callable<String>>();
586		l.add(new StringTask());
587	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
587	>	l.add(Executors.callable(possiblyInterruptedRunnable(2 * SHORT_DELAY_MS), TEST_STRING));
588		l.add(new StringTask());
589		List<Future<String>> futures =
590	<	e.invokeAll(l, SMALL_DELAY_MS, MILLISECONDS);
590	>	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
591		assertEquals(3, futures.size());
592		Iterator<Future<String>> it = futures.iterator();
593		Future<String> f1 = it.next();
#	Line 601 | Line 596 | public class AbstractExecutorServiceTest
596		assertTrue(f1.isDone());
597		assertFalse(f1.isCancelled());
598		assertTrue(f2.isDone());
599	+	assertFalse(f2.isCancelled());
600		assertTrue(f3.isDone());
601		assertTrue(f3.isCancelled());
602		} finally {

Diff Legend

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