ViewVC Help

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

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

Comparing jsr166/src/test/tck/FutureTaskTest.java (file contents):
Revision 1.26 by jsr166, Tue May 31 16:16:23 2011 UTC vs.
Revision 1.28 by jsr166, Sat Jun 18 14:31:51 2011 UTC

#	Line 148 | Line 148 | public class FutureTaskTest extends JSR1
148		checkCancelled(task);
149		}
150
151	–
151		/**
152		* setting value causes get to return it
153		*/
#	Line 420 | Line 419 | public class FutureTaskTest extends JSR1
419		checkCancelled(task);
420		}
421
423	–
422		/**
423		* A runtime exception in task causes get to throw ExecutionException
424		*/
#	Line 459 | Line 457 | public class FutureTaskTest extends JSR1
457		}
458		}
459
462	–
460		/**
461		* Interrupting a waiting get causes it to throw InterruptedException
462		*/
#	Line 474 | Line 471 | public class FutureTaskTest extends JSR1
471
472		threadStarted.await();
473		t.interrupt();
474	<	awaitTermination(t, MEDIUM_DELAY_MS);
474	>	awaitTermination(t);
475		checkNotDone(task);
476		}
477
#	Line 487 | Line 484 | public class FutureTaskTest extends JSR1
484		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
485		public void realRun() throws Exception {
486		threadStarted.countDown();
487	<	task.get(LONG_DELAY_MS, MILLISECONDS);
487	>	task.get(2*LONG_DELAY_MS, MILLISECONDS);
488		}});
489
490		threadStarted.await();
491		t.interrupt();
492	<	awaitTermination(t, MEDIUM_DELAY_MS);
492	>	awaitTermination(t);
493		checkNotDone(task);
494		}
495

Diff Legend

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