Migrate from test-sets to test suites. (#214)

Author: anuraaga

aws-xray/build.gradle.kts

@@ -1,16 +1,10 @@
 plugins {
   id("otel.java-conventions")
   id("otel.publish-conventions")
-
-  id("org.unbroken-dome.test-sets")
 }
 
 description = "OpenTelemetry AWS X-Ray Support"
 
-testSets {
-  create("awsTest")
-}
-
 dependencies {
   api("io.opentelemetry:opentelemetry-api")
   api("io.opentelemetry:opentelemetry-sdk-trace")
@@ -35,7 +29,17 @@ dependencies {
   testImplementation("com.google.guava:guava")
   testImplementation("org.slf4j:slf4j-simple")
   testImplementation("org.skyscreamer:jsonassert")
+}
 
-  add("awsTestImplementation", "io.opentelemetry:opentelemetry-exporter-otlp-trace")
-  add("awsTestImplementation", "org.testcontainers:junit-jupiter")
+testing {
+  suites {
+    val awsTest by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation("io.opentelemetry:opentelemetry-exporter-otlp-trace")
+        implementation("io.opentelemetry:opentelemetry-sdk-testing")
+        implementation("org.testcontainers:junit-jupiter")
+        runtimeOnly("org.slf4j:slf4j-simple")
+      }
+    }
+  }
 }

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -99,14 +99,25 @@ dependencies {
   }
 
   compileOnly("com.google.code.findbugs:jsr305")
+}
+
+testing {
+  suites.withType(JvmTestSuite::class).configureEach {
+    dependencies {
+      implementation(project)
+
+      compileOnly("com.google.auto.value:auto-value-annotations")
+      compileOnly("com.google.errorprone:error_prone_annotations")
+      compileOnly("com.google.code.findbugs:jsr305")
 
-  testImplementation("org.assertj:assertj-core")
-  testImplementation("org.awaitility:awaitility")
-  testImplementation("org.junit.jupiter:junit-jupiter-api")
-  testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("org.mockito:mockito-core")
-  testImplementation("org.mockito:mockito-junit-jupiter")
+      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")
 
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+      runtimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    }
+  }
 }

jmx-metrics/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
   application
   id("com.github.johnrengelman.shadow")
-  id("org.unbroken-dome.test-sets")
 
   id("otel.groovy-conventions")
   id("otel.publish-conventions")
@@ -24,10 +23,6 @@ repositories {
 
 val groovyVersion = "3.0.8"
 
-testSets {
-  create("integrationTest")
-}
-
 dependencies {
   api(platform("org.codehaus.groovy:groovy-bom:$groovyVersion"))
 
@@ -53,18 +48,21 @@ dependencies {
 
   runtimeOnly("org.terracotta:jmxremote_optional-tc:1.0.8")
 
-  testImplementation("io.grpc:grpc-api")
-  testImplementation("io.grpc:grpc-protobuf")
-  testImplementation("io.grpc:grpc-stub")
-  testImplementation("io.grpc:grpc-testing")
   testImplementation("org.junit-pioneer:junit-pioneer")
   testImplementation("org.awaitility:awaitility")
-  testImplementation("org.testcontainers:testcontainers")
-  testImplementation("io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha")
+}
 
-  add("integrationTestImplementation", "com.linecorp.armeria:armeria-grpc")
-  add("integrationTestImplementation", "com.linecorp.armeria:armeria-junit5")
-  add("integrationTestImplementation", "org.testcontainers:junit-jupiter")
+testing {
+  suites {
+    val integrationTest by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation("com.linecorp.armeria:armeria-grpc")
+        implementation("com.linecorp.armeria:armeria-junit5")
+        implementation("io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha")
+        implementation("org.testcontainers:junit-jupiter")
+      }
+    }
+  }
 }
 
 tasks {

settings.gradle.kts

@@ -3,7 +3,6 @@ pluginManagement {
     id("com.github.ben-manes.versions") version "0.39.0"
     id("com.github.johnrengelman.shadow") version "7.1.1"
     id("com.gradle.enterprise") version "3.8"
-    id("org.unbroken-dome.test-sets") version "4.0.0"
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("nebula.release") version "16.0.0"
   }