Refine Byte Buddy transform to eliminate muddled matching

Author: sbabcoc

README.md

@@ -303,7 +303,9 @@ Note that the implementation in this method watcher uses the annotations attache
 
 ### Support for Standard JUnit RunListener Providers
 
-As indicated previously, **JUnit Foundation** will automatically attach standard JUnit **RunListener** providers that are declared in the associated **ServiceLoader** provider configuration file (i.e. - **_org.junit.runner.notification.RunListener_**). Declared run listeners are attached to the **RunNotifier** supplied to the `run()` method of JUnit runners. This feature eliminates behavioral differences between the various test execution environments like Maven, Gradle, and native IDE test runners.
+As indicated previously, **JUnit Foundation** will automatically attach standard JUnit **`RunListener`** providers that are declared in the associated **`ServiceLoader`** provider configuration file (i.e. - **_org.junit.runner.notification.RunListener_**). Declared run listeners are attached to the **`RunNotifier`** supplied to the `run()` method of JUnit runners. This feature eliminates behavioral differences between the various test execution environments like Maven, Gradle, and native IDE test runners.
+
+**JUnit Foundation** uses this feature internally; notifications sent to **`RunWatcher`** service providers are published by an auto-attached **`RunListener`**. This notification-enhancing run listener, named [RunAnnouncer](https://github.com/Nordstrom/JUnit-Foundation/blob/master/src/main/java/com/nordstrom/automation/junit/RunAnnouncer.java), is registered via the aforementioned [**ServiceLoader** provider configuration file](https://github.com/Nordstrom/JUnit-Foundation/blob/master/src/main/resources/META-INF/services/org.junit.runner.notification.RunListener).
 
 ### Support for Parallel Execution
 

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

@@ -19,7 +19,6 @@
 import com.nordstrom.common.file.PathUtils.ReportsDirectory;
 
 import net.bytebuddy.agent.builder.AgentBuilder;
-import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.method.MethodDescription.SignatureToken;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.implementation.MethodDelegation;
@@ -74,17 +73,20 @@ public static ClassFileTransformer installTransformer(Instrumentation instrument
         SignatureToken runToken = new SignatureToken("run", TypeDescription.VOID, Arrays.asList(runNotifier));
 
         return new AgentBuilder.Default()
-                .type(hasSuperType(named("org.junit.internal.runners.model.ReflectiveCallable"))
-                  .or(hasSuperType(named("org.junit.runners.model.RunnerScheduler")))
-                  .or(hasSuperType(named("org.junit.runners.BlockJUnit4ClassRunner")))
-                  .or(hasSuperType(named("org.junit.runners.ParentRunner"))))
+                .type(hasSuperType(named("org.junit.internal.runners.model.ReflectiveCallable")))
                 .transform((builder, type, classLoader, module) -> 
                         builder.method(named("runReflectiveCall")).intercept(MethodDelegation.to(runReflectiveCall))
-                               .method(named("finished")).intercept(MethodDelegation.to(finished))
-                               .method(named("createTest")).intercept(MethodDelegation.to(createTest))
+                               .implement(Hooked.class))
+                .type(hasSuperType(named("org.junit.runners.model.RunnerScheduler")))
+                .transform((builder, type, classLoader, module) -> 
+                        builder.method(named("finished")).intercept(MethodDelegation.to(finished))
+                               .implement(Hooked.class))
+                .type(hasSuperType(named("org.junit.runners.ParentRunner")))
+                .transform((builder, type, classLoader, module) -> 
+                        builder.method(named("createTest")).intercept(MethodDelegation.to(createTest))
                                .method(named("runChild")).intercept(MethodDelegation.to(runChild))
                                .method(hasSignature(runToken)).intercept(MethodDelegation.to(run))
-                .implement(Hooked.class))
+                               .implement(Hooked.class))
                 .installOn(instrumentation);
     }