From 0a9466523f659fcccdfc027935a2802523b5ff0d Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Wed, 1 Mar 2023 21:23:43 +0200
Subject: [PATCH] Convert finatra tests to test suites (#7946)

Part of
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7911
---
 .../finatra-2.9/javaagent/build.gradle.kts    | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/instrumentation/finatra-2.9/javaagent/build.gradle.kts b/instrumentation/finatra-2.9/javaagent/build.gradle.kts
index b862bb8494..18f5dd1937 100644
--- a/instrumentation/finatra-2.9/javaagent/build.gradle.kts
+++ b/instrumentation/finatra-2.9/javaagent/build.gradle.kts
@@ -1,12 +1,6 @@
 plugins {
   id("otel.javaagent-instrumentation")
   id("otel.scala-conventions")
-  id("org.unbroken-dome.test-sets")
-}
-
-testSets {
-  // We need separate test sources to compile against latest Finatra.
-  create("latestDepTest")
 }
 
 muzzle {
@@ -26,6 +20,13 @@ muzzle {
   }
 }
 
+// Test suites don't allow excluding transitive dependencies. We use this configuration to declare
+// dependency to latest finatra and exclude netty-transport-native-epoll.
+val finatraLatest by configurations.creating {
+  isCanBeConsumed = false
+  isCanBeResolved = false
+}
+
 dependencies {
   // TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
   // here.
@@ -33,10 +34,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
-  if (!(findProperty("testLatestDeps") as Boolean)) {
-    // Requires old version of Jackson
-    testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.9.10"))
-  }
+  testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.9.10"))
   testImplementation("com.twitter:finatra-http_2.11:19.12.0") {
     // Finatra POM references linux-aarch64 version of this which we don't need. Including it
     // prevents us from managing Netty version because the classifier name changed to linux-aarch_64
@@ -47,11 +45,28 @@ dependencies {
   // Required for older versions of finatra on JDKs >= 11
   testImplementation("com.sun.activation:javax.activation:1.2.0")
 
-  add("latestDepTestImplementation", "com.twitter:finatra-http_2.13:+") {
+  finatraLatest("com.twitter:finatra-http_2.13:+") {
     exclude("io.netty", "netty-transport-native-epoll")
   }
 }
 
+testing {
+  suites {
+    val latestDepTest by registering(JvmTestSuite::class) {
+      dependencies {
+        // finatra is included via finatraLatest configuation
+        implementation("io.netty:netty-transport-native-epoll:4.1.51.Final:linux-x86_64")
+      }
+    }
+  }
+}
+
+configurations {
+  named("latestDepTestImplementation") {
+    extendsFrom(configurations["finatraLatest"])
+  }
+}
+
 tasks {
   if (findProperty("testLatestDeps") as Boolean) {
     // Separate task
@@ -62,6 +77,10 @@ tasks {
       enabled = false
     }
   }
+
+  check {
+    dependsOn(testing.suites)
+  }
 }
 
 tasks.withType<Test>().configureEach {
@@ -69,12 +88,3 @@ tasks.withType<Test>().configureEach {
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 }
-
-if (findProperty("testLatestDeps") as Boolean) {
-  configurations {
-    // finatra artifact name is different for regular and latest tests
-    testImplementation {
-      exclude("com.twitter", "finatra-http_2.11")
-    }
-  }
-}