diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy index 99b0f339869..85dd38257f5 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy @@ -6,7 +6,7 @@ import spock.lang.Specification class EarlyFlakeDetectionSettingsSerializerTest extends Specification { - def "test serialization: #settings"() { + def "test serialization: #iterationIndex"() { when: Serializer s = new Serializer() EarlyFlakeDetectionSettingsSerializer.serialize(s, settings) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy index 5ae6cf5fbca..d517fba940e 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy @@ -50,7 +50,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification { ) } - def "test git info extraction for local fs"() { + def "test git info extraction for local fs #gitFolder"() { setup: def sut = new LocalFSGitInfoExtractor() @@ -119,7 +119,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification { fullMessage == null } - def "test repository url with different remotes"() { + def "test repository url with different remotes #gitFolder"() { setup: def sut = new LocalFSGitInfoExtractor() diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy index 13ed28d29d4..de3b4aeb4d5 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy @@ -154,6 +154,11 @@ class SerializerTest extends Specification { this.b = b } + @Override + String toString() { + "$a / $b" + } + boolean equals(o) { if (this.is(o)) { return true diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy index 44eb840307b..40788ecdc3b 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy @@ -688,7 +688,7 @@ class PropagationModuleTest extends IastModuleImplTestBase { } private Date date(Source source = null, int mark = NOT_MARKED) { - final result = new Date() + final result = new Date(1234567890) // Use a fixed date if (source != null) { taintObject(result, source, mark) } diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy index e672e738000..597ca47ff20 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy @@ -1,4 +1,5 @@ import datadog.trace.agent.test.AgentTestRunner +import datadog.trace.agent.test.server.http.TestHttpServer import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.sink.SsrfModule import org.apache.http.HttpHost @@ -31,7 +32,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner { } } - void 'test ssrf httpClient execute method with args #args expecting call module'() { + void 'test ssrf httpClient execute method expecting call module #iterationIndex'() { given: final ssrf = Mock(SsrfModule) InstrumentationBridge.registerIastModule(ssrf) @@ -68,7 +69,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner { return new BasicHttpRequest("GET", server.address.toString()) } - private static HttpHost getHttpHost(final server){ + private static HttpHost getHttpHost(final TestHttpServer server){ return new HttpHost(server.address.host, server.address.port, server.address.scheme) } } diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy index e8b810239ba..146d0085709 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy @@ -184,7 +184,7 @@ class PayloadTaggingExpansionForkedTest extends AbstractPayloadTaggingTest { injectSysConfig(TracerConfig.TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING, "\$.MessageId,\$.SubscriptionArn,\$[*].phoneNumbers") } - def "support various types, embedded JSON in string and binary format"() { + def "support various types, embedded JSON in string and binary format #expectedReqTag"() { setup: TEST_WRITER.clear() @@ -261,7 +261,7 @@ class PayloadTaggingMaxDepthForkedTest extends AbstractPayloadTaggingTest { injectSysConfig(TracerConfig.TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH, "4") } - def "generate tags up to the specified max depth"() { + def "generate tags up to the specified max depth #expectedReqTag"() { setup: TEST_WRITER.clear() @@ -315,7 +315,7 @@ class PayloadTaggingMaxTagsForkedTest extends AbstractPayloadTaggingTest { injectSysConfig(TracerConfig.TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS, "5") } - def "generate tags up to the specified max number"() { + def "generate tags up to the specified max number #iterationIndex"() { setup: TEST_WRITER.clear() diff --git a/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy b/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy index c736a1e0b5a..a710e1bd439 100644 --- a/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy +++ b/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy @@ -15,7 +15,7 @@ class Base64CallSiteTest extends AgentTestRunner { injectSysConfig('dd.iast.enabled', 'true') } - void 'test encode base 64'() { + void 'test encode base 64 #iterationIndex'() { given: final module = Mock(CodecModule) InstrumentationBridge.registerIastModule(module) @@ -33,7 +33,7 @@ class Base64CallSiteTest extends AgentTestRunner { 'encode' | ['Hello'.bytes, new Base64()] } - void 'test decode base 64'() { + void 'test decode base 64 #iterationIndex'() { given: final module = Mock(CodecModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy index 21d39274890..847a5dbc044 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy @@ -17,7 +17,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner { injectSysConfig("dd.iast.enabled", "true") } - void 'test json parsing (tainted)'() { + void 'test json parsing #iterationIndex (tainted)'() { given: final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) @@ -45,7 +45,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner { target << testSuite() } - void 'test json parsing (not tainted)'() { + void 'test json parsing #iterationIndex (not tainted)'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy index a70e7a9a110..a314b59ddf3 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy @@ -38,7 +38,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { InstrumentationBridge.clearIastModules() } - void 'test getHeader'() { + void 'test getHeader #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -58,7 +58,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getHeaders'() { + void 'test getHeaders #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -79,7 +79,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getHeaderNames'() { + void 'test getHeaderNames #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -100,7 +100,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameter'() { + void 'test getParameter #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -120,7 +120,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterValues'() { + void 'test getParameterValues #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -141,7 +141,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterMap'() { + void 'test getParameterMap #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -168,7 +168,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { } - void 'test getParameterNames'() { + void 'test getParameterNames #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -189,7 +189,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getCookies'() { + void 'test getCookies #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -210,7 +210,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test that get headers does not fail when servlet related code fails'() { + void 'test that get headers does not fail when servlet related code fails #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -238,7 +238,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test that get header names does not fail when servlet related code fails'() { + void 'test that get header names does not fail when servlet related code fails #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -266,7 +266,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test get query string'() { + void 'test get query string #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -287,7 +287,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getInputStream'() { + void 'test getInputStream #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -308,7 +308,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getReader'() { + void 'test getReader #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -329,7 +329,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getRequestDispatcher'() { + void 'test getRequestDispatcher #iterationIndex'() { setup: final iastModule = Mock(UnvalidatedRedirectModule) InstrumentationBridge.registerIastModule(iastModule) @@ -351,7 +351,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getRequestURI'() { + void 'test getRequestURI #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -372,7 +372,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getPathInfo'() { + void 'test getPathInfo #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -393,7 +393,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getPathTranslated'() { + void 'test getPathTranslated #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -414,7 +414,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getRequestURL'() { + void 'test getRequestURL #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -435,7 +435,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getSession'() { + void 'test getSession #iterationIndex'() { setup: final iastModule = Mock(ApplicationModule) InstrumentationBridge.registerIastModule(iastModule) diff --git a/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy b/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy index 611d0127176..72bda341905 100644 --- a/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy +++ b/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy @@ -132,7 +132,7 @@ class AgentTestRunnerTest extends AgentTestRunner { noExceptionThrown() } - def "excluded classes are not instrumented"() { + def "excluded classes are not instrumented #iterationIndex"() { when: runUnderTrace("parent") { subject.run() diff --git a/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy b/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy index b8ec37f065e..13b78fea5d6 100644 --- a/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy +++ b/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy @@ -18,7 +18,7 @@ import static excludefilter.ExcludeFilterTestInstrumentation.RunnableExcludedExe class ExcludeFilterForkedTest extends AgentTestRunner { - def "test ExcludeFilter"() { + def "test ExcludeFilter #runnable.class.name"() { expect: ExcludeFilter.exclude(RUNNABLE, runnable) == excluded