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.13 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.14 by jsr166, Mon Nov 16 05:30:07 2009 UTC

#	Line 174 | Line 174 | public class FutureTaskTest extends JSR1
174		t.join();
175		assertTrue(task.isDone());
176		assertTrue(task.isCancelled());
177	<	} catch (InterruptedException e){
177	>	} catch (InterruptedException e) {
178		unexpectedException();
179		}
180		}
#	Line 203 | Line 203 | public class FutureTaskTest extends JSR1
203		t.join();
204		assertTrue(task.isDone());
205		assertTrue(task.isCancelled());
206	<	} catch (InterruptedException e){
206	>	} catch (InterruptedException e) {
207		unexpectedException();
208		}
209		}
#	Line 216 | Line 216 | public class FutureTaskTest extends JSR1
216		public Object call() {
217		try {
218		Thread.sleep(MEDIUM_DELAY_MS);
219	<	} catch (InterruptedException e){
219	>	} catch (InterruptedException e) {
220		threadUnexpectedException();
221		}
222		return Boolean.TRUE;
#	Line 226 | Line 226 | public class FutureTaskTest extends JSR1
226		public void run() {
227		try {
228		ft.get();
229	<	} catch (Exception e){
229	>	} catch (Exception e) {
230		threadUnexpectedException();
231		}
232		}
#	Line 240 | Line 240 | public class FutureTaskTest extends JSR1
240		t.join();
241		assertTrue(ft.isDone());
242		assertFalse(ft.isCancelled());
243	<	} catch (InterruptedException e){
243	>	} catch (InterruptedException e) {
244		unexpectedException();
245
246		}
#	Line 254 | Line 254 | public class FutureTaskTest extends JSR1
254		public Object call() {
255		try {
256		Thread.sleep(MEDIUM_DELAY_MS);
257	<	} catch (InterruptedException e){
257	>	} catch (InterruptedException e) {
258		threadUnexpectedException();
259		}
260		return Boolean.TRUE;
#	Line 265 | Line 265 | public class FutureTaskTest extends JSR1
265		try {
266		ft.get(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
267		} catch (TimeoutException success) {
268	<	} catch (Exception e){
268	>	} catch (Exception e) {
269		threadUnexpectedException();
270		}
271		}
#	Line 278 | Line 278 | public class FutureTaskTest extends JSR1
278		t.join();
279		assertTrue(ft.isDone());
280		assertFalse(ft.isCancelled());
281	<	} catch (InterruptedException e){
281	>	} catch (InterruptedException e) {
282		unexpectedException();
283
284		}
#	Line 305 | Line 305 | public class FutureTaskTest extends JSR1
305		ft.get(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
306		threadShouldThrow();
307		} catch (CancellationException success) {}
308	<	catch (Exception e){
308	>	catch (Exception e) {
309		threadUnexpectedException();
310		}
311		}
#	Line 317 | Line 317 | public class FutureTaskTest extends JSR1
317		ft.cancel(true);
318		t1.join();
319		t2.join();
320	<	} catch (InterruptedException ie){
320	>	} catch (InterruptedException ie) {
321		unexpectedException();
322		}
323		}
#	Line 331 | Line 331 | public class FutureTaskTest extends JSR1
331		try {
332		Thread.sleep(MEDIUM_DELAY_MS);
333		threadShouldThrow();
334	<	} catch (InterruptedException e){
334	>	} catch (InterruptedException e) {
335		}
336		return Boolean.TRUE;
337		}
#	Line 342 | Line 342 | public class FutureTaskTest extends JSR1
342		try {
343		ft.get();
344		threadShouldThrow();
345	<	} catch (CancellationException success){
345	>	} catch (CancellationException success) {
346		}
347	<	catch (Exception e){
347	>	catch (Exception e) {
348		threadUnexpectedException();
349		}
350		}
#	Line 356 | Line 356 | public class FutureTaskTest extends JSR1
356		ft.cancel(true);
357		t1.join();
358		t2.join();
359	<	} catch (InterruptedException success){
359	>	} catch (InterruptedException success) {
360		unexpectedException();
361		}
362		}
#	Line 376 | Line 376 | public class FutureTaskTest extends JSR1
376		ft.run();
377		ft.get();
378		shouldThrow();
379	<	} catch (ExecutionException success){
379	>	} catch (ExecutionException success) {
380		}
381	<	catch (Exception e){
381	>	catch (Exception e) {
382		unexpectedException();
383		}
384		}
#	Line 399 | Line 399 | public class FutureTaskTest extends JSR1
399		shouldThrow();
400		} catch (ExecutionException success) {
401		} catch (TimeoutException success) { } // unlikely but OK
402	<	catch (Exception e){
402	>	catch (Exception e) {
403		unexpectedException();
404		}
405		}
#	Line 415 | Line 415 | public class FutureTaskTest extends JSR1
415		try {
416		ft.get();
417		threadShouldThrow();
418	<	} catch (InterruptedException success){
419	<	} catch (Exception e){
418	>	} catch (InterruptedException success) {
419	>	} catch (Exception e) {
420		threadUnexpectedException();
421		}
422		}
#	Line 426 | Line 426 | public class FutureTaskTest extends JSR1
426		Thread.sleep(SHORT_DELAY_MS);
427		t.interrupt();
428		t.join();
429	<	} catch (Exception e){
429	>	} catch (Exception e) {
430		unexpectedException();
431		}
432		}
#	Line 441 | Line 441 | public class FutureTaskTest extends JSR1
441		try {
442		ft.get(LONG_DELAY_MS,TimeUnit.MILLISECONDS);
443		threadShouldThrow();
444	<	} catch (InterruptedException success){}
445	<	catch (Exception e){
444	>	} catch (InterruptedException success) {}
445	>	catch (Exception e) {
446		threadUnexpectedException();
447		}
448		}
#	Line 452 | Line 452 | public class FutureTaskTest extends JSR1
452		Thread.sleep(SHORT_DELAY_MS);
453		t.interrupt();
454		t.join();
455	<	} catch (Exception e){
455	>	} catch (Exception e) {
456		unexpectedException();
457		}
458		}
#	Line 465 | Line 465 | public class FutureTaskTest extends JSR1
465		FutureTask ft = new FutureTask(new NoOpCallable());
466		ft.get(1,TimeUnit.MILLISECONDS);
467		shouldThrow();
468	<	} catch (TimeoutException success){}
469	<	catch (Exception success){
468	>	} catch (TimeoutException success) {}
469	>	catch (Exception success) {
470		unexpectedException();
471		}
472		}

Diff Legend

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