Merge pull request #14 from Nordstrom/pr/frameworkmethod-to-testclass

Add more events and a new "watcher"

Author: sbabcoc

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.nordstrom.tools</groupId>
   <artifactId>junit-foundation</artifactId>
-  <version>6.0.3-SNAPSHOT</version>
+  <version>6.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JUnit Foundation</name>

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

@@ -26,6 +26,7 @@ public class CreateTestClass {
     private static final ServiceLoader<TestClassWatcher> classWatcherLoader;
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateTestClass.class);
     private static final Map<TestClass, Object> TESTCLASS_TO_RUNNER = new ConcurrentHashMap<>();
+    private static final Map<Object, TestClass> METHOD_TO_TESTCLASS = new ConcurrentHashMap<>();
 
     static {
         classWatcherLoader = ServiceLoader.load(TestClassWatcher.class);
@@ -45,6 +46,10 @@ public static TestClass intercept(@This final Object runner, @SuperCall final Ca
         TestClass testClass = (TestClass) proxy.call();
         TESTCLASS_TO_RUNNER.put(testClass, runner);
 
+        for (Object method : testClass.getAnnotatedMethods()) {
+            METHOD_TO_TESTCLASS.put(method, testClass);
+        }
+        
         for (TestClassWatcher watcher : classWatcherLoader) {
             watcher.testClassCreated(testClass, runner);
         }
@@ -118,4 +123,18 @@ static Object getRunnerFor(TestClass testClass) {
         }
         throw new IllegalArgumentException("No associated runner was found for specified test class");
     }
+    
+    /**
+     * Get the test class associated with the specified framework method.
+     * 
+     * @param method {@code FrameworkMethod} object
+     * @return {@link TestClass} object associated with the specified framework method
+     */
+    static TestClass getTestClassWith(Object method) {
+        TestClass testClass = METHOD_TO_TESTCLASS.get(method);
+        if (testClass != null) {
+            return testClass;
+        }
+        throw new IllegalArgumentException("No associated test class was found for specified framework method");
+    }
 }

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

@@ -126,11 +126,13 @@ static synchronized JUnitConfig getConfig() {
     @SuppressWarnings("squid:S1118")
     public static class Run {
         private static final ServiceLoader<RunListener> runListenerLoader;
+        private static final ServiceLoader<RunnerWatcher> runnerWatcherLoader;
         private static final Set<RunNotifier> NOTIFIERS = new HashSet<>();
         private static final Map<Object, Object> CHILD_TO_PARENT = new ConcurrentHashMap<>();
 
         static {
             runListenerLoader = ServiceLoader.load(RunListener.class);
+            runnerWatcherLoader = ServiceLoader.load(RunnerWatcher.class);
         }
 
         /**
@@ -157,7 +159,15 @@ public static void intercept(@This final Object runner, @SuperCall final Callabl
                 }
             }
 
+            for (RunnerWatcher watcher : runnerWatcherLoader) {
+                watcher.runStarted(runner);
+            }
+            
             proxy.call();
+            
+            for (RunnerWatcher watcher : runnerWatcherLoader) {
+                watcher.runFinished(runner);
+            }
         }
 
         /**
@@ -242,6 +252,16 @@ public static Object getRunnerFor(TestClass testClass) {
         return CreateTestClass.getRunnerFor(testClass);
     }
 
+    /**
+     * Get the test class associated with the specified framework method.
+     * 
+     * @param method {@code FrameworkMethod} object
+     * @return {@link TestClass} object associated with the specified framework method
+     */
+    public static TestClass getTestClassWith(Object method) {
+        return CreateTestClass.getTestClassWith(method);
+    }
+    
     /**
      * Get the parent runner that owns specified child runner.
      * 

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

@@ -0,0 +1,19 @@
+package com.nordstrom.automation.junit;
+
+public interface RunnerWatcher {
+
+    /**
+     * Called when a test runner is about to run.
+     * 
+     * @param runner JUnit test runner
+     */
+    public void runStarted(Object runner);
+
+    /**
+     * Called when a test runner has finished running.
+     * 
+     * @param runner JUnit test runner
+     */
+    public void runFinished(Object runner);
+
+}