Migrate most testsets to test suites. (#3953)

open-telemetry · Dec 6, 2021 · 8e04fbf · 8e04fbf
1 parent d059dcd
commit 8e04fbf
Show file tree

Hide file tree

Showing 9 changed files with 339 additions and 210 deletions.
diff --git a/context/build.gradle.kts b/context/build.gradle.kts
@@ -70,7 +70,7 @@ testing {
 }
 
 tasks {
-  named("check") {
+  check {
     dependsOn(testing.suites)
   }
 }
diff --git a/exporters/otlp/logs/build.gradle.kts b/exporters/otlp/logs/build.gradle.kts
@@ -3,40 +3,51 @@ plugins {
   id("otel.publish-conventions")
 
   id("otel.animalsniffer-conventions")
-
-  id("org.unbroken-dome.test-sets")
 }
 
 description = "OpenTelemetry Protocol Trace Exporter"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp.trace")
 
-testSets {
-  create("testGrpcNetty")
-  create("testGrpcNettyShaded")
-  create("testGrpcOkhttp")
-}
-
 dependencies {
   api(project(":sdk:logs"))
   api(project(":exporters:otlp:common"))
 
   compileOnly("io.grpc:grpc-stub")
 
   testImplementation(project(":exporters:otlp:testing-internal"))
-  testImplementation(project(":sdk:testing"))
-
-  add("testGrpcNettyRuntimeOnly", "io.grpc:grpc-netty")
-  add("testGrpcNettyRuntimeOnly", "io.grpc:grpc-stub")
-
-  add("testGrpcNettyShadedRuntimeOnly", "io.grpc:grpc-netty-shaded")
-  add("testGrpcNettyShadedRuntimeOnly", "io.grpc:grpc-stub")
+}
 
-  add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-okhttp")
-  add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-stub")
+testing {
+  suites {
+    val testGrpcNetty by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcNettyShaded by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty-shaded")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcOkhttp by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-okhttp")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+  }
 }
 
 tasks {
   named("check") {
-    dependsOn("testGrpcNetty", "testGrpcNettyShaded", "testGrpcOkhttp")
+    dependsOn(testing.suites)
   }
 }
diff --git a/exporters/otlp/metrics/build.gradle.kts b/exporters/otlp/metrics/build.gradle.kts
@@ -2,40 +2,52 @@ plugins {
   id("otel.java-conventions")
   id("otel.publish-conventions")
 
-  id("org.unbroken-dome.test-sets")
   id("otel.animalsniffer-conventions")
 }
 
 description = "OpenTelemetry Protocol Metrics Exporter"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp.metrics")
 
-testSets {
-  create("testGrpcNetty")
-  create("testGrpcNettyShaded")
-  create("testGrpcOkhttp")
-}
-
 dependencies {
   api(project(":sdk:metrics"))
   api(project(":exporters:otlp:common"))
 
   compileOnly("io.grpc:grpc-stub")
 
   testImplementation(project(":exporters:otlp:testing-internal"))
-  testImplementation(project(":sdk:testing"))
-
-  add("testGrpcNettyRuntimeOnly", "io.grpc:grpc-netty")
-  add("testGrpcNettyRuntimeOnly", "io.grpc:grpc-stub")
-
-  add("testGrpcNettyShadedRuntimeOnly", "io.grpc:grpc-netty-shaded")
-  add("testGrpcNettyShadedRuntimeOnly", "io.grpc:grpc-stub")
+}
 
-  add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-okhttp")
-  add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-stub")
+testing {
+  suites {
+    val testGrpcNetty by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcNettyShaded by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty-shaded")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcOkhttp by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-okhttp")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+  }
 }
 
 tasks {
   check {
-    dependsOn("testGrpcNetty", "testGrpcNettyShaded", "testGrpcOkhttp")
+    dependsOn(testing.suites)
   }
 }
