Fix agent-testing tests

Author: nikita-tkachenko-datadog

dd-java-agent/instrumentation-testing/build.gradle

@@ -13,4 +13,15 @@ dependencies {
   implementation project(':dd-java-agent:agent-debugger')
 
   implementation 'org.junit.platform:junit-platform-runner:1.9.0'
+
+  testImplementation project(':utils:test-utils')
+  testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
+
+  testImplementation group: 'cglib', name: 'cglib', version: '3.2.5'
+  // test instrumenting java 1.1 bytecode
+  testImplementation group: 'net.sf.jt400', name: 'jt400', version: '6.1'
+
+  // We have autoservices defined in test subtree, looks like we need this to be able to properly rebuild this
+  testAnnotationProcessor libs.autoservice.processor
+  testCompileOnly libs.autoservice.annotation
 }

dd-java-agent/testing/src/test/groovy/ConfigResetTest.groovy renamed to dd-java-agent/instrumentation-testing/src/test/groovy/ConfigResetTest.groovy

@@ -39,7 +39,7 @@ class FieldInjectionForkedTest extends AgentTestRunner {
       "Aborting transform for class name = " + typeName + ", loader = " + classLoader)
     }
 
-    super.onDiscovery(typeName, classLoader, module, loaded)
+    Object.onDiscovery(typeName, classLoader, module, loaded)
   }
 
   def "#keyClassName structure modified = #shouldModifyStructure"() {
@@ -72,12 +72,12 @@ class FieldInjectionForkedTest extends AgentTestRunner {
 
     where:
     keyClass                            | shouldModifyStructure | isInstrumented
-    KeyClass                            | true                  | true
-    UntransformableKeyClass             | false                 | false
-    ValidSerializableKeyClass           | true                  | true
-    InvalidSerializableKeyClass         | true                  | true
-    ValidInheritsSerializableKeyClass   | true                  | true
-    InvalidInheritsSerializableKeyClass | true                  | true
+    KeyClass                            | true  | true
+    UntransformableKeyClass             | false | false
+    ValidSerializableKeyClass           | true  | true
+    InvalidSerializableKeyClass         | true  | true
+    ValidInheritsSerializableKeyClass   | true  | true
+    InvalidInheritsSerializableKeyClass | true  | true
 
     keyClassName = keyClass.getSimpleName()
   }

dd-java-agent/testing/src/test/groovy/InstrumentOldBytecode.groovy renamed to dd-java-agent/instrumentation-testing/src/test/groovy/InstrumentOldBytecode.groovy

@@ -41,13 +41,13 @@ class ExcludeFilterForkedTest extends AgentTestRunner {
 
     where:
     clazz                    | hasRunnable | hasExecutor | hasAccessor
-    ExcludedRunnable         | false       | false       | false
-    NormalRunnable           | true        | false       | true
-    RunnableExcludedExecutor | true        | false       | true
-    ExcludedExecutor         | false       | false       | false
-    NormalExecutor           | false       | true        | true
-    ExecutorExcludedRunnable | false       | true        | true
-    ExecutorRunnable         | true        | true        | true
+    ExcludedRunnable         | false | false | false
+    NormalRunnable           | true  | false | true
+    RunnableExcludedExecutor | true  | false | true
+    ExcludedExecutor         | false | false | false
+    NormalExecutor           | false | true  | true
+    ExecutorExcludedRunnable | false | true  | true
+    ExecutorRunnable         | true  | true  | true
   }
 
   static class InjectionCheck {