Skip to content

Modernize/simplify JUnit Gradle configuration #2325

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Modernize/simplify JUnit Gradle configuration #2325

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6da457
Modernize JUnit Gradle configuration
trask Oct 1, 2025
101dbd1
fix
trask Oct 1, 2025
33ef393
Merge branch 'main' into modernize-junit
trask Oct 8, 2025
841b8c1
Merge remote-tracking branch 'upstream/main' into modernize-junit
trask Oct 14, 2025
e758b75
renovate
trask Oct 14, 2025
60bb947
Merge remote-tracking branch 'upstream/main' into modernize-junit
trask Oct 14, 2025
36f656b
less
trask Oct 16, 2025
7a53357
Merge branch 'main' into modernize-junit
trask Oct 20, 2025
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
12 changes: 6 additions & 6 deletions buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,15 @@ dependencies {

testing {
suites.withType(JvmTestSuite::class).configureEach {
useJUnitJupiter()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if you replaced

withType<Test>().configureEach {
  useJUnitPlatform()

with useJUnitPlatform? Doing it only for suites and leaving the rest of the test tasks as they are feels a bit weird.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, I'm not following what you are suggesting to do

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, do you mean replacing that with useJUnitJupiter? I just tried that and it seems like useJUnitJupiter only works for test suites...


dependencies {
implementation(project(project.path))

implementation(enforcedPlatform("org.junit:junit-bom:5.14.0"))
// this is only needed to establish the version of JUnit we want to use
// since Renovate doesn't currently understand useJUnitJupiter("<version>")
implementation("org.junit.jupiter:junit-jupiter-api:5.14.0")

implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3"))
implementation(enforcedPlatform("com.google.guava:guava-bom:33.5.0-jre"))
implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.33.4"))
Expand All @@ -159,16 +164,11 @@ testing {
compileOnly("com.google.errorprone:error_prone_annotations")
compileOnly("com.google.code.findbugs:jsr305")

implementation("org.junit.jupiter:junit-jupiter-api")
implementation("org.junit.jupiter:junit-jupiter-params")
implementation("org.mockito:mockito-core")
implementation("org.mockito:mockito-junit-jupiter")
implementation("org.assertj:assertj-core")
implementation("org.awaitility:awaitility")
implementation("io.github.netmikey.logunit:logunit-jul")

runtimeOnly("org.junit.jupiter:junit-jupiter-engine")
runtimeOnly("org.junit.platform:junit-platform-launcher")
}
}
}
Expand Down