ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/JSR166TestCase.java
(Generate patch)

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.127 by jsr166, Sat Jan 17 23:14:17 2015 UTC vs.
Revision 1.128 by jsr166, Fri Feb 27 22:06:24 2015 UTC

# Line 652 | Line 652 | public class JSR166TestCase extends Test
652                       " did not terminate in a timely manner");
653          } catch (SecurityException ok) {
654              // Allowed in case test doesn't have privs
655 <        } catch (InterruptedException ie) {
655 >        } catch (InterruptedException fail) {
656              fail("Unexpected InterruptedException");
657          }
658      }
# Line 683 | Line 683 | public class JSR166TestCase extends Test
683              // No need to optimize the failing case via Thread.join.
684              delay(millis);
685              assertTrue(thread.isAlive());
686 <        } catch (InterruptedException ie) {
686 >        } catch (InterruptedException fail) {
687              fail("Unexpected InterruptedException");
688          }
689      }
# Line 705 | Line 705 | public class JSR166TestCase extends Test
705              delay(millis);
706              for (Thread thread : threads)
707                  assertTrue(thread.isAlive());
708 <        } catch (InterruptedException ie) {
708 >        } catch (InterruptedException fail) {
709              fail("Unexpected InterruptedException");
710          }
711      }
# Line 727 | Line 727 | public class JSR166TestCase extends Test
727              future.get(timeoutMillis, MILLISECONDS);
728              shouldThrow();
729          } catch (TimeoutException success) {
730 <        } catch (Exception e) {
731 <            threadUnexpectedException(e);
730 >        } catch (Exception fail) {
731 >            threadUnexpectedException(fail);
732          } finally { future.cancel(true); }
733          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
734      }
# Line 884 | Line 884 | public class JSR166TestCase extends Test
884      void sleep(long millis) {
885          try {
886              delay(millis);
887 <        } catch (InterruptedException ie) {
887 >        } catch (InterruptedException fail) {
888              AssertionFailedError afe =
889                  new AssertionFailedError("Unexpected InterruptedException");
890 <            afe.initCause(ie);
890 >            afe.initCause(fail);
891              throw afe;
892          }
893      }
# Line 979 | Line 979 | public class JSR166TestCase extends Test
979      void awaitTermination(Thread t, long timeoutMillis) {
980          try {
981              t.join(timeoutMillis);
982 <        } catch (InterruptedException ie) {
983 <            threadUnexpectedException(ie);
982 >        } catch (InterruptedException fail) {
983 >            threadUnexpectedException(fail);
984          } finally {
985              if (t.getState() != Thread.State.TERMINATED) {
986                  t.interrupt();
# Line 1006 | Line 1006 | public class JSR166TestCase extends Test
1006          public final void run() {
1007              try {
1008                  realRun();
1009 <            } catch (Throwable t) {
1010 <                threadUnexpectedException(t);
1009 >            } catch (Throwable fail) {
1010 >                threadUnexpectedException(fail);
1011              }
1012          }
1013      }
# Line 1061 | Line 1061 | public class JSR166TestCase extends Test
1061                  threadShouldThrow("InterruptedException");
1062              } catch (InterruptedException success) {
1063                  threadAssertFalse(Thread.interrupted());
1064 <            } catch (Throwable t) {
1065 <                threadUnexpectedException(t);
1064 >            } catch (Throwable fail) {
1065 >                threadUnexpectedException(fail);
1066              }
1067          }
1068      }
# Line 1073 | Line 1073 | public class JSR166TestCase extends Test
1073          public final T call() {
1074              try {
1075                  return realCall();
1076 <            } catch (Throwable t) {
1077 <                threadUnexpectedException(t);
1076 >            } catch (Throwable fail) {
1077 >                threadUnexpectedException(fail);
1078                  return null;
1079              }
1080          }
# Line 1091 | Line 1091 | public class JSR166TestCase extends Test
1091                  return result;
1092              } catch (InterruptedException success) {
1093                  threadAssertFalse(Thread.interrupted());
1094 <            } catch (Throwable t) {
1095 <                threadUnexpectedException(t);
1094 >            } catch (Throwable fail) {
1095 >                threadUnexpectedException(fail);
1096              }
1097              return null;
1098          }
# Line 1132 | Line 1132 | public class JSR166TestCase extends Test
1132      public void await(CountDownLatch latch) {
1133          try {
1134              assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1135 <        } catch (Throwable t) {
1136 <            threadUnexpectedException(t);
1135 >        } catch (Throwable fail) {
1136 >            threadUnexpectedException(fail);
1137          }
1138      }
1139  
1140      public void await(Semaphore semaphore) {
1141          try {
1142              assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1143 <        } catch (Throwable t) {
1144 <            threadUnexpectedException(t);
1143 >        } catch (Throwable fail) {
1144 >            threadUnexpectedException(fail);
1145          }
1146      }
1147  
# Line 1335 | Line 1335 | public class JSR166TestCase extends Test
1335          @Override protected final void compute() {
1336              try {
1337                  realCompute();
1338 <            } catch (Throwable t) {
1339 <                threadUnexpectedException(t);
1338 >            } catch (Throwable fail) {
1339 >                threadUnexpectedException(fail);
1340              }
1341          }
1342      }
# Line 1350 | Line 1350 | public class JSR166TestCase extends Test
1350          @Override protected final T compute() {
1351              try {
1352                  return realCompute();
1353 <            } catch (Throwable t) {
1354 <                threadUnexpectedException(t);
1353 >            } catch (Throwable fail) {
1354 >                threadUnexpectedException(fail);
1355                  return null;
1356              }
1357          }
# Line 1375 | Line 1375 | public class JSR166TestCase extends Test
1375          public int await() {
1376              try {
1377                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1378 <            } catch (TimeoutException e) {
1378 >            } catch (TimeoutException timedOut) {
1379                  throw new AssertionFailedError("timed out");
1380 <            } catch (Exception e) {
1380 >            } catch (Exception fail) {
1381                  AssertionFailedError afe =
1382 <                    new AssertionFailedError("Unexpected exception: " + e);
1383 <                afe.initCause(e);
1382 >                    new AssertionFailedError("Unexpected exception: " + fail);
1383 >                afe.initCause(fail);
1384                  throw afe;
1385              }
1386          }
# Line 1408 | Line 1408 | public class JSR166TestCase extends Test
1408                  q.remove();
1409                  shouldThrow();
1410              } catch (NoSuchElementException success) {}
1411 <        } catch (InterruptedException ie) {
1412 <            threadUnexpectedException(ie);
1413 <        }
1411 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1412      }
1413  
1414      void assertSerialEquals(Object x, Object y) {
# Line 1429 | Line 1427 | public class JSR166TestCase extends Test
1427              oos.flush();
1428              oos.close();
1429              return bos.toByteArray();
1430 <        } catch (Throwable t) {
1431 <            threadUnexpectedException(t);
1430 >        } catch (Throwable fail) {
1431 >            threadUnexpectedException(fail);
1432              return new byte[0];
1433          }
1434      }
# Line 1443 | Line 1441 | public class JSR166TestCase extends Test
1441              T clone = (T) ois.readObject();
1442              assertSame(o.getClass(), clone.getClass());
1443              return clone;
1444 <        } catch (Throwable t) {
1445 <            threadUnexpectedException(t);
1444 >        } catch (Throwable fail) {
1445 >            threadUnexpectedException(fail);
1446              return null;
1447          }
1448      }

Diff Legend

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