Merge pull request #39 from Nordstrom/pr/remove-duplicate-code

Retain AtomicTest object for entire execution of atomic test

Author: sbabcoc

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

@@ -169,6 +169,16 @@ public static TestClass getTestClassOf(Object runner) {
         return invoke(runner, "getTestClass");
     }
 
+    /**
+     * Get the atomic test object for the specified class runner.
+     * 
+     * @param runner JUnit class runner
+     * @return {@link AtomicTest} object (may be {@code null})
+     */
+    public static AtomicTest getAtomicTestOf(Object runner) {
+        return RunAnnouncer.getAtomicTestOf(runner);
+    }
+    
     /**
      * Get the description of the indicated child object from the runner for the specified test class instance.
      * 
@@ -369,9 +379,6 @@ public static <T extends JUnitWatcher> Optional<T> getAttachedWatcher(Class<T> w
         watcher = RunAnnouncer.getAttachedWatcher(watcherType);
         if (watcher.isPresent()) return watcher;
 
-        watcher = RunAnnouncer.getAttachedWatcher(watcherType);
-        if (watcher.isPresent()) return watcher;
-        
         return RunReflectiveCall.getAttachedWatcher(watcherType);
     }
 

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

@@ -1,7 +1,10 @@
 package com.nordstrom.automation.junit;
 
+import java.util.Map;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.junit.internal.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
@@ -10,6 +13,7 @@
 public class RunAnnouncer extends RunListener {
 
     private static final ServiceLoader<RunWatcher> runWatcherLoader;
+    private static final Map<Object, AtomicTest> RUNNER_TO_ATOMICTEST = new ConcurrentHashMap<>();
 
     static {
         runWatcherLoader = ServiceLoader.load(RunWatcher.class);
@@ -20,7 +24,7 @@ public class RunAnnouncer extends RunListener {
      */
     @Override
     public void testStarted(Description description) throws Exception {
-        AtomicTest atomicTest = getAtomicTest(description);
+        AtomicTest atomicTest = newAtomicTest(description);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testStarted(atomicTest);
@@ -33,7 +37,7 @@ public void testStarted(Description description) throws Exception {
      */
     @Override
     public void testFinished(Description description) throws Exception {
-        AtomicTest atomicTest = getAtomicTest(description);
+        AtomicTest atomicTest = getAtomicTestOf(Run.getThreadRunner());
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testFinished(atomicTest);
@@ -46,7 +50,7 @@ public void testFinished(Description description) throws Exception {
      */
     @Override
     public void testFailure(Failure failure) throws Exception {
-        AtomicTest atomicTest = getAtomicTest(failure);
+        AtomicTest atomicTest = setTestFailure(failure);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testFailure(atomicTest, failure.getException());
@@ -59,7 +63,7 @@ public void testFailure(Failure failure) throws Exception {
      */
     @Override
     public void testAssumptionFailure(Failure failure) {
-        AtomicTest atomicTest = getAtomicTest(failure);
+        AtomicTest atomicTest = setTestFailure(failure);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testAssumptionFailure(atomicTest, (AssumptionViolatedException) failure.getException());
@@ -72,7 +76,7 @@ public void testAssumptionFailure(Failure failure) {
      */
     @Override
     public void testIgnored(Description description) throws Exception {
-        AtomicTest atomicTest = getAtomicTest(description);
+        AtomicTest atomicTest = newAtomicTest(description);
         synchronized(runWatcherLoader) {
             for (RunWatcher watcher : runWatcherLoader) {
                 watcher.testIgnored(atomicTest);
@@ -81,17 +85,36 @@ public void testIgnored(Description description) throws Exception {
     }
 
     /**
-     * Get the atomic test object from the specified description.
+     * Create new atomic test object for the specified description.
      * 
      * @param description {@link Description} object
      * @return {@link AtomicTest} object
      */
-    static AtomicTest getAtomicTest(Description description) {
-        return new AtomicTest(Run.getThreadRunner(), description);
+    private static AtomicTest newAtomicTest(Description description) {
+        Object runner = Run.getThreadRunner();
+        AtomicTest atomicTest = new AtomicTest(runner, description);
+        RUNNER_TO_ATOMICTEST.put(runner, atomicTest);
+        return atomicTest;
     }
 
-    static AtomicTest getAtomicTest(Failure failure) {
-        AtomicTest atomicTest = getAtomicTest(failure.getDescription());
+    /**
+     * Get the atomic test object for the specified class runner.
+     * 
+     * @param runner JUnit class runner
+     * @return {@link AtomicTest} object (may be {@code null})
+     */
+    static AtomicTest getAtomicTestOf(Object runner) {
+        return RUNNER_TO_ATOMICTEST.get(runner);
+    }
+    
+    /**
+     * Store the specified failure in the active atomic test.
+     * 
+     * @param failure {@link Failure} object
+     * @return {@link AtomicTest} object
+     */
+    private static AtomicTest setTestFailure(Failure failure) {
+        AtomicTest atomicTest = getAtomicTestOf(Run.getThreadRunner());
         atomicTest.setThrowable(failure.getException());
         return atomicTest;
     }