Skip to content

Commit dbaa33e

Browse files
committed
Modernize JUnit Gradle configuration
1 parent c333388 commit dbaa33e

File tree

1 file changed

+21
-36
lines changed

1 file changed

+21
-36
lines changed

ibm-mq-metrics/build.gradle.kts

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,6 @@ description = "IBM-MQ metrics"
99
otelJava.moduleName.set("io.opentelemetry.contrib.ibm-mq-metrics")
1010
application.mainClass.set("io.opentelemetry.ibm.mq.opentelemetry.Main")
1111

12-
sourceSets {
13-
create("integrationTest") {
14-
compileClasspath += sourceSets.main.get().output
15-
runtimeClasspath += sourceSets.main.get().output
16-
}
17-
}
18-
19-
val integrationTestImplementation by configurations.getting {
20-
extendsFrom(configurations.implementation.get())
21-
}
22-
val integrationTestRuntimeOnly by configurations.getting
23-
24-
configurations["integrationTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())
25-
2612
val ibmClientJar: Configuration by configurations.creating {
2713
isCanBeResolved = true
2814
isCanBeConsumed = false
@@ -42,13 +28,6 @@ dependencies {
4228
implementation("org.slf4j:slf4j-simple:2.0.17")
4329
testImplementation("com.google.guava:guava")
4430
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
45-
integrationTestImplementation("org.assertj:assertj-core:3.27.6")
46-
integrationTestImplementation("org.junit.jupiter:junit-jupiter-api:5.13.4")
47-
integrationTestImplementation("io.opentelemetry:opentelemetry-sdk-testing")
48-
integrationTestImplementation("com.ibm.mq:com.ibm.mq.jakarta.client:9.4.3.1")
49-
integrationTestImplementation("jakarta.jms:jakarta.jms-api:3.1.0")
50-
integrationTestImplementation("org.junit.jupiter:junit-jupiter-engine:5.13.4")
51-
integrationTestRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
5231
ibmClientJar("com.ibm.mq:com.ibm.mq.allclient:9.4.3.1") {
5332
artifact {
5433
name = "com.ibm.mq.allclient"
@@ -58,23 +37,29 @@ dependencies {
5837
}
5938
}
6039

61-
tasks.shadowJar {
62-
dependencies {
63-
exclude(dependency("com.ibm.mq:com.ibm.mq.allclient:9.4.3.1"))
40+
testing {
41+
suites {
42+
val integrationTest by registering(JvmTestSuite::class) {
43+
dependencies {
44+
implementation("org.assertj:assertj-core:3.27.6")
45+
implementation("io.opentelemetry:opentelemetry-sdk-testing")
46+
implementation("com.ibm.mq:com.ibm.mq.jakarta.client:9.4.3.1")
47+
implementation("jakarta.jms:jakarta.jms-api:3.1.0")
48+
}
49+
50+
targets {
51+
all {
52+
testTask.configure {
53+
shouldRunAfter(tasks.test)
54+
}
55+
}
56+
}
57+
}
6458
}
6559
}
6660

67-
val integrationTest = tasks.register<Test>("integrationTest") {
68-
description = "Runs integration tests."
69-
group = "verification"
70-
71-
testClassesDirs = sourceSets["integrationTest"].output.classesDirs
72-
classpath = sourceSets["integrationTest"].runtimeClasspath
73-
shouldRunAfter("test")
74-
75-
useJUnitPlatform()
76-
77-
testLogging {
78-
events("passed")
61+
tasks.shadowJar {
62+
dependencies {
63+
exclude(dependency("com.ibm.mq:com.ibm.mq.allclient:9.4.3.1"))
7964
}
8065
}

0 commit comments

Comments
 (0)