Fix test name uniqueness (#7720)

PerfectSlayer · web-flow · commit 85b316b1c0f8 · 2024-10-03T17:07:28.000+02:00
diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/ExcludeFilterTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/ExcludeFilterTest.groovy
@@ -9,7 +9,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFil
 
 class ExcludeFilterTest extends DDSpecification {
 
-  def "test empty ExcludeFilter"() {
+  def "test empty ExcludeFilter #type.name()"() {
     setup:
     def one = new One()
     def oneName = One.getName()
@@ -22,7 +22,7 @@ class ExcludeFilterTest extends DDSpecification {
     type << ExcludeFilter.ExcludeType.values()
   }
 
-  def "test ExcludeFilter"() {
+  def "test ExcludeFilter #type.name()"() {
     setup:
     def another = new Another()
     def anotherName = Another.getName()
diff --git a/dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy b/dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy
@@ -20,7 +20,7 @@ class DefaultInstrumenterForkedTest extends DDSpecification {
     target.enabled
   }
 
-  def "default enabled override"() {
+  def "default enabled override #enabled"() {
     expect:
     target.enabled == enabled
 
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java
@@ -27,7 +27,7 @@
 
 class ComparisonExpressionTest {
 
-  @ParameterizedTest
+  @ParameterizedTest(name = "[{index}] {4}")
   @MethodSource("expressions")
   void evaluateOperator(
       ValueExpression<?> left,
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastTagTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastTagTest.groovy
@@ -9,7 +9,7 @@ import static com.datadog.iast.IastTag.Enabled.SKIPPED
 
 class IastTagTest extends DDSpecification {
 
-  void 'tags are sent on the segment'() {
+  void 'tags are sent on the segment (#tagName)'() {
     given:
     final segment = Mock(TraceSegment)
 
@@ -20,25 +20,25 @@ class IastTagTest extends DDSpecification {
     1 * segment.setTagTop(tag.key(), tag.value())
 
     where:
-    tag              | _
-    ANALYZED | _
-    SKIPPED | _
+    tagName    | tag
+    "analyzed" | ANALYZED
+    "skipped"  | SKIPPED
   }
 
-  void 'tags dont fail with null segment'() {
+  void 'tags dont fail with null segment (#tagName)'() {
     when:
     tag.setTagTop(null)
 
     then:
     noExceptionThrown()
 
     where:
-    tag              | _
-    ANALYZED | _
-    SKIPPED | _
+    tagName    | tag
+    "analyzed" | ANALYZED
+    "skipped"  | SKIPPED
   }
 
-  void 'tags are sent on the span'() {
+  void 'tags are sent on the span (#tagName)'() {
     given:
     final span = Mock(AgentSpan)
 
@@ -49,22 +49,22 @@ class IastTagTest extends DDSpecification {
     1 * span.setTag(tag.key(), tag.value())
 
     where:
-    tag              | _
-    ANALYZED | _
-    SKIPPED | _
+    tagName    | tag
+    "analyzed" | ANALYZED
+    "skipped"  | SKIPPED
   }
 
-  void 'tags dont fail with null span'() {
+  void 'tags dont fail with null span (#tagName)'() {
     when:
     tag.setTag(null)
 
     then:
     noExceptionThrown()
 
     where:
-    tag              | _
-    ANALYZED | _
-    SKIPPED | _
+    tagName    | tag
+    "analyzed" | ANALYZED
+    "skipped"  | SKIPPED
   }
 
   void 'enabled tags are not set if IAST is opt-out'() {
diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy
@@ -58,7 +58,7 @@ class EvidenceRedactionTest extends DDSpecification {
     vulnerabilitiesParser = moshi.adapter(Types.newParameterizedType(List, Vulnerability))
   }
 
-  void 'test empty value parts'() {
+  void 'test empty value parts #iterationIndex'() {
     given:
     final writer = Stub(JsonWriter)
     final ctx = new AdapterFactory.Context()
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
@@ -39,7 +39,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
     }
   }
 
-  void '#method(#args) not taintable'() {
+  void '#method(#argTypes) not taintable'() {
     when: 'there is no context by default'
     module.&"$method".call(args.toArray())
 
@@ -102,6 +102,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
     ]
     'findSource'                | [null]
     'isTainted'                 | [null]
+    argTypes = args*.class.name
   }
 
   void '#method without span'() {
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ResourceLocatingTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ResourceLocatingTest.groovy
@@ -24,7 +24,7 @@ class ResourceLocatingTest extends DDSpecification {
     lastLookup.set(null)
   }
 
-  def "finds resources from parent classloader"() {
+  def "finds resources from parent classloader #locator.class.name"() {
     expect:
     locator.locate("java/lang/Object").isResolved() == usesProvidedClassloader
     // lastLookup verifies that the given classloader is only used when expected
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/AdvicesInvokeDynamicTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/AdvicesInvokeDynamicTest.groovy
@@ -10,7 +10,7 @@ import spock.lang.Requires
 })
 class AdvicesInvokeDynamicTest extends BaseCallSiteTest {
 
-  void 'test constant pool introspector with invoke dynamic'() {
+  void 'test constant pool introspector with invoke dynamic #pointcutName'() {
     setup:
     final type = new TypeDescription.ForLoadedType(StringPlusExample)
     final advice = Stub(InvokeDynamicAdvice)
@@ -29,9 +29,10 @@ class AdvicesInvokeDynamicTest extends BaseCallSiteTest {
     pointcutMock                  | emptyAdvices | adviceFound
     stringConcatPointcut()        | true         | false
     stringConcatFactoryPointcut() | false        | true
+    pointcutName = pointcutMock.descriptor
   }
 
-  void 'test constant pool introspector with invoke dynamic and constants'() {
+  void 'test constant pool introspector with invoke dynamic and constants #pointcutName'() {
     setup:
     final type = new TypeDescription.ForLoadedType(StringPlusConstantsExample)
     final advice = Stub(InvokeDynamicAdvice)
@@ -50,5 +51,6 @@ class AdvicesInvokeDynamicTest extends BaseCallSiteTest {
     pointcutMock                  | emptyAdvices | adviceFound
     stringConcatPointcut()        | true         | false
     stringConcatFactoryPointcut() | false        | true
+    pointcutName = pointcutMock.descriptor
   }
 }
diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/powerwaf/DataBundleMapWrapperSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/powerwaf/DataBundleMapWrapperSpecification.groovy
@@ -25,7 +25,7 @@ class DataBundleMapWrapperSpecification extends DDSpecification {
     def elem
 
     expect:
-    iter.hasNext() == true
+    iter.hasNext()
 
     when:
     elem = iter.next()
@@ -46,7 +46,7 @@ class DataBundleMapWrapperSpecification extends DDSpecification {
     then:
     elem.key == KnownAddresses.REQUEST_CLIENT_IP.key
     elem.value == [:]
-    iter.hasNext() == false
+    !iter.hasNext()
 
     when:
     iter.remove()
@@ -71,25 +71,24 @@ class DataBundleMapWrapperSpecification extends DDSpecification {
     thrown(UnsupportedOperationException)
   }
 
-  void 'methods other than entrySet and size are not supported'() {
+  void 'methods other than entrySet and size are not supported: #methodName'() {
     when:
     method(mapWrapper)
 
     then:
     thrown(UnsupportedOperationException)
 
     where:
-    method << [
-      { it.values() },
-      { it.keySet() },
-      { it.clear() },
-      { it.putAll([:]) },
-      { it.remove('a') },
-      { it.put('b', 'a') },
-      { it.get('a') },
-      { it.containsValue('b') },
-      { it.containsKey('a') },
-      { it.isEmpty() },
-    ]
+    methodName      | method
+    "values"        | { it.values() }
+    "keySet"        | { it.keySet() }
+    "clean"         | { it.clear() }
+    "putAll"        | { it.putAll([:]) }
+    "remove"        | { it.remove('a') }
+    "put"           | { it.put('b', 'a') }
+    "get"           | { it.get('a') }
+    "containsValue" | { it.containsValue('b') }
+    "containsKey"   | { it.containsKey('a') }
+    "empty"         | { it.isEmpty() }
   }
 }
diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/test/groovy/JakartaRsAnnotations3InstrumentationTest.groovy b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/test/groovy/JakartaRsAnnotations3InstrumentationTest.groovy
@@ -141,6 +141,10 @@ class JakartaRsAnnotations3InstrumentationTest extends AgentTestRunner {
 
   def "no annotations has no effect"() {
     setup:
+    def obj = new Jakarta() {
+        void call() {
+        }
+      }
     runUnderTrace("test") {
       obj.call()
     }
@@ -157,13 +161,6 @@ class JakartaRsAnnotations3InstrumentationTest extends AgentTestRunner {
         }
       }
     }
-
-    where:
-    obj | _
-    new Jakarta() {
-        void call() {
-        }
-      }   | _
   }
 
   interface Jakarta {
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/CrossedContextTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/CrossedContextTest.groovy
@@ -42,7 +42,7 @@ class CrossedContextTest extends AgentTestRunner {
     pool.shutdownNow()
   }
 
-  def "concurrent #action are traced with correct lineage in #executor"() {
+  def "concurrent #action are traced with correct lineage in #executor.class.name"() {
     when:
     def sut = executor
     def fn = function
@@ -102,7 +102,7 @@ class CrossedContextTest extends AgentTestRunner {
     new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 1, 5, TimeUnit.SECONDS, new TaskQueue()) | "execution"  | executeRunnable
   }
 
-  def "netty event loop internal executions in #executor are traced with correct lineage" () {
+  def "netty event loop internal executions in #executor.class.name are traced with correct lineage" () {
     setup:
     ExecutorService pool = executor
     when:
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy
@@ -14,7 +14,7 @@ class TaskUnwrappingForkedTest extends AgentTestRunner {
     super.configurePreAgent()
   }
 
-  def "check expected types instrumented and can be unwrapped"() {
+  def "check expected types instrumented and can be unwrapped (#iterationIndex)"() {
     expect:
     task instanceof TaskWrapper
     type.isAssignableFrom(TaskWrapper.getUnwrappedType(task))
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy
@@ -20,7 +20,7 @@ class RecursiveThreadPoolPropagationTest extends AgentTestRunner {
   @Shared
   def mixedSubmissionAndExecution = { executor, depth -> executor.submit(new RecursiveThreadPoolMixedSubmissionAndExecution(executor, depth, 0)) }
 
-  def "propagate context in #executor with #parallelism threads #depth times"() {
+  def "propagate context in #executor.class.name with #parallelism threads #depth times"() {
     when:
     test(executor, depth)
     then:
diff --git a/dd-java-agent/instrumentation/java-util/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy b/dd-java-agent/instrumentation/java-util/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy
@@ -14,7 +14,7 @@ class ThreadLocalRandomCallSiteTest extends AgentTestRunner {
     injectSysConfig('dd.iast.enabled', 'true')
   }
 
-  void 'test #target.#method methods'() {
+  void 'test #target.class.name #method methods'() {
     setup:
     final module = Mock(WeakRandomnessModule)
     InstrumentationBridge.registerIastModule(module)
diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy
@@ -141,6 +141,10 @@ class JaxRsAnnotations1InstrumentationTest extends AgentTestRunner {
 
   def "no annotations has no effect"() {
     setup:
+    def obj = new Jax() {
+        void call() {
+        }
+      }
     runUnderTrace("test") {
       obj.call()
     }
@@ -157,13 +161,6 @@ class JaxRsAnnotations1InstrumentationTest extends AgentTestRunner {
         }
       }
     }
-
-    where:
-    obj | _
-    new Jax() {
-        void call() {
-        }
-      }   | _
   }
 
   interface Jax {
diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotations2InstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotations2InstrumentationTest.groovy
@@ -141,6 +141,10 @@ class JaxRsAnnotations2InstrumentationTest extends AgentTestRunner {
 
   def "no annotations has no effect"() {
     setup:
+    def obj = new Jax() {
+        void call() {
+        }
+      }
     runUnderTrace("test") {
       obj.call()
     }
@@ -157,13 +161,6 @@ class JaxRsAnnotations2InstrumentationTest extends AgentTestRunner {
         }
       }
     }
-
-    where:
-    obj | _
-    new Jax() {
-        void call() {
-        }
-      }   | _
   }
 
   interface Jax {
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy
@@ -9,7 +9,7 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume
     return new KotlinCoroutineTests(dispatcher)
   }
 
-  def "kotlin traced across channels"() {
+  def "kotlin traced across channels #dispatcherName"() {
     setup:
     KotlinCoroutineTests kotlinTest = new KotlinCoroutineTests(dispatcher)
     int expectedNumberOfSpans = kotlinTest.tracedAcrossChannels()
@@ -23,6 +23,6 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume
     findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId()
 
     where:
-    dispatcher << AbstractKotlinCoroutineInstrumentationTest.dispatchersToTest
+    [dispatcherName, dispatcher] << dispatchersToTest
   }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.5/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.5/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy
@@ -9,7 +9,7 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume
     return new KotlinCoroutineTests(dispatcher)
   }
 
-  def "kotlin traced across flows"() {
+  def "kotlin traced across flows #dispatcherName"() {
     setup:
     KotlinCoroutineTests kotlinTest = new KotlinCoroutineTests(dispatcher)
     int expectedNumberOfSpans = kotlinTest.tracedAcrossFlows(false)
@@ -23,10 +23,10 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume
     findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId()
 
     where:
-    dispatcher << AbstractKotlinCoroutineInstrumentationTest.dispatchersToTest
+    [dispatcherName, dispatcher] << dispatchersToTest
   }
 
-  def "kotlin traced across flows with modified context"() {
+  def "kotlin traced across flows with modified context #dispatcherName"() {
     setup:
     KotlinCoroutineTests kotlinTest = new KotlinCoroutineTests(dispatcher)
     int expectedNumberOfSpans = kotlinTest.tracedAcrossFlows(true)
@@ -40,6 +40,6 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume
     findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId()
 
     where:
-    dispatcher << AbstractKotlinCoroutineInstrumentationTest.dispatchersToTest
+    [dispatcherName, dispatcher] << dispatchersToTest
   }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy
diff --git a/dd-java-agent/testing/src/test/groovy/context/FieldInjectionForkedTest.groovy b/dd-java-agent/testing/src/test/groovy/context/FieldInjectionForkedTest.groovy
diff --git a/internal-api/src/test/groovy/datadog/trace/api/cache/FixedSizeCacheTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/cache/FixedSizeCacheTest.groovy
diff --git a/internal-api/src/test/groovy/datadog/trace/api/iast/secrets/HardcodedSecretMatcherTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/iast/secrets/HardcodedSecretMatcherTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class DefaultInstrumenterForkedTest extends DDSpecification {`
`20`	`20`	`target.enabled`
`21`	`21`	`}`
`22`	`22`
`23`		`- def "default enabled override"() {`
	`23`	`+ def "default enabled override #enabled"() {`
`24`	`24`	`expect:`
`25`	`25`	`target.enabled == enabled`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class EvidenceRedactionTest extends DDSpecification {`
`58`	`58`	`vulnerabilitiesParser = moshi.adapter(Types.newParameterizedType(List, Vulnerability))`
`59`	`59`	`}`
`60`	`60`
`61`		`- void 'test empty value parts'() {`
	`61`	`+ void 'test empty value parts #iterationIndex'() {`
`62`	`62`	`given:`
`63`	`63`	`final writer = Stub(JsonWriter)`
`64`	`64`	`final ctx = new AdapterFactory.Context()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- void '#method(#args) not taintable'() {`
	`42`	`+ void '#method(#argTypes) not taintable'() {`
`43`	`43`	`when: 'there is no context by default'`
`44`	`44`	`module.&"$method".call(args.toArray())`
`45`	`45`
`@@ -102,6 +102,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {`
`102`	`102`	`]`
`103`	`103`	`'findSource' \| [null]`
`104`	`104`	`'isTainted' \| [null]`
	`105`	`+ argTypes = args*.class.name`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`void '#method without span'() {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ResourceLocatingTest extends DDSpecification {`
`24`	`24`	`lastLookup.set(null)`
`25`	`25`	`}`
`26`	`26`
`27`		`- def "finds resources from parent classloader"() {`
	`27`	`+ def "finds resources from parent classloader #locator.class.name"() {`
`28`	`28`	`expect:`
`29`	`29`	`locator.locate("java/lang/Object").isResolved() == usesProvidedClassloader`
`30`	`30`	`// lastLookup verifies that the given classloader is only used when expected`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,10 @@ class JakartaRsAnnotations3InstrumentationTest extends AgentTestRunner {`
`141`	`141`
`142`	`142`	`def "no annotations has no effect"() {`
`143`	`143`	`setup:`
	`144`	`+ def obj = new Jakarta() {`
	`145`	`+ void call() {`
	`146`	`+ }`
	`147`	`+ }`
`144`	`148`	`runUnderTrace("test") {`
`145`	`149`	`obj.call()`
`146`	`150`	`}`
`@@ -157,13 +161,6 @@ class JakartaRsAnnotations3InstrumentationTest extends AgentTestRunner {`
`157`	`161`	`}`
`158`	`162`	`}`
`159`	`163`	`}`
`160`		`-`
`161`		`- where:`
`162`		`- obj \| _`
`163`		`- new Jakarta() {`
`164`		`- void call() {`
`165`		`- }`
`166`		`- } \| _`
`167`	`164`	`}`
`168`	`165`
`169`	`166`	`interface Jakarta {`