Merge pull request #15 from Nordstrom/pr/unwrap-invocation-target-exception

Unwrap InvocationTargetException failures to propagate original cause

Author: sbabcoc

src/main/java/com/nordstrom/automation/junit/CreateTestClass.java

@@ -43,7 +43,7 @@ public class CreateTestClass {
     public static TestClass intercept(@This final Object runner, @SuperCall final Callable<?> proxy)
                     throws Exception {
 
-        TestClass testClass = (TestClass) proxy.call();
+        TestClass testClass = (TestClass) LifecycleHooks.callProxy(proxy);
         TESTCLASS_TO_RUNNER.put(testClass, runner);
 
         for (Object method : testClass.getAnnotatedMethods()) {

src/main/java/com/nordstrom/automation/junit/LifecycleHooks.java

@@ -163,7 +163,7 @@ public static void intercept(@This final Object runner, @SuperCall final Callabl
                 watcher.runStarted(runner);
             }
 
-            proxy.call();
+            callProxy(proxy);
 
             for (RunnerWatcher watcher : runnerWatcherLoader) {
                 watcher.runFinished(runner);
@@ -206,7 +206,7 @@ public static class CreateTest {
         @RuntimeType
         public static Object intercept(@This final Object runner,
                         @SuperCall final Callable<?> proxy) throws Exception {
-            Object testObj = proxy.call();
+            Object testObj = callProxy(proxy);
             TARGET_TO_TESTCLASS.put(testObj, getTestClassOf(runner));
             applyTimeout(testObj);
 
@@ -459,4 +459,21 @@ static void setFieldValue(Object target, String name, Object value) throws Illeg
         field.setAccessible(true);
         field.set(target, value);
     }
+    
+    /**
+     * Invoke an intercepted method through its callable proxy.
+     * <p>
+     * <b>NOTE</b>: If the invoked method throws an exception, this method re-throws the original exception.
+     * 
+     * @param proxy callable proxy for the intercepted method
+     * @return {@code anything} - value returned by the intercepted method
+     * @throws Exception {@code anything} (exception thrown by the intercepted method)
+     */
+    static Object callProxy(final Callable<?> proxy) throws Exception {
+        try {
+            return proxy.call();
+        } catch (InvocationTargetException e) {
+            throw UncheckedThrow.throwUnchecked(e.getCause());
+        }
+    }
 }

src/main/java/com/nordstrom/automation/junit/RunChild.java

@@ -36,7 +36,7 @@ public static void intercept(@This final Object runner, @SuperCall final Callabl
         }
 
         if (count == 0) {
-            proxy.call();
+            LifecycleHooks.callProxy(proxy);
         } else if (!isIgnored) {
             RetryHandler.runChildWithRetry(runner, method, notifier, count);
         }

src/main/java/com/nordstrom/automation/junit/RunReflectiveCall.java

@@ -72,7 +72,7 @@ public static Object intercept(@This final Object callable, @SuperCall final Cal
         }
 
         if (method == null) {
-            return proxy.call();
+            return LifecycleHooks.callProxy(proxy);
         }
 
         Object result = null;
@@ -82,7 +82,7 @@ public static Object intercept(@This final Object callable, @SuperCall final Cal
         }
 
         try {
-            result = proxy.call();
+            result = LifecycleHooks.callProxy(proxy);
         } catch (Throwable t) {
             thrown = t;
         } finally {