From c721852d5f7789c68cb91b8d17466df0efc83b91 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Wed, 1 Mar 2023 21:24:04 +0200
Subject: [PATCH] Convert spring-jms tests to test suites (#7945)

Part of
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7911
---
 .../spring-jms-2.0/javaagent/build.gradle.kts | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/build.gradle.kts
index 2fd6753649..17c275f9db 100644
--- a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   id("otel.javaagent-instrumentation")
-  id("org.unbroken-dome.test-sets")
 }
 
 muzzle {
@@ -14,23 +13,6 @@ muzzle {
   }
 }
 
-testSets {
-  create("testReceiveSpansDisabled")
-}
-
-tasks {
-  test {
-    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
-    jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
-  }
-
-  val testReceiveSpansDisabled by existing
-
-  check {
-    dependsOn(testReceiveSpansDisabled)
-  }
-}
-
 dependencies {
   implementation(project(":instrumentation:jms:jms-common:javaagent"))
   implementation(project(":instrumentation:jms:jms-1.1:javaagent"))
@@ -54,7 +36,35 @@ dependencies {
   }
 
   latestDepTestLibrary("org.springframework:spring-jms:5.+")
-
-  // this is just to avoid a bit more copy-pasting
-  add("testReceiveSpansDisabledImplementation", sourceSets["test"].output)
+}
+
+testing {
+  suites {
+    val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
+      dependencies {
+        // this is just to avoid a bit more copy-pasting
+        implementation(project.sourceSets["test"].output)
+      }
+    }
+  }
+}
+
+configurations {
+  named("testReceiveSpansDisabledImplementation") {
+    extendsFrom(configurations["testImplementation"])
+  }
+}
+
+tasks {
+  withType<Test>().configureEach {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
+  // this does not apply to testReceiveSpansDisabled
+  test {
+    jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
+  }
+
+  check {
+    dependsOn(testing.suites)
+  }
 }