Merge pull request #5158 from DataDog/glopes/test-suites-configs

Fix test targets in jetty other than 'test'
DataDog · May 8, 2023 · bc3fe15 · bc3fe15
2 parents 41ae2f7 + d9d8c0b
commit bc3fe15
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/dd-java-agent/instrumentation/jetty-7.0/build.gradle b/dd-java-agent/instrumentation/jetty-7.0/build.gradle
@@ -10,7 +10,7 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
-addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteForDir('latestDepForkedTest', 'test')
 
 dependencies {
   compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'

diff --git a/dd-java-agent/instrumentation/jetty-7.6/build.gradle b/dd-java-agent/instrumentation/jetty-7.6/build.gradle
@@ -10,7 +10,7 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
-addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteForDir('latestDepForkedTest', 'test')
 
 dependencies {
   compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.6.0.v20120127'

diff --git a/dd-java-agent/instrumentation/jetty-9/build.gradle b/dd-java-agent/instrumentation/jetty-9/build.gradle
@@ -9,9 +9,9 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
-addTestSuiteForDir('jetty92Test', 'test')
-addTestSuiteForDir('jetty94Test', 'test')
-addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteForDir('jetty92ForkedTest', 'test')
+addTestSuiteForDir('jetty94ForkedTest', 'test')
+addTestSuiteForDir('latestDepForkedTest', 'test')
 
 dependencies {
   compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.0.0.v20130308'

diff --git a/gradle/test-suites.gradle b/gradle/test-suites.gradle
@@ -35,30 +35,29 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName,
   }
 
   configurations {
-    def provider = named("${parentSuiteName}CompileOnly")
-    if (provider.present) {
-      named("${testSuiteName}CompileOnly").configure {
-        extendsFrom(provider.get())
-      }
-    }
-    provider = named("${parentSuiteName}Implementation")
-    if (provider.present) {
-      named("${testSuiteName}Implementation").configure {
-        extendsFrom(provider.get())
-      }
-    }
-    provider = named("${parentSuiteName}RuntimeOnly")
-    if (provider.present) {
-      named("${testSuiteName}RuntimeOnly").configure {
-        extendsFrom(provider.get())
+    def extendConf = {
+      String suffix ->
+      def config = named("${testSuiteName}${suffix}")
+      def parentConfig = named("${parentSuiteName}${suffix}")
+      if (parentConfig.present) {
+        config.configure {
+          extendsFrom(parentConfig.get())
+        }
       }
-    }
-    provider = named("${parentSuiteName}AnnotationProcessor")
-    if (provider.present) {
-      named("${testSuiteName}AnnotationProcessor").configure {
-        extendsFrom(provider.get())
+
+      if (testSuiteName ==~ /.*ForkedTest\z/) {
+        def nonForkedBaseConfName = testSuiteName - ~/Forked/
+        def nonForkedConfig = maybeCreate("${nonForkedBaseConfName}${suffix}")
+        config.configure {
+          extendsFrom(nonForkedConfig)
+        }
       }
     }
+
+    extendConf('CompileOnly')
+    extendConf('Implementation')
+    extendConf('RuntimeOnly')
+    extendConf('AnnotationProcessor')
   }
 
   tasks.register("${testSuiteName}Jar", Jar) {