Default test task is handled differently in Gradle

Author: breskeby

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

@@ -137,12 +137,12 @@ class BuildPluginFuncTest extends AbstractGradleFuncTest {
         file("licenses/hamcrest-core-1.3.jar.sha1").text = "42a25dc3219429f0e5d060061f71acb49bf010a0"
         file("licenses/hamcrest-core-LICENSE.txt").text = EXAMPLE_LICENSE
         file("licenses/hamcrest-core-NOTICE.txt").text = "mock notice"
-        file("licenses/junit-4.12.jar.sha1").text = "2973d150c0dc1fefe998f834810d68f278ea58ec"
+        file("licenses/junit-4.13.2.jar.sha1").text = "2973d150c0dc1fefe998f834810d68f278ea58ec"
         file("licenses/junit-LICENSE.txt").text = EXAMPLE_LICENSE
         file("licenses/junit-NOTICE.txt").text = "mock notice"
         buildFile << """
             dependencies {
-              api "junit:junit:4.12"
+              api "junit:junit:4.13.2"
               // missing classes in thirdparty audit
               api 'org.hamcrest:hamcrest-core:1.3'
             }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java

@@ -21,6 +21,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ResolutionStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -65,6 +66,16 @@ public void apply(Project project) {
         buildParams = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class);
         project.getPluginManager().apply(JvmTestSuitePlugin.class);
         TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
+        testing.getSuites().withType(JvmTestSuite.class).configureEach(suite -> {
+            if (suite.getName().equals("test") == false) {
+                // default test task behaves differently in gradle
+                suite.useJUnit();
+            }
+            ExternalModuleDependency junitDependency = suite.getDependencies()
+                .module("junit", "junit", VersionProperties.getVersions().get("junit"));
+            junitDependency.setTransitive(false);
+            suite.getDependencies().getImplementation().add(junitDependency);
+        });
         // common repositories setup
         project.getPluginManager().apply(RepositoriesSetupPlugin.class);
         project.getPluginManager().apply(ElasticsearchTestBasePlugin.class);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/InternalJavaRestTestPlugin.java

@@ -30,6 +30,7 @@ public void apply(Project project) {
         TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
         testing.getSuites().registerBinding(JavaRestTestSuite.class, DefaultJavaRestTestSuite.class);
         testing.getSuites().register(SOURCE_SET_NAME, JavaRestTestSuite.class, suite -> {
+            suite.useJUnit();
             configureJavaRestSources(project, suite.getSources());
             if (project.findProject(":test:test-clusters") != null) {
                 suite.getDependencies().getImplementation().add(suite.getDependencies().project(":test:test-clusters"));

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/InternalYamlRestTestPlugin.java

@@ -31,6 +31,7 @@ public void apply(Project project) {
         TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
         testing.getSuites().registerBinding(YamlRestTestSuite.class, DefaultYamlRestTestSuite.class);
         testing.getSuites().register(SOURCE_SET_NAME, YamlRestTestSuite.class, suite -> {
+            suite.useJUnit();
             configureYamlSourceSet(project, suite.getSources());
         });
     }

modules/repository-s3/build.gradle

@@ -60,7 +60,6 @@ testing {
     }
     test {
       dependencies {
-        println "adding dependency = dependency"
         implementation(project(':test:fixtures:s3-fixture'))
       }
     }