Cleanup subproject creation in build tests (#105998)

Sometimes subprojects are created by build tests. There exists a utility
function to define the subproject build file. Yet some tests add the
project to settings and then configure through the subprojects directive
in the root build file. This commit cleans up two such cases to use
explicit subproject build files.

Author: rjernst

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy

@@ -99,17 +99,17 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
         given:
         def mockRepoUrl = urlPath(jdkVendor, jdkVersion, platform)
         def mockedContent = filebytes(jdkVendor, platform)
-        3.times {
-            settingsFile << """
-                include ':sub-$it'
-            """
-        }
         buildFile.text = """
             plugins {
              id 'elasticsearch.jdk-download' apply false
             }
 
             subprojects {
+
+            }
+        """
+        3.times {
+            subProject(':sub-' + it) << """
                 apply plugin: 'elasticsearch.jdk-download'
 
                 jdks {
@@ -126,8 +126,8 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
                         println "JDK HOME: " + jdks.myJdk
                     }
                 }
-            }
-        """
+            """
+        }
 
         when:
         def result = WiremockFixture.withWireMock(mockRepoUrl, mockedContent) { server ->
@@ -165,7 +165,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
                 architecture = "x64"
               }
             }
-            
+
             tasks.register("getJdk", PrintJdk) {
                 dependsOn jdks.myJdk
                 jdkPath = jdks.myJdk.getPath()
@@ -174,7 +174,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
             class PrintJdk extends DefaultTask {
                 @Input
                 String jdkPath
-                
+
                 @TaskAction void print() {
                     println "JDK HOME: " + jdkPath
                 }

build-tools/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy

@@ -70,25 +70,14 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
         def version = VersionProperties.getElasticsearch()
         def platform = ElasticsearchDistribution.Platform.LINUX
 
-        3.times {
-            settingsFile << """
-                include ':sub-$it'
-            """
-        }
         buildFile.text = """
-            import org.elasticsearch.gradle.Architecture
-
             plugins {
                 id 'elasticsearch.distribution-download'
             }
-
-            subprojects {
-                apply plugin: 'elasticsearch.distribution-download'
-
-                ${setupTestDistro(version, platform)}
-                ${setupDistroTask()}
-            }
         """
+        3.times {
+            subProject(':sub-' + it) << applyPluginAndSetupDistro(version, platform)
+        }
 
         when:
         def runner = gradleRunner('setupDistro', '-i', '-g', gradleUserHome)
@@ -118,14 +107,6 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
                 id 'elasticsearch.distribution-download'
             }
 
-            ${setupTestDistro(version, platform)}
-            ${setupDistroTask()}
-
-        """
-    }
-
-    private static String setupTestDistro(String version, ElasticsearchDistribution.Platform platform) {
-        return """
             elasticsearch_distributions {
                 test_distro {
                     version = "$version"
@@ -134,11 +115,7 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
                     architecture = Architecture.current();
                 }
             }
-            """
-    }
 
-    private static String setupDistroTask() {
-        return """
             tasks.register("setupDistro", Sync) {
                 from(elasticsearch_distributions.test_distro)
                 into("build/distro")