Skip to content
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.

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

Update junit5 monorepo to v5.11.3 #172

Merged
merged 3 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
constraints {
// Define dependency versions as constraints
}
testImplementation("org.junit.jupiter:junit-jupiter:5.11.2")
testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
}

tasks.named<Test>("test") {
Expand Down
14 changes: 12 additions & 2 deletions otel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

dependencies {
implementation(project(":plugin"))
testImplementation(platform("org.junit:junit-bom:5.11.2"))
testImplementation(platform("org.junit:junit-bom:5.11.3"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
Expand All @@ -25,6 +25,16 @@ gradlePlugin {
}
}

tasks.named<Test>("functionalTest") {
tasks.functionalTest {
useJUnitPlatform()
inputs.file(layout.projectDirectory.file("../example-projects/buildSrc/build.gradle.kts"))
inputs.files(layout.projectDirectory.dir("../example-projects/buildSrc/src/"))

inputs.file(layout.projectDirectory.file("../example-projects/app/build.gradle.kts"))
inputs.files(layout.projectDirectory.dir("../example-projects/app/src/"))

inputs.file(layout.projectDirectory.file("../example-projects/custom-instrumentation/build.gradle.kts"))
inputs.files(layout.projectDirectory.dir("../example-projects/custom-instrumentation/src/"))

inputs.files(layout.projectDirectory.dir("../example-projects/gradle/"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class OTelJavaagentPluginFunctionalTest {
// Verify the result
// TODO use testcontainers to start an otel fake backend and retrieve spans from it here to verify instrumentation worked
assertTrue(result.output.contains("AgentInstaller - Installed 1 extension(s)"))
assertTrue(result.output.contains("InstrumentationLoader - Installed 254 instrumenter(s)"))
assertTrue(result.output.contains("InstrumentationLoader - Installed 257 instrumenter(s)"))
assertTrue(
result.output.contains(
"Applying instrumentation: sample [class com.ryandens.example.SampleInstrumentationModule]",
Expand Down