Replace more reflection with byte code transforms (#120)

Author: sbabcoc

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

@@ -1,7 +1,5 @@
 package com.nordstrom.automation.junit;
 
-import static com.nordstrom.automation.junit.LifecycleHooks.invoke;
-
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -191,6 +191,7 @@ static void releaseMappingsFor(EachTestNotifier notifier) {
         ArtifactCollector.releaseWatchersOf(description);
         CreateTest.releaseMappingsFor(atomicTest.getRunner(), atomicTest.getIdentity(), target);
         GetAnnotations.releaseAnnotationsFor(atomicTest.getIdentity());
+        TestMethodDescription.releaseDescriptionFor(atomicTest.getIdentity());
     }
 
     /**

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

@@ -0,0 +1,22 @@
+package com.nordstrom.automation.junit;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.runners.model.FrameworkField;
+
+/**
+ * This interface declares an accessor method for the [ {@code Class<Annotation>} &rarr; {@code List<FrameworkField>} ]
+ * map of {@code org.junit.runners.model.TestClass}.
+ */
+public interface FieldsForAnnotationsAccessor {
+    
+    /**
+     * Get the map that associates annotation types with the fields to which they're attached.
+     * 
+     * @return mappings from annotation types to lists of annotated fields
+     */
+    Map<Class<? extends Annotation>, List<FrameworkField>> getFieldsForAnnotations();
+
+}

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

@@ -44,6 +44,7 @@ public class JUnitAgent {
      * <ul>
      *     <li>{@code org.junit.runner.Description}</li>
      *     <li>{@code org.junit.runners.model.FrameworkMethod}</li>
+     *     <li>{@code org.junit.runners.model.TestClass}</li>
      *     <li>{@code org.junit.internal.runners.model.EachTestNotifier}</li>
      *     <li>{@code org.junit.internal.runners.model.ReflectiveCallable}</li>
      *     <li>{@code org.junit.runners.model.RunnerScheduler}</li>
@@ -52,7 +53,7 @@ public class JUnitAgent {
      *     <li>{@code org.junit.experimental.theories.Theories$TheoryAnchor}</li>
      *     <li>{@code org.junit.runner.notification.RunNotifier}</li>
      *     <li>{@code junitparams.internal.ParameterisedTestMethodRunner}</li>
-     *     <li>{@code junitparams.internal.ParametrizedDescription}</li>
+     *     <li>{@code junitparams.internal.TestMethod}</li>
      * </ul>
      *  
      * @param agentArgs agent options
@@ -110,8 +111,8 @@ public static ClassFileTransformer installTransformer(Instrumentation instrument
         final TypeDescription runWithCompleteAssignment = TypePool.Default.ofSystemLoader().describe("com.nordstrom.automation.junit.RunWithCompleteAssignment").resolve();
         // junitparams.internal.ParameterisedTestMethodRunner
         final TypeDescription nextCount = TypePool.Default.ofSystemLoader().describe("com.nordstrom.automation.junit.NextCount").resolve();
-        // junitparams.internal.ParametrizedDescription
-        final TypeDescription parameterizedDescription = TypePool.Default.ofSystemLoader().describe("com.nordstrom.automation.junit.ParameterizedDescription").resolve();
+        // junitparams.internal.TestMethod
+        final TypeDescription testMethodDescription = TypePool.Default.ofSystemLoader().describe("com.nordstrom.automation.junit.TestMethodDescription").resolve();
 
         return new AgentBuilder.Default()
                 .type(hasSuperType(named("org.junit.runner.Description")))
@@ -136,6 +137,15 @@ public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDesc
                                       .implement(Hooked.class);
                     }
                 })
+                .type(hasSuperType(named("org.junit.runners.model.TestClass")))
+                .transform(new Transformer() {
+                    @Override
+                    public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription,
+                            ClassLoader classLoader, JavaModule module) {
+                        return builder.implement(FieldsForAnnotationsAccessor.class).intercept(FieldAccessor.ofField("fieldsForAnnotations"))
+                                      .implement(Hooked.class);
+                    }
+                })
                 .type(hasSuperType(named("org.junit.internal.runners.model.EachTestNotifier")))
                 .transform(new Transformer() {
                     @Override
@@ -208,15 +218,16 @@ public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDesc
                     public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription type,
                                     ClassLoader classloader, JavaModule module) {
                         return builder.method(named("nextCount")).intercept(MethodDelegation.to(nextCount))
+                                      .implement(MethodAccessor.class).intercept(FieldAccessor.ofField("method"))
                                       .implement(Hooked.class);
                     }
                 })
-                .type(hasSuperType(named("junitparams.internal.ParametrizedDescription")))
+                .type(hasSuperType(named("junitparams.internal.TestMethod")))
                 .transform(new Transformer() {
                     @Override
                     public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription type,
                                     ClassLoader classloader, JavaModule module) {
-                        return builder.method(named("parametrizedDescription")).intercept(MethodDelegation.to(parameterizedDescription))
+                        return builder.method(named("description")).intercept(MethodDelegation.to(testMethodDescription))
                                       .implement(Hooked.class);
                     }
                 })

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

@@ -0,0 +1,17 @@
+package com.nordstrom.automation.junit;
+
+import junitparams.internal.TestMethod;
+
+/**
+ * This interface declares an accessor for the [method] field of {@code junitparams.internal.ParameterisedTestMethodRunner}.
+ */
+public interface MethodAccessor {
+
+    /**
+     * Get the JUnitParams test method of this parameterized runner.
+     * 
+     * @return {@link TestMethod} assigned to this runner
+     */
+    TestMethod getMethod();
+    
+}

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

@@ -1,8 +1,5 @@
 package com.nordstrom.automation.junit;
 
-import static com.nordstrom.automation.junit.LifecycleHooks.getFieldValue;
-import static com.nordstrom.automation.junit.LifecycleHooks.invoke;
-
 import java.util.concurrent.Callable;
 
 import junitparams.internal.ParameterisedTestMethodRunner;
@@ -31,11 +28,11 @@ public static int intercept(
             @This final ParameterisedTestMethodRunner runner, @SuperCall final Callable<?> proxy) throws Exception {
 
         // get reference to JUnitParams target test method
-        TestMethod method = getFieldValue(runner, "method");
+        TestMethod method = ((MethodAccessor) runner).getMethod();
         // if this method is being retried
         if (RetryHandler.doRetryFor(method.frameworkMethod())) {
             // get current parameter set index
-            int nextCount = invoke(runner, "count");
+            int nextCount = LifecycleHooks.invoke(runner, "count");
             // return prior index
             return nextCount - 1;
         // otherwise