Fixed tests and refactored configurations.

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 6a4b28ab5933 · 2025-11-21T09:23:25.000-05:00
diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/groovy/GroovySpockConventionPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/groovy/GroovySpockConventionPlugin.kt
@@ -39,12 +39,10 @@ class GroovySpockConventionPlugin : Plugin<Project> {
         else -> error("Unsupported groovyVersion=$groovyVersion (only 3 or 4 supported)")
       }
 
-      val catalogs = project.extensions.getByType(VersionCatalogsExtension::class.java)
-      val libsCatalog = catalogs.named("libs")
+      val catalogs = project.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
 
-      fun findLibrary(alias: String) =
-        libsCatalog.findLibrary(alias)
-          .orElseThrow { IllegalArgumentException("No library '$alias' in version catalog 'libs'") }
+      fun findLibrary(alias: String) = catalogs.findLibrary(alias)
+        .orElseThrow { IllegalArgumentException("Library not found in catalog for alias: $alias") }
 
       val defaultLibs = listOf(
         findLibrary(groovyAlias),
@@ -56,21 +54,15 @@ class GroovySpockConventionPlugin : Plugin<Project> {
       fun configureDependencies(cfg: String, deps: List<Any>) =
         deps.forEach { project.dependencies.add(cfg, it) }
 
-      // If nothing configured, setup default configuration
       val configurations = extension.configurations
 
       if (configurations.isEmpty()) {
-          configureDependencies("testImplementation", defaultLibs)
+        // If nothing configured, setup default configuration, suitable in most cases.
+        configureDependencies("testImplementation", defaultLibs)
       } else {
         configurations.forEach { (cfg, deps) ->
-          deps.forEach { dep ->
-            if (dep is String && "default".equals(dep, ignoreCase = true)) {
-              configureDependencies(cfg, defaultLibs)
-            }
-            else {
-              project.dependencies.add(cfg, dep)
-            }
-          }
+          configureDependencies(cfg, defaultLibs)
+          deps.forEach { project.dependencies.add(cfg, it) }
         }
       }
     }
diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/groovy/GroovySpockExtension.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/groovy/GroovySpockExtension.kt
@@ -21,12 +21,8 @@ abstract class GroovySpockExtension @Inject constructor(
     groovyVersion.set(version)
   }
 
-  fun configureDependency(taskName: String, dependency: Any) {
-    configurations.computeIfAbsent(taskName) { mutableListOf() }.add(dependency)
-  }
-
-  fun configureDefaultDependencies(taskName: String) {
-    configureDependency(taskName, "default")
+  fun configureDependencies(taskName: String, vararg dependencies: Any) {
+    configurations.computeIfAbsent(taskName) { mutableListOf() }.addAll(dependencies)
   }
 }
 
diff --git a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle
@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle
@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
@@ -35,8 +35,8 @@ protobuf {
 }
 
 groovySpock {
-  configureDefaultDependencies("testImplementation")
-  configureDependency("testImplementation", libs.groovy4.yaml)
+  configureDependencies("testImplementation")
+  configureDependencies("testImplementation", libs.groovy4.yaml)
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle b/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle
@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-java-agent/appsec/appsec-test-fixtures/build.gradle b/dd-java-agent/appsec/appsec-test-fixtures/build.gradle
@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
@@ -392,7 +392,7 @@ tasks.register('checkAgentJarSize') {
   doLast {
     // Arbitrary limit to prevent unintentional increases to the agent jar size
     // Raise or lower as required
-    // TODO fix me!!!!: assert tasks.named("shadowJar", ShadowJar).get().archiveFile.get().getAsFile().length() <= 32 * 1024 * 1024
+    assert tasks.named("shadowJar", ShadowJar).get().archiveFile.get().getAsFile().length() <= 32 * 1024 * 1024
   }
 
   dependsOn "shadowJar"
diff --git a/dd-java-agent/instrumentation-testing/build.gradle b/dd-java-agent/instrumentation-testing/build.gradle
@@ -1,8 +1,8 @@
 apply from: "$rootDir/gradle/java.gradle"
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
-  configureDefaultDependencies("testImplementation")
+  configureDependencies("compileOnly")
+  configureDependencies("testImplementation")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle
@@ -18,7 +18,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('latestDepForkedTest', 'test')
 
 groovySpock {
-  configureDefaultDependencies("testFixturesCompileOnly")
+  configureDependencies("testFixturesCompileOnly")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle
@@ -37,7 +37,7 @@ kotlin {
 }
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 addTestSuite('latestDepTest')
diff --git a/dd-java-agent/instrumentation/liberty-20/build.gradle b/dd-java-agent/instrumentation/liberty-20/build.gradle
@@ -29,8 +29,8 @@ def unpackOpenLiberty = tasks.register('unpackOpenLiberty', UnpackOpenLiberty) {
 def filterLogbackClassic = tasks.register('filterLogbackClassic', Sync)
 
 groovySpock {
-  configureDefaultDependencies("testImplementation")
-  configureDependency("testImplementation", libs.groovy4.xml)
+  configureDependencies("testImplementation")
+  configureDependencies("testImplementation", libs.groovy4.xml)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/liberty-23/build.gradle b/dd-java-agent/instrumentation/liberty-23/build.gradle
@@ -33,8 +33,8 @@ def filterLogbackClassic = tasks.register('filterLogbackClassic', Sync)
 def shadowJar = tasks.named("shadowJar", ShadowJar)
 
 groovySpock {
-  configureDefaultDependencies("testImplementation")
-  configureDependency("testImplementation", libs.groovy4.xml)
+  configureDependencies("testImplementation")
+  configureDependencies("testImplementation", libs.groovy4.xml)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/build.gradle b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/build.gradle
@@ -30,8 +30,8 @@ configurations.configureEach {
 }
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
-  configureDefaultDependencies("testImplementation")
+  configureDependencies("testFixturesApi")
+  configureDependencies("testImplementation")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/selenium/build.gradle b/dd-java-agent/instrumentation/selenium/build.gradle
@@ -18,7 +18,7 @@ muzzle {
 addTestSuite('latestDepTest')
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle
@@ -51,7 +51,7 @@ tasks.register('relocatedJavaxJar', ShadowJar) {
 }
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle
@@ -31,7 +31,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('latestDepForkedTest', 'test')
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/spark/build.gradle b/dd-java-agent/instrumentation/spark/build.gradle
@@ -8,7 +8,7 @@ configurations.configureEach {
 }
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
@@ -25,8 +25,8 @@ tasks.named("compileJava", JavaCompile) {
 }
 
 groovySpock {
-  configureDefaultDependencies("testImplementation")
-  configureDependency("testImplementation", libs.spock.spring.groovy4)
+  configureDependencies("testImplementation")
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle
@@ -24,11 +24,10 @@ tasks.named("iastTest", Test) {
 }
 
 groovySpock {
-  configureDefaultDependencies("testImplementation")
-  configureDependency("testImplementation", libs.spock.spring.groovy4)
-  configureDependency("bootTestImplementation", libs.spock.spring.groovy4)
-  configureDependency("latestDepBootTestImplementation", libs.spock.spring.groovy4)
-  configureDependency("iastTestImplementation", libs.spock.spring.groovy4)
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
+  configureDependencies("bootTestImplementation", libs.spock.spring.groovy4)
+  configureDependencies("latestDepBootTestImplementation", libs.spock.spring.groovy4)
+  configureDependencies("iastTestImplementation", libs.spock.spring.groovy4)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/synapse-3.0/build.gradle b/dd-java-agent/instrumentation/synapse-3.0/build.gradle
@@ -19,8 +19,8 @@ configurations.configureEach {
 }
 
 groovySpock {
-  configureDefaultDependencies("testImplementation")
-  configureDependency("testImplementation", libs.groovy4.templates)
+  configureDependencies("testImplementation")
+  configureDependencies("testImplementation", libs.groovy4.templates)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/testng/build.gradle b/dd-java-agent/instrumentation/testng/build.gradle
@@ -5,7 +5,7 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 dependencies {
diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle
@@ -32,7 +32,7 @@ configurations.named('api') {
 }
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-smoke-tests/appsec/build.gradle b/dd-smoke-tests/appsec/build.gradle
@@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'appsec-smoke-tests'
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-smoke-tests/backend-mock/build.gradle b/dd-smoke-tests/backend-mock/build.gradle
@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'Mock Datadog backend used by smoke tests.'
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-smoke-tests/build.gradle b/dd-smoke-tests/build.gradle
@@ -5,7 +5,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'dd-smoke-tests'
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/dd-smoke-tests/iast-propagation/build.gradle b/dd-smoke-tests/iast-propagation/build.gradle
@@ -34,7 +34,7 @@ tasks.named("shadowJar", ShadowJar) {
 }
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("implementation")
 }
 
 dependencies {
diff --git a/dd-smoke-tests/iast-util/build.gradle b/dd-smoke-tests/iast-util/build.gradle
@@ -7,7 +7,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'iast-smoke-tests-utils'
 
 groovySpock {
-  configureDefaultDependencies("testFixturesApi")
+  configureDependencies("testFixturesApi")
 }
 
 dependencies {
diff --git a/dd-smoke-tests/rum/build.gradle b/dd-smoke-tests/rum/build.gradle
@@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'appsec-smoke-tests'
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {
diff --git a/utils/test-utils/build.gradle.kts b/utils/test-utils/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 apply(from = "$rootDir/gradle/java.gradle")
 
 groovySpock {
-  configureDefaultDependencies("compileOnly")
+  configureDependencies("compileOnly")
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,8 @@ abstract class GroovySpockExtension @Inject constructor(`
`21`	`21`	`groovyVersion.set(version)`
`22`	`22`	`}`
`23`	`23`
`24`		`- fun configureDependency(taskName: String, dependency: Any) {`
`25`		`- configurations.computeIfAbsent(taskName) { mutableListOf() }.add(dependency)`
`26`		`- }`
`27`		`-`
`28`		`- fun configureDefaultDependencies(taskName: String) {`
`29`		`- configureDependency(taskName, "default")`
	`24`	`+ fun configureDependencies(taskName: String, vararg dependencies: Any) {`
	`25`	`+ configurations.computeIfAbsent(taskName) { mutableListOf() }.addAll(dependencies)`
`30`	`26`	`}`
`31`	`27`	`}`
`32`	`28`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"`
`2`	`2`	`apply from: "$rootDir/gradle/version.gradle"`
`3`	`3`
`4`	`4`	`groovySpock {`
`5`		`- configureDefaultDependencies("compileOnly")`
	`5`	`+ configureDependencies("compileOnly")`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ protobuf {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`groovySpock {`
`38`		`- configureDefaultDependencies("testImplementation")`
`39`		`- configureDependency("testImplementation", libs.groovy4.yaml)`
	`38`	`+ configureDependencies("testImplementation")`
	`39`	`+ configureDependencies("testImplementation", libs.groovy4.yaml)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ tasks.register('checkAgentJarSize') {`
`392`	`392`	`doLast {`
`393`	`393`	`// Arbitrary limit to prevent unintentional increases to the agent jar size`
`394`	`394`	`// Raise or lower as required`
`395`		`- // TODO fix me!!!!: assert tasks.named("shadowJar", ShadowJar).get().archiveFile.get().getAsFile().length() <= 32 * 1024 * 1024`
	`395`	`+ assert tasks.named("shadowJar", ShadowJar).get().archiveFile.get().getAsFile().length() <= 32 * 1024 * 1024`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`dependsOn "shadowJar"`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`apply from: "$rootDir/gradle/java.gradle"`
`2`	`2`
`3`	`3`	`groovySpock {`
`4`		`- configureDefaultDependencies("compileOnly")`
`5`		`- configureDefaultDependencies("testImplementation")`
	`4`	`+ configureDependencies("compileOnly")`
	`5`	`+ configureDependencies("testImplementation")`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ addTestSuiteForDir('latestDepTest', 'test')`
`18`	`18`	`addTestSuiteForDir('latestDepForkedTest', 'test')`
`19`	`19`
`20`	`20`	`groovySpock {`
`21`		`- configureDefaultDependencies("testFixturesCompileOnly")`
	`21`	`+ configureDependencies("testFixturesCompileOnly")`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`