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.49 by jsr166, Sun Oct 22 01:26:49 2017 UTC vs.
Revision 1.52 by jsr166, Sun Jul 22 21:04:56 2018 UTC

#	Line 51 | Line 51 | public class FutureTaskTest extends JSR1
51		exInfo = CancellationException.class;
52		} catch (ExecutionException t) {
53		exInfo = t.getCause();
54	<	} catch (Exception t) {
54	>	} catch (Throwable t) {
55		threadUnexpectedException(t);
56		}
57
#	Line 60 | Line 60 | public class FutureTaskTest extends JSR1
60		pf.run();
61		pf.runAndReset();
62		assertEquals(savedRunCount, pf.runCount());
63	+	Object r2 = null;
64		try {
65	<	assertSame(r, f.get());
65	>	r2 = f.get();
66		} catch (CancellationException t) {
67		assertSame(exInfo, CancellationException.class);
68		} catch (ExecutionException t) {
69		assertSame(exInfo, t.getCause());
70	<	} catch (Exception t) {
70	>	} catch (Throwable t) {
71		threadUnexpectedException(t);
72		}
73	+	if (exInfo == null)
74	+	assertSame(r, r2);
75		assertTrue(f.isDone());
76		}
77		}
#	Line 101 | Line 104 | public class FutureTaskTest extends JSR1
104		}
105		}
106
107	<	<T> void checkCompletedNormally(Future<T> f, T expected) {
107	>	<T> void checkCompletedNormally(Future<T> f, T expectedValue) {
108		checkIsDone(f);
109		assertFalse(f.isCancelled());
110
111	+	T v1 = null, v2 = null;
112		try {
113	<	assertSame(expected, f.get());
114	<	assertSame(expected, f.get(randomTimeout(), randomTimeUnit()));
115	<	} catch (Exception fail) { threadUnexpectedException(fail); }
113	>	v1 = f.get();
114	>	v2 = f.get(randomTimeout(), randomTimeUnit());
115	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
116	>	assertSame(expectedValue, v1);
117	>	assertSame(expectedValue, v2);
118		}
119
120		void checkCancelled(Future<?> f) {
#	Line 838 | Line 844 | public class FutureTaskTest extends JSR1
844		* toString indicates current completion state
845		*/
846		public void testToString_incomplete() {
847	<	FutureTask<String> f = new FutureTask<String>(() -> "");
847	>	FutureTask<String> f = new FutureTask<>(() -> "");
848		assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
849		if (testImplementationDetails)
850		assertTrue(f.toString().startsWith(
#	Line 846 | Line 852 | public class FutureTaskTest extends JSR1
852		}
853
854		public void testToString_normal() {
855	<	FutureTask<String> f = new FutureTask<String>(() -> "");
855	>	FutureTask<String> f = new FutureTask<>(() -> "");
856		f.run();
857		assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
858		if (testImplementationDetails)
#	Line 855 | Line 861 | public class FutureTaskTest extends JSR1
861		}
862
863		public void testToString_exception() {
864	<	FutureTask<String> f = new FutureTask<String>(
864	>	FutureTask<String> f = new FutureTask<>(
865		() -> { throw new ArithmeticException(); });
866		f.run();
867		assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
#	Line 866 | Line 872 | public class FutureTaskTest extends JSR1
872
873		public void testToString_cancelled() {
874		for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
875	<	FutureTask<String> f = new FutureTask<String>(() -> "");
875	>	FutureTask<String> f = new FutureTask<>(() -> "");
876		assertTrue(f.cancel(mayInterruptIfRunning));
877		assertTrue(f.toString().matches(".*\\[.*Cancelled.*\\]"));
878		if (testImplementationDetails)

Diff Legend

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