[cvs] / jsr166 / src / test / tck / FutureTaskTest.java Repository:
ViewVC logotype

Diff of /jsr166/src/test/tck/FutureTaskTest.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.47, Wed Aug 16 17:18:34 2017 UTC revision 1.49, Sun Oct 22 01:26:49 2017 UTC
# Line 51  Line 51 
51                  exInfo = CancellationException.class;                  exInfo = CancellationException.class;
52              } catch (ExecutionException t) {              } catch (ExecutionException t) {
53                  exInfo = t.getCause();                  exInfo = t.getCause();
54              } catch (Throwable t) {              } catch (Exception t) {
55                  threadUnexpectedException(t);                  threadUnexpectedException(t);
56              }              }
57    
# Line 66  Line 66 
66                  assertSame(exInfo, CancellationException.class);                  assertSame(exInfo, CancellationException.class);
67              } catch (ExecutionException t) {              } catch (ExecutionException t) {
68                  assertSame(exInfo, t.getCause());                  assertSame(exInfo, t.getCause());
69              } catch (Throwable t) {              } catch (Exception t) {
70                  threadUnexpectedException(t);                  threadUnexpectedException(t);
71              }              }
72              assertTrue(f.isDone());              assertTrue(f.isDone());
# Line 108  Line 108 
108          try {          try {
109              assertSame(expected, f.get());              assertSame(expected, f.get());
110              assertSame(expected, f.get(randomTimeout(), randomTimeUnit()));              assertSame(expected, f.get(randomTimeout(), randomTimeUnit()));
111          } catch (Throwable fail) { threadUnexpectedException(fail); }          } catch (Exception fail) { threadUnexpectedException(fail); }
112      }      }
113    
114      void checkCancelled(Future<?> f) {      void checkCancelled(Future<?> f) {

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.49

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8