Fixed tests.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/test/groovy/datadog/trace/instrumentation/jackson212/core/JsonParserInstrumentationTest.groovy

@@ -36,9 +36,8 @@ class JsonParserInstrumentationTest extends InstrumentationSpecification {
     JsonOutput.toJson(taintedResult) == JSON_STRING
     _ * module.taintObjectIfTainted(_, _)
     _ * module.findSource(_) >> source
-    // TODO: Mock can not resolve method with 5 args under Groovy 4
-    // 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
-    // 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
+    1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
+    1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
     0 * _
   }
 

dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/test/groovy/datadog/trace/instrumentation/jackson26/core/JsonParserInstrumentationTest.groovy

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

dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/test/groovy/datadog/trace/instrumentation/jackson28/core/JsonParserInstrumentationTest.groovy

@@ -36,9 +36,8 @@ 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(_, 'root', source.origin, 'root', JSON_STRING)
+    1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
     0 * _
   }
 

dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/test/groovy/datadog/trace/instrumentation/jackson2/core/JsonParserInstrumentationTest.groovy

@@ -36,9 +36,8 @@ 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(_, 'root', source.origin, 'root', JSON_STRING)
+    1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
     0 * _
   }
 

dd-java-agent/instrumentation/java/java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy

@@ -53,12 +53,12 @@ class DirectAllocationTrackingTest extends InstrumentationSpecification {
     def sample = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationSample")})
     sample.getLong("allocated") == 20
     sample.getString("source") == "MMAP"
-    sample.getString("allocatingClass") == "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
+    sample.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface" // TODO: Groovy 4: "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
     sample.getLong("spanId") == expectedSpanId.get()
     def total = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationTotal")})
     total.getLong("allocated") == 20
     total.getString("source") == "MMAP"
-    total.getString("allocatingClass") == "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
+    total.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface" // TODO Groovy 4: "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
 
     cleanup:
     recording.close()
@@ -80,12 +80,12 @@ class DirectAllocationTrackingTest extends InstrumentationSpecification {
     def sample = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationSample")})
     sample.getLong("allocated") == 10
     sample.getString("source") == "ALLOCATE_DIRECT"
-    sample.getString("allocatingClass") == "java_nio_ByteBuffer\$allocateDirect"
+    sample.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface" // TODO: Groovy 4: "java_nio_ByteBuffer\$allocateDirect"
     sample.getLong("spanId") == expectedSpanId.get()
     def total = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationTotal")})
     total.getLong("allocated") == 10
     total.getString("source") == "ALLOCATE_DIRECT"
-    total.getString("allocatingClass") == "java_nio_ByteBuffer\$allocateDirect"
+    total.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface"// TODO Groovy 4"java_nio_ByteBuffer\$allocateDirect"
 
     cleanup:
     recording.close()