Fix tests for the testing module

Author: nikita-tkachenko-datadog

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/SpockExtension.java

@@ -61,7 +61,7 @@ public void handleTestExecutionException(ExtensionContext ctx, Throwable ex) thr
     throw ex;
   }
 
-  private static void fixTooManyInvocationsError(final TooManyInvocationsError error) {
+  static void fixTooManyInvocationsError(final TooManyInvocationsError error) {
     final List<IMockInvocation> accepted = error.getAcceptedInvocations();
     for (final IMockInvocation invocation : accepted) {
       try {

dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy

@@ -1,6 +1,6 @@
 import com.google.common.reflect.ClassPath
 import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.agent.test.SpockRunner
+import datadog.trace.agent.test.BootstrapClasspathSetup
 import datadog.trace.agent.test.utils.ClasspathUtils
 import datadog.trace.api.GlobalTracer
 import datadog.trace.api.Platform
@@ -37,7 +37,7 @@ class AgentTestRunnerTest extends AgentTestRunner {
 
   def "spock runner bootstrap prefixes correct for test setup"() {
     expect:
-    SpockRunner.BOOTSTRAP_PACKAGE_PREFIXES_COPY == Constants.BOOTSTRAP_PACKAGE_PREFIXES
+    BootstrapClasspathSetup.BOOTSTRAP_PACKAGE_PREFIXES_COPY == Constants.BOOTSTRAP_PACKAGE_PREFIXES
   }
 
   def "classpath setup"() {

dd-java-agent/testing/src/test/groovy/TooManyInvocationsErrorListenerTest.groovy

@@ -1,12 +1,6 @@
 import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.agent.test.SpockRunner
-import org.junit.runner.Description
-import org.junit.runner.notification.Failure
-import org.spockframework.mock.IMockInteraction
-import org.spockframework.mock.IMockMethod
-import org.spockframework.mock.IMockObject
-import org.spockframework.mock.IResponseGenerator
-import org.spockframework.mock.TooManyInvocationsError
+import datadog.trace.agent.test.SpockExtension
+import org.spockframework.mock.*
 import org.spockframework.mock.runtime.MockInvocation
 
 class TooManyInvocationsErrorListenerTest extends AgentTestRunner {
@@ -19,18 +13,16 @@ class TooManyInvocationsErrorListenerTest extends AgentTestRunner {
       Stub(IMockMethod),
       [error],
       Stub(IResponseGenerator)))
-    final failure = new Failure(new Description(TooManyInvocationsErrorListenerTest, 'test'), error)
 
     when:
-    failure.getMessage()
+    error.getMessage()
 
     then:
     thrown(StackOverflowError)
 
     when:
-    final listener = new SpockRunner.TooManyInvocationsErrorListener()
-    listener.testFailure(failure)
-    failure.getMessage()
+    SpockExtension.fixTooManyInvocationsError(error)
+    error.getMessage()
 
     then:
     noExceptionThrown()