Merge pull request #43 from Nordstrom/pr/issue-42

Resolve #42: Change tracking of "atomic" test to handle rule failures

Author: sbabcoc

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

@@ -28,21 +28,11 @@ public class AtomicTest {
     private final List<FrameworkMethod> particles;
     private Throwable thrown;
 
-    public AtomicTest(Object runner, Description description) {
+    public AtomicTest(Object runner, FrameworkMethod identity) {
         this.runner = runner;
-        this.description = description;
-        this.particles = invoke(runner, "getChildren");
-        
-        FrameworkMethod identity = null;
-        String methodName = description.getMethodName().split("[\\[\\(]")[0];
-        for (FrameworkMethod method : particles) {
-            if (methodName.equals(method.getName())) {
-                identity = method;
-                break;
-            }
-        }
-        
         this.identity = identity;
+        this.description = invoke(runner, "describeChild", identity);
+        this.particles = invoke(runner, "getChildren");
     }
 
     /**

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

@@ -102,7 +102,7 @@ static void pushThreadRunner(final Object runner) {
     }
 
     /**
-     * Pop the top JUnit test runner onto the stack for the current thread.
+     * Pop the top JUnit test runner from the stack for the current thread.
      * 
      * @return {@code ParentRunner} object
      * @throws EmptyStackException if called outside the scope of an active runner

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

@@ -9,6 +9,7 @@
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
+import org.junit.runners.model.FrameworkMethod;
 
 public class RunAnnouncer extends RunListener {
 
@@ -24,7 +25,7 @@ public class RunAnnouncer extends RunListener {
      */
     @Override
     public void testStarted(Description description) throws Exception {
-        AtomicTest atomicTest = newAtomicTest(description);
+        AtomicTest atomicTest = getAtomicTestOf(description);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testStarted(atomicTest);
@@ -37,7 +38,7 @@ public void testStarted(Description description) throws Exception {
      */
     @Override
     public void testFinished(Description description) throws Exception {
-        AtomicTest atomicTest = getAtomicTestOf(Run.getThreadRunner());
+        AtomicTest atomicTest = getAtomicTestOf(description);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testFinished(atomicTest);
@@ -76,7 +77,7 @@ public void testAssumptionFailure(Failure failure) {
      */
     @Override
     public void testIgnored(Description description) throws Exception {
-        AtomicTest atomicTest = newAtomicTest(description);
+        AtomicTest atomicTest = getAtomicTestOf(description);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testIgnored(atomicTest);
@@ -90,21 +91,21 @@ public void testIgnored(Description description) throws Exception {
      * @param description {@link Description} object
      * @return {@link AtomicTest} object
      */
-    private static AtomicTest newAtomicTest(Description description) {
-        Object runner = Run.getThreadRunner();
-        AtomicTest atomicTest = new AtomicTest(runner, description);
+    static AtomicTest newAtomicTest(Object runner, FrameworkMethod method) {
+        AtomicTest atomicTest = new AtomicTest(runner, method);
         RUNNER_TO_ATOMICTEST.put(runner, atomicTest);
+        RUNNER_TO_ATOMICTEST.put(atomicTest.getDescription(), atomicTest);
         return atomicTest;
     }
 
     /**
-     * Get the atomic test object for the specified class runner.
+     * Get the atomic test object for the specified class runner or method description.
      * 
-     * @param runner JUnit class runner
+     * @param testKey JUnit class runner or method description
      * @return {@link AtomicTest} object (may be {@code null})
      */
-    static AtomicTest getAtomicTestOf(Object runner) {
-        return RUNNER_TO_ATOMICTEST.get(runner);
+    static AtomicTest getAtomicTestOf(Object testKey) {
+        return RUNNER_TO_ATOMICTEST.get(testKey);
     }
 
     /**

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

@@ -50,6 +50,8 @@ public static void intercept(@This final Object runner, @SuperCall final Callabl
                 int count = RetryHandler.getMaxRetry(runner, method);
                 boolean isIgnored = (null != method.getAnnotation(Ignore.class));
 
+                RunAnnouncer.newAtomicTest(runner, method);
+                
                 if (count == 0) {
                     LifecycleHooks.callProxy(proxy);
                 } else if (!isIgnored) {

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

@@ -0,0 +1,24 @@
+package com.nordstrom.automation.junit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.testng.annotations.Test;
+
+public class RuleFailureTest {
+
+    @Test
+    public void verifyRuleExceptionHandling() {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(RuleThrowsException.class);
+        assertFalse(result.wasSuccessful());
+        assertEquals(1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+        assertEquals(RuntimeException.class, failure.getException().getClass());
+        assertEquals("Must be failed", failure.getMessage());
+    }
+    
+}

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

@@ -0,0 +1,26 @@
+package com.nordstrom.automation.junit;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+public class RuleThrowsException extends TestBase {
+    
+    @Rule
+    public final TestRule failing = new TestRule() {
+        @Override
+        public Statement apply(Statement base, Description description) {
+            throw new RuntimeException("Must be failed");
+        }
+    };
+    
+    @Test
+    public void happy() {
+        assertTrue(true);
+    }
+
+}