Updates reflection library

e087afcd · Adam Blank · bfdca2fe · e087afcd
Commit e087afcd authored 6 years ago by Adam Blank
Show whitespace changes
Inline Side-by-side

Showing

with 26 additions and 14 deletions
+26 -14
--- a/tests/edu/caltech/cs2/helpers/Reflection.java
+++ b/tests/edu/caltech/cs2/helpers/Reflection.java
@@ -61,7 +61,13 @@ public class Reflection {
    try {
      result = (T) m.invoke(args[0], Arrays.copyOfRange(args, 1, args.length));
    } catch (IllegalAccessException | InvocationTargetException e) {
-      fail(e.getCause());
+      Throwable cause = e.getCause();
+      if (cause instanceof RuntimeException) {
+        throw (RuntimeException)e.getCause();
+      }
+      else {
+        fail(cause);
+      }
    }
    return result;
  }
@@ -72,7 +78,13 @@ public class Reflection {
    try {
      result = (T) m.invoke(null, args);
    } catch (IllegalAccessException | InvocationTargetException e) {
-      fail(e.getCause());
+      Throwable cause = e.getCause();
+      if (cause instanceof RuntimeException) {
+        throw (RuntimeException)e.getCause();
+      }
+      else {
+        fail(cause);
+      }
    }
    return result;
  }