Fix Appsec tests

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit 7c7286a04faa · 2025-08-08T18:25:24.000+02:00
diff --git a/dd-java-agent/appsec/appsec-testing/build.gradle b/dd-java-agent/appsec/appsec-testing/build.gradle
@@ -0,0 +1,12 @@
+apply from: "$rootDir/gradle/java.gradle"
+apply from: "$rootDir/gradle/version.gradle"
+
+dependencies {
+  api project(':dd-java-agent:appsec')
+  api project(':dd-java-agent:instrumentation-testing')
+  api project(':utils:test-utils')
+}
+
+configurations.api {
+  exclude group: 'org.eclipse.jetty', module: 'jetty-server'
+}
diff --git a/dd-java-agent/appsec/appsec-testing/src/main/groovy/com/datadog/appsec/AppSecHttpServerTest.groovy b/dd-java-agent/appsec/appsec-testing/src/main/groovy/com/datadog/appsec/AppSecHttpServerTest.groovy
diff --git a/dd-java-agent/appsec/appsec-testing/src/main/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy b/dd-java-agent/appsec/appsec-testing/src/main/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy
diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle
@@ -4,7 +4,6 @@ import groovy.json.JsonSlurper
 plugins {
   id 'com.gradleup.shadow'
   id 'me.champeau.jmh'
-  id 'java-test-fixtures'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
@@ -26,11 +25,7 @@ dependencies {
   testImplementation libs.logback.classic
   testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
 
-  testFixturesApi project(':dd-java-agent:instrumentation-testing')
-}
-
-configurations.testFixturesApi {
-  exclude group: 'org.eclipse.jetty', module: 'jetty-server'
+  testImplementation project(':utils:test-utils')
 }
 
 shadowJar {
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/build.gradle b/dd-java-agent/instrumentation/grizzly-http-2.3.20/build.gradle
@@ -25,7 +25,7 @@ dependencies {
   testImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-server', version: '2.3.20'
   testImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.18'
   testImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '2.18'
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
 
   latestDepTestImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-server', version: '2.3.20+'
diff --git a/dd-java-agent/instrumentation/jersey/build.gradle b/dd-java-agent/instrumentation/jersey/build.gradle
@@ -47,7 +47,7 @@ dependencies {
   jersey2JettyTestImplementation project(':dd-java-agent:instrumentation-testing'), {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
-  jersey2JettyTestImplementation testFixtures(project(':dd-java-agent:appsec'))
+  jersey2JettyTestImplementation project(':dd-java-agent:appsec:appsec-testing')
   jersey2JettyTestImplementation project(':dd-java-agent:agent-iast:iast-testing')
   jersey2JettyTestImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-jetty-http', version : jersey2Version
   jersey2JettyTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: jersey2Version
@@ -61,7 +61,7 @@ dependencies {
   jersey3JettyTestImplementation project(':dd-java-agent:instrumentation-testing'), {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
-  jersey3JettyTestImplementation testFixtures(project(':dd-java-agent:appsec'))
+  jersey3JettyTestImplementation project(':dd-java-agent:appsec:appsec-testing')
   jersey3JettyTestImplementation project(':dd-java-agent:agent-iast:iast-testing')
   jersey3JettyTestImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-jetty-http', version : jersey3Version
   jersey3JettyTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: jersey3Version
diff --git a/dd-java-agent/instrumentation/jetty-11/build.gradle b/dd-java-agent/instrumentation/jetty-11/build.gradle
@@ -61,7 +61,7 @@ dependencies {
   }
   testImplementation(project(':dd-java-agent:instrumentation:jetty-appsec-9.3'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
diff --git a/dd-java-agent/instrumentation/jetty-12/build.gradle b/dd-java-agent/instrumentation/jetty-12/build.gradle
@@ -78,7 +78,7 @@ dependencies {
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11")
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12")
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-11'))
diff --git a/dd-java-agent/instrumentation/jetty-9/build.gradle b/dd-java-agent/instrumentation/jetty-9/build.gradle
@@ -187,7 +187,7 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10')
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
   testFixturesImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
 
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.2.30.v20200428'
diff --git a/dd-java-agent/instrumentation/liberty-20/build.gradle b/dd-java-agent/instrumentation/liberty-20/build.gradle
@@ -29,7 +29,7 @@ dependencies {
   implementation project(':dd-java-agent:instrumentation:servlet-common')
 
   testImplementation files({ tasks.installOpenLibertyDeps.wsServerJar })
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testRuntimeOnly project(':dd-java-agent:instrumentation:osgi-4.3')
   testRuntimeOnly files({ tasks.filterLogbackClassic.filteredLogbackDir })
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
diff --git a/dd-java-agent/instrumentation/liberty-23/build.gradle b/dd-java-agent/instrumentation/liberty-23/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
   implementation project(':dd-java-agent:instrumentation:servlet:request-5')
   testImplementation files({ tasks.installOpenLibertyDeps.wsServerJar })
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testRuntimeOnly project(':dd-java-agent:instrumentation:osgi-4.3')
   testRuntimeOnly files({ tasks.filterLogbackClassic.filteredLogbackDir })
   testRuntimeOnly project(':dd-java-agent:instrumentation:liberty-20')
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/build.gradle b/dd-java-agent/instrumentation/ratpack-1.5/build.gradle
@@ -20,6 +20,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
   testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
   testImplementation 'com.sun.activation:jakarta.activation:1.2.2'
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   latestDepTestImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.+'
 }
diff --git a/dd-java-agent/instrumentation/spring-security-5/build.gradle b/dd-java-agent/instrumentation/spring-security-5/build.gradle
@@ -15,7 +15,7 @@ final springBootVersion = '2.6.0'
 dependencies {
   compileOnly group: 'org.springframework.security', name: 'spring-security-core', version: springSecurityVersion
 
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion
diff --git a/dd-java-agent/instrumentation/spring-security-6/build.gradle b/dd-java-agent/instrumentation/spring-security-6/build.gradle
@@ -17,7 +17,7 @@ tasks.withType(GroovyCompile).configureEach {
 
 dependencies {
 
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
   testImplementation project(':dd-java-agent:instrumentation:spring-security-5')
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/build.gradle b/dd-java-agent/instrumentation/spring-webmvc-3.1/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     exclude(module: 'jetty-server') // incompatible servlet api
   }
 
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
 
   // Include spring-beans instrumentation to test repairing bean definitions
   testImplementation project(':dd-java-agent:instrumentation:spring-beans')
diff --git a/dd-java-agent/instrumentation/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat-5.5/build.gradle
@@ -126,7 +126,7 @@ dependencies {
   latest10TestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '10.+'
   latest10TestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '10.+'
   latest10TestImplementation group: 'org.apache.tomcat', name: 'jakartaee-migration', version: '1.+'
-  latest10TestImplementation(testFixtures(project(":dd-java-agent:appsec")))
+  latest10TestImplementation project(":dd-java-agent:appsec:appsec-testing")
 
   latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat-appsec-6'))
   latest10TestImplementation(project(':dd-java-agent:instrumentation:tomcat-appsec-7'))
@@ -135,7 +135,7 @@ dependencies {
   latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '11.+'
   latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '11.+'
   latestDepTestImplementation group: 'org.apache.tomcat', name: 'jakartaee-migration', version: '1.+'
-  latestDepTestImplementation(testFixtures(project(":dd-java-agent:appsec")))
+  latestDepTestImplementation project(":dd-java-agent:appsec:appsec-testing")
 
   latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat-appsec-6'))
   latestDepTestRuntimeOnly(project(':dd-java-agent:instrumentation:tomcat-appsec-7'))
diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/build.gradle b/dd-java-agent/instrumentation/vertx-web-3.4/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 
   testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.11.0'
 
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
 
   latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '3.+'
   latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '3.+'
diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
@@ -49,7 +49,7 @@ dependencies {
   testImplementation group: 'io.vertx', name: 'vertx-web', version: '4.0.0'
   testImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.0.0'
 
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
   testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4')
diff --git a/dd-java-agent/instrumentation/vertx-web-5.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-5.0/build.gradle
@@ -50,7 +50,7 @@ dependencies {
   testImplementation group: 'io.vertx', name: 'vertx-web', version: vertxVersion
   testImplementation group: 'io.vertx', name: 'vertx-web-client', version: vertxVersion
 
-  testImplementation testFixtures(project(':dd-java-agent:appsec'))
+  testImplementation project(':dd-java-agent:appsec:appsec-testing')
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
   testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4')
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -112,6 +112,7 @@ include(
 
 include(
   ":dd-java-agent:appsec",
+  ":dd-java-agent:appsec:appsec-testing",
 )
 
 // ci-visibility

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ dependencies {`
`61`	`61`	`}`
`62`	`62`	`testImplementation(project(':dd-java-agent:instrumentation:jetty-appsec-9.3'))`
`63`	`63`	`testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))`
`64`		`- testImplementation testFixtures(project(':dd-java-agent:appsec'))`
	`64`	`+ testImplementation project(':dd-java-agent:appsec:appsec-testing')`
`65`	`65`	`testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')`
`66`	`66`	`testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')`
`67`	`67`	`testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')`