Skip to content

Migrate debugger-integration-tests cross-project test source sharing to java-test-fixtures for Gradle 9.5 compatibility #11416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
May 19, 2026
Merged

Migrate debugger-integration-tests cross-project test source sharing to java-test-fixtures for Gradle 9.5 compatibility #11416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed3d41e
fix(smoke-tests): share debugger test helpers via java-test-fixtures
bric3 May 19, 2026
8ea5efc
chore(mongo): remove dead `sourceSets.test.output` comment in mongo-c…
bric3 May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions dd-java-agent/agent-debugger/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
id 'com.gradleup.shadow'
id 'dd-trace-java.version-file'
id 'java-test-fixtures'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down Expand Up @@ -47,6 +48,14 @@ dependencies {
implementation libs.okhttp
implementation libs.slf4j

// Dependencies needed to compile the test-fixture helpers (LogProbeTestHelper,
// MoshiSnapshotTestHelper); they reference siblings + Moshi + internal-api.
testFixturesImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
testFixturesImplementation project(':dd-java-agent:agent-debugger:debugger-el')
testFixturesImplementation project(':internal-api')
testFixturesImplementation libs.moshi
testFixturesImplementation libs.junit.jupiter

testImplementation libs.asm.util
testImplementation libs.bundles.junit5
testImplementation libs.junit.jupiter.params
Expand Down
0 ...dog/debugger/util/LogProbeTestHelper.java → ...dog/debugger/util/LogProbeTestHelper.java
View file
Open in desktop
File renamed without changes.
0 ...ebugger/util/MoshiSnapshotTestHelper.java → ...ebugger/util/MoshiSnapshotTestHelper.java
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/mongo/mongo-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ dependencies {
testFixturesImplementation(project(':dd-java-agent:instrumentation-testing'))
testFixturesImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get()

//testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output
testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
}
4 changes: 2 additions & 2 deletions dd-smoke-tests/debugger-integration-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ dependencies {
testImplementation project(':dd-java-agent:agent-debugger')
testImplementation project(':dd-java-agent:agent-debugger:debugger-el')
testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
// dependency on some helper classes made only for tests
testImplementation project(':dd-java-agent:agent-debugger').sourceSets.test.output
// helper classes shared via java-test-fixtures (LogProbeTestHelper, MoshiSnapshotTestHelper)
testImplementation testFixtures(project(':dd-java-agent:agent-debugger'))
testImplementation libs.bundles.junit5
testImplementation libs.bundles.mockito
}
Expand Down
Loading