Fix servlet tests

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit 4cc0b64cacc1 · 2025-08-08T15:50:28.000+02:00
diff --git a/dd-java-agent/instrumentation/servlet/request-3/build.gradle b/dd-java-agent/instrumentation/servlet/request-3/build.gradle
@@ -38,12 +38,12 @@ dependencies {
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
   implementation project(':dd-java-agent:instrumentation:servlet-common')
 
-  testFixturesApi(project(':dd-java-agent:testing')) {
+  testFixturesApi(project(':dd-java-agent:instrumentation-testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
   testFixturesCompileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
 
-  testImplementation(project(':dd-java-agent:testing')) {
+  testImplementation(project(':dd-java-agent:instrumentation-testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
   testImplementation project(':dd-java-agent:instrumentation:jetty-7.0') // See if there's any conflicts.
diff --git a/dd-java-agent/instrumentation/servlet/request-5/build.gradle b/dd-java-agent/instrumentation/servlet/request-5/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     transitive = false
   }
 
-  testFixturesApi(project(':dd-java-agent:testing')) {
+  testFixturesApi(project(':dd-java-agent:instrumentation-testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
   testFixturesCompileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ dependencies {`
`38`	`38`	`compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'`
`39`	`39`	`implementation project(':dd-java-agent:instrumentation:servlet-common')`
`40`	`40`
`41`		`- testFixturesApi(project(':dd-java-agent:testing')) {`
	`41`	`+ testFixturesApi(project(':dd-java-agent:instrumentation-testing')) {`
`42`	`42`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`43`	`43`	`}`
`44`	`44`	`testFixturesCompileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'`
`45`	`45`
`46`		`- testImplementation(project(':dd-java-agent:testing')) {`
	`46`	`+ testImplementation(project(':dd-java-agent:instrumentation-testing')) {`
`47`	`47`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`48`	`48`	`}`
`49`	`49`	`testImplementation project(':dd-java-agent:instrumentation:jetty-7.0') // See if there's any conflicts.`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ dependencies {`
`64`	`64`	`transitive = false`
`65`	`65`	`}`
`66`	`66`
`67`		`- testFixturesApi(project(':dd-java-agent:testing')) {`
	`67`	`+ testFixturesApi(project(':dd-java-agent:instrumentation-testing')) {`
`68`	`68`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`69`	`69`	`}`
`70`	`70`	`testFixturesCompileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'`