Merge pull request #33 from Nordstrom/pr/fix-parallel-methods

Pr/fix parallel methods

Author: sbabcoc

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.nordstrom.tools</groupId>
   <artifactId>junit-foundation</artifactId>
-  <version>8.0.2-SNAPSHOT</version>
+  <version>9.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JUnit Foundation</name>
@@ -36,7 +36,7 @@
     <settings.version>2.2.2</settings.version>
     <junit.version>4.12</junit.version>
     <testng.version>6.10</testng.version>
-    <bytebuddy.version>1.9.3</bytebuddy.version>
+    <bytebuddy.version>1.9.5</bytebuddy.version>
     <logback.version>1.2.2</logback.version>
     <gpg-plugin.version>1.6</gpg-plugin.version>
     <staging-plugin.version>1.6.7</staging-plugin.version>

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

@@ -0,0 +1,85 @@
+package com.nordstrom.automation.junit;
+
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.bytebuddy.implementation.bind.annotation.RuntimeType;
+import net.bytebuddy.implementation.bind.annotation.SuperCall;
+import net.bytebuddy.implementation.bind.annotation.This;
+
+/**
+ * This class declares the interceptor for the {@link org.junit.runners.BlockJUnit4ClassRunner#createTest
+ * createTest} method.
+ */
+@SuppressWarnings("squid:S1118")
+public class CreateTest {
+    
+    private static final ServiceLoader<TestObjectWatcher> objectWatcherLoader;
+    private static final Map<Object, Object> TARGET_TO_RUNNER = new ConcurrentHashMap<>();
+    private static final Map<Object, Object> RUNNER_TO_TARGET = new ConcurrentHashMap<>();
+    private static final ThreadLocal<Integer> COUNTER;
+    private static final DepthGauge DEPTH;
+    
+    static {
+        objectWatcherLoader = ServiceLoader.load(TestObjectWatcher.class);
+        COUNTER = DepthGauge.getCounter();
+        DEPTH = new DepthGauge(COUNTER);
+    }
+    
+    /**
+     * Interceptor for the {@link org.junit.runners.BlockJUnit4ClassRunner#createTest createTest} method.
+     * 
+     * @param runner target {@link org.junit.runners.BlockJUnit4ClassRunner BlockJUnit4ClassRunner} object
+     * @param proxy callable proxy for the intercepted method
+     * @return {@code anything} - JUnit test class instance
+     * @throws Exception {@code anything} (exception thrown by the intercepted method)
+     */
+    @RuntimeType
+    public static Object intercept(@This final Object runner,
+                    @SuperCall final Callable<?> proxy) throws Exception {
+        
+        Object testObj;
+        try {
+            DEPTH.increaseDepth();
+            testObj = LifecycleHooks.callProxy(proxy);
+        } finally {
+            DEPTH.decreaseDepth();
+        }
+        
+        TARGET_TO_RUNNER.put(testObj, runner);
+        RUNNER_TO_TARGET.put(runner, testObj);
+        LifecycleHooks.applyTimeout(testObj);
+        
+        if (DEPTH.atGroundLevel()) {
+            synchronized(objectWatcherLoader) {
+                for (TestObjectWatcher watcher : objectWatcherLoader) {
+                    watcher.testObjectCreated(testObj, runner);
+                }
+            }
+        }
+        
+        return testObj;
+    }
+    
+    /**
+     * Get the class runner associated with the specified instance.
+     * 
+     * @param target instance of JUnit test class
+     * @return {@link org.junit.runners.BlockJUnit4ClassRunner BlockJUnit4ClassRunner} for specified instance
+     */
+    static Object getRunnerForTarget(Object target) {
+        return TARGET_TO_RUNNER.get(target);
+    }
+    
+    /**
+     * Get the JUnit test class instance for the specified class runner.
+     * 
+     * @param runner JUnit class runner
+     * @return JUnit test class instance for specified runner
+     */
+    static Object getTargetForRunner(Object runner) {
+        return RUNNER_TO_TARGET.get(runner);
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.nordstrom.automation.junit;
+
+import java.util.concurrent.Callable;
+
+import net.bytebuddy.implementation.bind.annotation.SuperCall;
+import net.bytebuddy.implementation.bind.annotation.This;
+
+public class Finished {
+    public static void intercept(@This final Object scheduler, @SuperCall final Callable<?> proxy) throws Exception {
+        LifecycleHooks.callProxy(proxy);
+        RunChild.finished();
+    }
+}