From 0c32a79f1d223bdf31c9c9102773260a293b5ee8 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 26 Nov 2024 10:22:35 +0100 Subject: [PATCH 1/3] fix: Fix test name uniqueness --- .../groovy/PayloadTaggingTest.groovy | 6 +-- .../commonscodec/Base64CallSiteTest.groovy | 4 +- .../Json1ParserInstrumentationTest.groovy | 4 +- ...tpServletRequestInstrumentationTest.groovy | 38 +++++++++---------- .../test/groovy/AgentTestRunnerTest.groovy | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) 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() From 7208fe859859198ac41a7a9fc80b44ac379c650e Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 26 Nov 2024 14:22:09 +0100 Subject: [PATCH 2/3] fix: Fix test name uniqueness --- .../config/EarlyFlakeDetectionSettingsSerializerTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 2859f082ef375f3f64c51bb0667fed58bae7d0f7 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 26 Nov 2024 14:25:06 +0100 Subject: [PATCH 3/3] fix: Fix test name uniqueness --- .../test/groovy/excludefilter/ExcludeFilterForkedTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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