diff --git a/exporters/otlp/testing-internal/build.gradle.kts b/exporters/otlp/testing-internal/build.gradle.kts
@@ -6,12 +6,11 @@ description = "OpenTelemetry Exporter Testing (Internal)"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp.testing.internal")
 
 dependencies {
+  api(project(":exporters:otlp:common"))
   api(project(":sdk:logs"))
   api(project(":sdk:metrics"))
   api(project(":sdk:trace"))
-  api(project(":exporters:otlp:common"))
-
-  implementation(project(":sdk:testing"))
+  api(project(":sdk:testing"))
 
   api("io.opentelemetry.proto:opentelemetry-proto")
   api("org.junit.jupiter:junit-jupiter-api")

diff --git a/exporters/otlp/trace/build.gradle.kts b/exporters/otlp/trace/build.gradle.kts
@@ -4,23 +4,11 @@ plugins {
 
   id("otel.animalsniffer-conventions")
   id("otel.jmh-conventions")
-
-  id("org.unbroken-dome.test-sets")
 }
 
 description = "OpenTelemetry Protocol Trace Exporter"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp.trace")
 
-testSets {
-  create("testGrpcNetty")
-  create("testGrpcNettyShaded")
-  create("testGrpcOkhttp")
-
-  // Mainly to conveniently profile through IDEA. Don't add to check task, it's for
-  // manual invocation.
-  create("testSpanPipeline")
-}
-
 dependencies {
   api(project(":sdk:trace"))
   api(project(":exporters:otlp:common"))
@@ -30,20 +18,6 @@ dependencies {
   compileOnly("io.grpc:grpc-stub")
 
   testImplementation(project(":exporters:otlp:testing-internal"))
-  testImplementation(project(":sdk:testing"))
-
-  add("testGrpcNettyRuntimeOnly", "io.grpc:grpc-netty")
-  add("testGrpcNettyRuntimeOnly", "io.grpc:grpc-stub")
-
-  add("testGrpcNettyShadedRuntimeOnly", "io.grpc:grpc-netty-shaded")
-  add("testGrpcNettyShadedRuntimeOnly", "io.grpc:grpc-stub")
-
-  add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-okhttp")
-  add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-stub")
-
-  add("testSpanPipelineImplementation", "io.grpc:grpc-protobuf")
-  add("testSpanPipelineImplementation", "io.grpc:grpc-testing")
-  add("testSpanPipelineImplementation", "io.opentelemetry.proto:opentelemetry-proto")
 
   jmhImplementation(project(":sdk:testing"))
   jmhImplementation("com.linecorp.armeria:armeria")
@@ -53,8 +27,50 @@ dependencies {
   jmhRuntimeOnly("io.grpc:grpc-netty")
 }
 
+testing {
+  suites {
+    val testGrpcNetty by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcNettyShaded by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty-shaded")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcOkhttp by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-okhttp")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testSpanPipeline by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation("io.grpc:grpc-protobuf")
+        implementation("io.grpc:grpc-testing")
+        implementation("io.opentelemetry.proto:opentelemetry-proto")
+      }
+    }
+  }
+}
+
 tasks {
   check {
-    dependsOn("testGrpcNetty", "testGrpcNettyShaded", "testGrpcOkhttp")
+    dependsOn(
+      testing.suites.filter {
+        // Mainly to conveniently profile through IDEA. Don't add to check task, it's for
+        // manual invocation.
+        name != "testSpanPipeline"
+      }
+    )
   }
 }
diff --git a/exporters/prometheus/build.gradle.kts b/exporters/prometheus/build.gradle.kts
@@ -3,17 +3,11 @@ plugins {
   id("otel.publish-conventions")
 
   id("otel.animalsniffer-conventions")
-
-  id("org.unbroken-dome.test-sets")
 }
 
 description = "OpenTelemetry Prometheus Exporter"
 otelJava.moduleName.set("io.opentelemetry.exporter.prometheus")
 
-testSets {
-  create("integrationTest")
-}
-
 dependencies {
   api(project(":sdk:metrics"))
 
@@ -25,14 +19,23 @@ dependencies {
   testImplementation("com.google.guava:guava")
   testImplementation("com.linecorp.armeria:armeria")
   testRuntimeOnly("org.slf4j:slf4j-simple")
+}
 
-  add("integrationTestImplementation", "com.fasterxml.jackson.jr:jackson-jr-stree")
-  add("integrationTestImplementation", "com.linecorp.armeria:armeria")
-  add("integrationTestImplementation", "org.testcontainers:junit-jupiter")
+testing {
+  suites {
+    val integrationTest by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation("com.fasterxml.jackson.jr:jackson-jr-stree")
+        implementation("com.google.guava:guava")
+        implementation("com.linecorp.armeria:armeria")
+        implementation("org.testcontainers:junit-jupiter")
+      }
+    }
+  }
 }
 
 tasks {
   check {
-    dependsOn("integrationTest")
+    dependsOn(testing.suites)
   }
 }
diff --git a/extensions/kotlin/build.gradle.kts b/extensions/kotlin/build.gradle.kts
@@ -6,17 +6,12 @@ plugins {
 
   id("otel.jmh-conventions")
   id("org.jetbrains.kotlin.jvm")
-  id("org.unbroken-dome.test-sets")
   id("otel.animalsniffer-conventions")
 }
 
 description = "OpenTelemetry Kotlin Extensions"
 otelJava.moduleName.set("io.opentelemetry.extension.kotlin")
 
-testSets {
-  create("testStrictContext")
-}
-
 dependencies {
   implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
 
@@ -30,6 +25,25 @@ dependencies {
   testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
 }
 
+testing {
+  suites {
+    val testStrictContext by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
+      }
+
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dio.opentelemetry.context.enableStrictContext=true")
+          }
+        }
+      }
+    }
+  }
+}
+
 tasks {
   withType(KotlinCompile::class) {
     kotlinOptions {
@@ -42,7 +56,7 @@ tasks {
     enabled = false
   }
 
-  named<Test>("testStrictContext") {
-    jvmArgs("-Dio.opentelemetry.context.enableStrictContext=true")
+  check {
+    dependsOn(testing.suites)
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ testing { @@
     }
     tasks {
-      named("check") {
+      check {
         dependsOn(testing.suites)
       }
     }