ViewVC Help

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

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

Comparing jsr166/src/test/tck/RecursiveActionTest.java (file contents):
Revision 1.2 by jsr166, Fri Jul 31 23:37:31 2009 UTC vs.
Revision 1.6 by jsr166, Tue Aug 4 10:13:48 2009 UTC

#	Line 135 | Line 135 | public class RecursiveActionTest extends
135		threadAssertTrue(f.result == 21);
136		threadAssertTrue(f.isDone());
137		} catch (Exception ex) {
138	<	unexpectedException();
138	>	unexpectedException(ex);
139		}
140		}
141		};
#	Line 155 | Line 155 | public class RecursiveActionTest extends
155		threadAssertTrue(f.result == 21);
156		threadAssertTrue(f.isDone());
157		} catch (Exception ex) {
158	<	unexpectedException();
158	>	unexpectedException(ex);
159		}
160		}
161		};
#	Line 172 | Line 172 | public class RecursiveActionTest extends
172		FibAction f = new FibAction(8);
173		f.fork();
174		f.get(5L, null);
175	+	shouldThrow();
176		} catch (NullPointerException success) {
177		} catch (Exception ex) {
178	<	unexpectedException();
178	>	unexpectedException(ex);
179		}
180		}
181		};
#	Line 268 | Line 269 | public class RecursiveActionTest extends
269		}
270
271		/**
272	<	* quietelyInvoke task returns when task completes abnormally
272	>	* quietlyInvoke task returns when task completes abnormally
273		*/
274		public void testAbnormalQuietlyInvoke() {
275		RecursiveAction a = new RecursiveAction() {
#	Line 310 | Line 311 | public class RecursiveActionTest extends
311		f.fork();
312		f.get();
313		shouldThrow();
314	<	} catch (Exception success) {
314	>	} catch (ExecutionException success) {
315	>	} catch (Exception ex) {
316	>	unexpectedException(ex);
317		}
318		}
319		};
#	Line 328 | Line 331 | public class RecursiveActionTest extends
331		f.fork();
332		f.get(5L, TimeUnit.SECONDS);
333		shouldThrow();
334	<	} catch (Exception success) {
334	>	} catch (ExecutionException success) {
335	>	} catch (Exception ex) {
336	>	unexpectedException(ex);
337		}
338		}
339		};
#	Line 440 | Line 445 | public class RecursiveActionTest extends
445		f.fork();
446		f.get();
447		shouldThrow();
448	<	} catch (Exception success) {
448	>	} catch (CancellationException success) {
449	>	} catch (Exception ex) {
450	>	unexpectedException(ex);
451		}
452		}
453		};
#	Line 459 | Line 466 | public class RecursiveActionTest extends
466		f.fork();
467		f.get(5L, TimeUnit.SECONDS);
468		shouldThrow();
469	<	} catch (Exception success) {
469	>	} catch (CancellationException success) {
470	>	} catch (Exception ex) {
471	>	unexpectedException(ex);
472		}
473		}
474		};
#	Line 825 | Line 834 | public class RecursiveActionTest extends
834		}
835
836		/**
837	<	* invokeAll(collection)  throws exception if any task does
837	>	* invokeAll(collection) throws exception if any task does
838		*/
839		public void testAbnormalInvokeAllCollection() {
840		RecursiveAction a = new RecursiveAction() {

Diff Legend

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