Ignore tests.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy

@@ -33,13 +33,12 @@ class Json1ParserInstrumentationTest extends InstrumentationSpecification {
     JsonOutput.toJson(taintedResult) == JSON_STRING
     _ * module.taintObjectIfTainted(_, _)
     _ * module.findSource(_) >> source
-    // TODO: Groovy 4 issues
-    // 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
-    // 1 * module.taintString(_, 'root_value', source.origin, 'root', JSON_STRING)
-    // 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
-    // 1 * module.taintString(_, 'nested_array', source.origin, 'nested_array', JSON_STRING)
-    // 1 * module.taintString(_, 'array_0', source.origin, 'nested_array', JSON_STRING)
-    // 1 * module.taintString(_, 'array_1', source.origin, 'nested_array', JSON_STRING)
+    1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
+    1 * module.taintString(_, 'root_value', source.origin, 'root', JSON_STRING)
+    1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
+    1 * module.taintString(_, 'nested_array', source.origin, 'nested_array', JSON_STRING)
+    1 * module.taintString(_, 'array_0', source.origin, 'nested_array', JSON_STRING)
+    1 * module.taintString(_, 'array_1', source.origin, 'nested_array', JSON_STRING)
     0 * _
 
     where:

dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/test/groovy/datadog/trace/instrumentation/jackson216/core/JsonParserInstrumentationTest.groovy

@@ -36,10 +36,9 @@ class JsonParserInstrumentationTest extends InstrumentationSpecification {
     JsonOutput.toJson(taintedResult) == JSON_STRING
     _ * module.taintObjectIfTainted(_, _)
     _ * module.findSource(_) >> source
-    // TODO: Groovy 4 issues
-    // 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
-    // 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
-    // 1 * module.taintString(_, 'nested_array', source.origin, 'nested_array', JSON_STRING)
+    1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
+    1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
+    1 * module.taintString(_, 'nested_array', source.origin, 'nested_array', JSON_STRING)
     0 * _
   }
 

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

@@ -8,12 +8,12 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.apache.maven.wrapper.MavenWrapperMain
-import org.junit.Ignore
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.w3c.dom.Document
 import org.w3c.dom.NodeList
 import spock.lang.AutoCleanup
+import spock.lang.Ignore
 import spock.lang.Shared
 import spock.lang.TempDir
 import spock.util.environment.Jvm

settings.gradle.kts

@@ -435,7 +435,7 @@ include(
   ":dd-java-agent:instrumentation:junit:junit-5.3",
   ":dd-java-agent:instrumentation:junit:junit-5.3:junit-5.8",
   ":dd-java-agent:instrumentation:junit:junit-5.3:cucumber-junit-5",
-  // ":dd-java-agent:instrumentation:junit:junit-5.3:spock-junit-5", TODO fix Groovy 4.x compatibility probably this module needs Groovy 3
+  ":dd-java-agent:instrumentation:junit:junit-5.3:spock-junit-5",
   ":dd-java-agent:instrumentation:kafka:kafka-clients-0.11",
   ":dd-java-agent:instrumentation:kafka:kafka-clients-3.8",
   ":dd-java-agent:instrumentation:kafka:kafka-common",