More progress

Author: sbabcoc

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

@@ -210,12 +210,10 @@ public static Object getRunnerFor(TestClass testClass) {
         throw new IllegalStateException("No associated runner was for for specified test class");
     }
 
-    public static Description getDescription(Object instance, Object target) {
+    public static Description describeChild(Object instance, Object child) {
         TestClass testClass = getTestClassFor(instance);
         Object runner = getRunnerFor(testClass);
-        
-        
-        return invoke(runner, "getDescription", target);
+        return invoke(runner, "describeChild", child);
     }
 
     /**

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

@@ -12,6 +12,8 @@
 
 import org.junit.runners.model.FrameworkMethod;
 
+import com.nordstrom.common.base.UncheckedThrow;
+
 import net.bytebuddy.implementation.bind.annotation.BindingPriority;
 import net.bytebuddy.implementation.bind.annotation.Origin;
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
@@ -43,15 +45,14 @@ private MethodInterceptor() {
      * @param clazz "enhanced" class upon which the method was invoked
      * @param method {@link Method} object for the invoked method
      * @param proxy call-able proxy for the intercepted method
-     * @return {@code anything} (the result of invoking the intercepted method)
      * @throws Exception {@code anything} (exception thrown by the intercepted method)
      */
     @RuntimeType
     @BindingPriority(1)
-    public static Object intercept(@Origin Class<?> clazz, @Origin Method method, @SuperCall Callable<?> proxy) throws Exception {
-        Object result;
+    public static void intercept(@Origin Class<?> clazz, @Origin Method method, @SuperCall Callable<?> proxy) throws Exception {
         attachWatchers(clazz);
 
+        Throwable thrown = null;
         FrameworkMethod member = new FrameworkMethod(method);
         synchronized(methodWatchers2) {
             for (MethodWatcher2 watcher : methodWatchers2) {
@@ -60,16 +61,20 @@ public static Object intercept(@Origin Class<?> clazz, @Origin Method method, @S
         }
 
         try {
-            result = proxy.call();
+            proxy.call();
+        } catch (Throwable t) {
+            thrown = t;
         } finally {
             synchronized(methodWatchers2) {
                 for (MethodWatcher2 watcher : methodWatchers2) {
-                    watcher.afterInvocation(member);
+                    watcher.afterInvocation(member, thrown);
                 }
             }
         }
 
-        return result;
+        if (thrown != null) {
+            throw UncheckedThrow.throwUnchecked(thrown);
+        }
     }
 
     /**
@@ -78,15 +83,13 @@ public static Object intercept(@Origin Class<?> clazz, @Origin Method method, @S
      * @param obj "enhanced" object upon which the method was invoked
      * @param method {@link Method} object for the invoked method
      * @param proxy call-able proxy for the intercepted method
-     * @return {@code anything} (the result of invoking the intercepted method)
      * @throws Exception {@code anything} (exception thrown by the intercepted method)
      */
     @RuntimeType
     @BindingPriority(2)
-    public static Object intercept(@This Object obj, @Origin Method method, @SuperCall Callable<?> proxy) throws Exception
+    public static void intercept(@This Object obj, @Origin Method method, @SuperCall Callable<?> proxy) throws Exception
     {
-        Object result;
-        
+        Throwable thrown = null;
         FrameworkMethod member = new FrameworkMethod(method);
         synchronized(methodWatchers) {
             for (MethodWatcher watcher : methodWatchers) {
@@ -100,23 +103,27 @@ public static Object intercept(@This Object obj, @Origin Method method, @SuperCa
         }
 
         try {
-            result = proxy.call();
+            proxy.call();
+        } catch (Throwable t) {
+            thrown = t;
         } finally {
             synchronized(watchers) {
                 synchronized(methodWatchers) {
                     for (MethodWatcher watcher : methodWatchers) {
-                        watcher.afterInvocation(obj, member);
+                        watcher.afterInvocation(obj, member, thrown);
                     }
                 }
                 synchronized(methodWatchers2) {
                     for (MethodWatcher2 watcher : methodWatchers2) {
-                        watcher.afterInvocation(obj, member);
+                        watcher.afterInvocation(obj, member, thrown);
                     }
                 }
             }
         }
 
-        return result;
+        if (thrown != null) {
+            throw UncheckedThrow.throwUnchecked(thrown);
+        }
     }
 
     /**

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

@@ -21,6 +21,7 @@ public interface MethodWatcher {
      * 
      * @param obj "enhanced" object upon which the method was invoked
      * @param method {@link FrameworkMethod} object for the invoked method
+     * @param thrown exception thrown by method; {@code null} on normal completion
      */
-    void afterInvocation(Object obj, FrameworkMethod method);
+    void afterInvocation(Object obj, FrameworkMethod method, Throwable thrown);
 }

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

@@ -19,6 +19,7 @@ public interface MethodWatcher2 extends MethodWatcher {
      * Invoked after each class-level configuration method is invoked
      * 
      * @param method {@link FrameworkMethod} object for the invoked method
+     * @param thrown exception thrown by method; {@code null} on normal completion
      */
-    void afterInvocation(FrameworkMethod method);
+    void afterInvocation(FrameworkMethod method, Throwable thrown);
 }

src/test/java/com/nordstrom/automation/junit/UnitTestWatcher.java

@@ -37,7 +37,7 @@ public void beforeInvocation(Object obj, FrameworkMethod method) {
     }
 
     @Override
-    public void afterInvocation(Object obj, FrameworkMethod method) {
+    public void afterInvocation(Object obj, FrameworkMethod method, Throwable thrown) {
         if (null != method.getAnnotation(Before.class)) {
             m_leaveBeforeMethod.add(method.getName());
         } else if (null != method.getAnnotation(Test.class)) {
@@ -57,7 +57,7 @@ public void beforeInvocation(FrameworkMethod method) {
     }
 
     @Override
-    public void afterInvocation(FrameworkMethod method) {
+    public void afterInvocation(FrameworkMethod method, Throwable thrown) {
         if (null != method.getAnnotation(BeforeClass.class)) {
             m_leaveBeforeClass.add(method.getName());
         } else if (null != method.getAnnotation(AfterClass.class)) {