Merge pull request #35 from Nordstrom/pr/fix-config-notifications

More thread-related fixes

Author: sbabcoc

pom.xml

@@ -182,8 +182,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <parallel>classes</parallel>
-          <threadCount>5</threadCount>
           <argLine>-javaagent:src/test/resources/test-agent.jar</argLine>
         </configuration>
       </plugin>

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

@@ -19,13 +19,10 @@ 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;
+    private static final ThreadLocal<DepthGauge> DEPTH = ThreadLocal.withInitial(DepthGauge::new);
 
     static {
         objectWatcherLoader = ServiceLoader.load(TestObjectWatcher.class);
-        COUNTER = DepthGauge.getCounter();
-        DEPTH = new DepthGauge(COUNTER);
     }
 
     /**
@@ -42,17 +39,17 @@ public static Object intercept(@This final Object runner,
 
         Object testObj;
         try {
-            DEPTH.increaseDepth();
+            DEPTH.get().increaseDepth();
             testObj = LifecycleHooks.callProxy(proxy);
         } finally {
-            DEPTH.decreaseDepth();
+            DEPTH.get().decreaseDepth();
         }
 
         TARGET_TO_RUNNER.put(testObj, runner);
         RUNNER_TO_TARGET.put(runner, testObj);
         LifecycleHooks.applyTimeout(testObj);
 
-        if (DEPTH.atGroundLevel()) {
+        if (DEPTH.get().atGroundLevel()) {
             synchronized(objectWatcherLoader) {
                 for (TestObjectWatcher watcher : objectWatcherLoader) {
                     watcher.testObjectCreated(testObj, runner);

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

@@ -2,19 +2,15 @@
 
 public class DepthGauge {
 
-    private final ThreadLocal<Integer> counter;
-    
-    public DepthGauge(ThreadLocal<Integer> counter) {
-        this.counter = counter;
-    }
+    private int counter = 0;
 
     /**
      * Determine if the depth is at ground level (i.e. - zero).
      * 
      * @return {@code true} if depth is 0; otherwise {@code false}
      */
     public boolean atGroundLevel() {
-        return (0 == currentDepth());
+        return (0 == counter);
     }
 
     /**
@@ -23,25 +19,25 @@ public boolean atGroundLevel() {
      * @return current depth count
      */
     public int currentDepth() {
-        return counter.get().intValue();
+        return counter;
     }
 
     /**
      * Increment intercept depth counter
      * 
-     * @return updated depth count
+     * @return depth count prior to update
      */
-    public int increaseDepth() {
-        return adjustDepth(1);
+    public synchronized int increaseDepth() {
+        return adjustDepth(1) - 1;
     }
 
     /**
      * Decrement intercept depth counter
      * 
-     * @return updated depth count
+     * @return depth count after update
      */
-    public int decreaseDepth() {
-        if (counter.get().intValue() > 0) {
+    public synchronized int decreaseDepth() {
+        if (counter > 0) {
             return adjustDepth(-1);
         }
         throw new IllegalStateException("Unbalanced depth management; negative depth is prohibited");
@@ -54,23 +50,7 @@ public int decreaseDepth() {
      * @return updated depth count
      */
     private int adjustDepth(final int delta) {
-        int i = counter.get().intValue() + delta;
-        counter.set(Integer.valueOf(i));
-        return i;
-    }
-    
-    /**
-     * Get depth counter.
-     * 
-     * @return thread-local integer with initial value of 0
-     */
-    public static ThreadLocal<Integer> getCounter() {
-        return new InheritableThreadLocal<Integer>() {
-            @Override
-            protected Integer initialValue() {
-                return Integer.valueOf(0);
-            }
-        };
+        counter += delta;
+        return counter;
     }
-    
 }

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

@@ -2,13 +2,12 @@
 
 import static com.nordstrom.automation.junit.LifecycleHooks.getFieldValue;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.ServiceLoader;
-import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -30,8 +29,7 @@
 public class RunReflectiveCall {
 
     private static final ServiceLoader<MethodWatcher> methodWatcherLoader;
-    private static final Set<Integer> beforeNotified = new CopyOnWriteArraySet<>();
-    private static final Set<Integer> afterNotified = new CopyOnWriteArraySet<>();
+    private static final ThreadLocal<Map<Integer, DepthGauge>> methodDepth = ThreadLocal.withInitial(HashMap::new);
 
     static {
         methodWatcherLoader = ServiceLoader.load(MethodWatcher.class);
@@ -82,9 +80,9 @@ public static Object intercept(@This final Object callable, @SuperCall final Cal
 
         Object result = null;
         Throwable thrown = null;
-        fireBeforeInvocation(runner, target, method, params);
 
         try {
+            fireBeforeInvocation(runner, target, method, params);
             result = LifecycleHooks.callProxy(proxy);
         } catch (Throwable t) {
             thrown = t;
@@ -144,13 +142,16 @@ public static boolean isParticleMethod(FrameworkMethod method) {
      * @return {@code true} if event the {@code beforeInvocation} was fired; otherwise {@code false}
      */
     private static boolean fireBeforeInvocation(Object runner, Object target, FrameworkMethod method, Object... params) {
-        if ((runner != null) && (method != null) && (beforeNotified.add(methodHash(runner, method)))) {
-            synchronized(methodWatcherLoader) {
-                for (MethodWatcher watcher : methodWatcherLoader) {
-                    watcher.beforeInvocation(runner, target, method, params);
+        if ((runner != null) && (method != null)) {
+            DepthGauge depthGauge = methodDepth.get().computeIfAbsent(methodHash(runner, method), k -> new DepthGauge());
+            if (0 == depthGauge.increaseDepth()) {
+                synchronized(methodWatcherLoader) {
+                    for (MethodWatcher watcher : methodWatcherLoader) {
+                        watcher.beforeInvocation(runner, target, method, params);
+                    }
                 }
+                return true;
             }
-            return true;
         }
         return false;
     }
@@ -167,13 +168,16 @@ private static boolean fireBeforeInvocation(Object runner, Object target, Framew
      * @return {@code true} if event the {@code afterInvocation} was fired; otherwise {@code false}
      */
     private static boolean fireAfterInvocation(Object runner, Object target, FrameworkMethod method, Throwable thrown) {
-        if ((runner != null) && (method != null) && (afterNotified.add(methodHash(runner, method)))) {
-            synchronized(methodWatcherLoader) {
-                for (MethodWatcher watcher : methodWatcherLoader) {
-                    watcher.afterInvocation(runner, target, method, thrown);
+        if ((runner != null) && (method != null)) {
+            DepthGauge depthGauge = methodDepth.get().computeIfAbsent(methodHash(runner, method), k -> new DepthGauge());
+            if (0 == depthGauge.decreaseDepth()) {
+                synchronized(methodWatcherLoader) {
+                    for (MethodWatcher watcher : methodWatcherLoader) {
+                        watcher.afterInvocation(runner, target, method, thrown);
+                    }
                 }
+                return true;
             }
-            return true;
         }
         return false;
     }
@@ -185,7 +189,7 @@ private static boolean fireAfterInvocation(Object runner, Object target, Framewo
      * @param method {@link FrameworkMethod} object
      * @return hash code for the specified runner/method pair
      */
-    private static int methodHash(Object runner, FrameworkMethod method) {
-        return runner.toString().hashCode() * 31 + method.hashCode();
+    public static int methodHash(Object runner, FrameworkMethod method) {
+        return ((Thread.currentThread().hashCode() * 31) + runner.hashCode()) * 31 + method.hashCode();
     }
 }