diff --git a/ibm-mq-metrics/build.gradle.kts b/ibm-mq-metrics/build.gradle.kts index d57b87795..31e191841 100644 --- a/ibm-mq-metrics/build.gradle.kts +++ b/ibm-mq-metrics/build.gradle.kts @@ -9,20 +9,6 @@ description = "IBM-MQ metrics" otelJava.moduleName.set("io.opentelemetry.contrib.ibm-mq-metrics") application.mainClass.set("io.opentelemetry.ibm.mq.opentelemetry.Main") -sourceSets { - create("integrationTest") { - compileClasspath += sourceSets.main.get().output - runtimeClasspath += sourceSets.main.get().output - } -} - -val integrationTestImplementation by configurations.getting { - extendsFrom(configurations.implementation.get()) -} -val integrationTestRuntimeOnly by configurations.getting - -configurations["integrationTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get()) - val ibmClientJar: Configuration by configurations.creating { isCanBeResolved = true isCanBeConsumed = false @@ -42,13 +28,6 @@ dependencies { implementation("org.slf4j:slf4j-simple:2.0.17") testImplementation("com.google.guava:guava") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") - integrationTestImplementation("org.assertj:assertj-core:3.27.6") - integrationTestImplementation("org.junit.jupiter:junit-jupiter-api:5.13.4") - integrationTestImplementation("io.opentelemetry:opentelemetry-sdk-testing") - integrationTestImplementation("com.ibm.mq:com.ibm.mq.jakarta.client:9.4.3.1") - integrationTestImplementation("jakarta.jms:jakarta.jms-api:3.1.0") - integrationTestImplementation("org.junit.jupiter:junit-jupiter-engine:5.13.4") - integrationTestRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4") ibmClientJar("com.ibm.mq:com.ibm.mq.allclient:9.4.3.1") { artifact { name = "com.ibm.mq.allclient" @@ -58,23 +37,29 @@ dependencies { } } -tasks.shadowJar { - dependencies { - exclude(dependency("com.ibm.mq:com.ibm.mq.allclient:9.4.3.1")) +testing { + suites { + val integrationTest by registering(JvmTestSuite::class) { + dependencies { + implementation("org.assertj:assertj-core:3.27.6") + implementation("io.opentelemetry:opentelemetry-sdk-testing") + implementation("com.ibm.mq:com.ibm.mq.jakarta.client:9.4.3.1") + implementation("jakarta.jms:jakarta.jms-api:3.1.0") + } + + targets { + all { + testTask.configure { + shouldRunAfter(tasks.test) + } + } + } + } } } -val integrationTest = tasks.register("integrationTest") { - description = "Runs integration tests." - group = "verification" - - testClassesDirs = sourceSets["integrationTest"].output.classesDirs - classpath = sourceSets["integrationTest"].runtimeClasspath - shouldRunAfter("test") - - useJUnitPlatform() - - testLogging { - events("passed") +tasks.shadowJar { + dependencies { + exclude(dependency("com.ibm.mq:com.ibm.mq.allclient")) } }