Do not act on 'whitebox(...)' config if test folder does not exist

Author: jjohannes

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java

@@ -63,20 +63,11 @@ public JavaModuleTestingExtension(Project project) {
                 jvmTestSuite.useJUnitJupiter(); // override old Gradle convention to default to JUnit5 for all suites
             }
 
-            boolean testFolderExists = jvmTestSuite.getSources().getJava().getSrcDirs().stream().anyMatch(File::exists);
             if (isTestModule) {
                 blackbox(jvmTestSuite);
-            } else if (testFolderExists) {
+            } else {
                 whitebox(jvmTestSuite, conf -> conf.getOpensTo().add("org.junit.platform.commons"));
             }
-
-            // Remove the dependencies added by Gradle in case the test directory is missing. This allows the use of 'useJUnitJupiter("")' without hassle.
-            if (!testFolderExists) {
-                project.getConfigurations().getByName(jvmTestSuite.getSources().getImplementationConfigurationName(), implementation ->
-                        implementation.withDependencies(dependencySet -> dependencySet.removeIf(d -> "org.junit.jupiter".equals(d.getGroup()) && "junit-jupiter".equals(d.getName()))));
-                project.getConfigurations().getByName(jvmTestSuite.getSources().getRuntimeOnlyConfigurationName(), runtimeOnly ->
-                        runtimeOnly.withDependencies(dependencySet -> dependencySet.removeIf(d -> "org.junit.platform".equals(d.getGroup()) && "junit-platform-launcher".equals(d.getName()))));
-            }
         });
     }
 
@@ -124,6 +115,17 @@ public void whitebox(TestSuite jvmTestSuite) {
      */
     public void whitebox(TestSuite jvmTestSuite, Action<WhiteboxJvmTestSuite> conf) {
         if (jvmTestSuite instanceof JvmTestSuite) {
+            SourceSet suiteSourceSet = ((JvmTestSuite) jvmTestSuite).getSources();
+            boolean testFolderExists = suiteSourceSet.getJava().getSrcDirs().stream().anyMatch(File::exists);
+            if (!testFolderExists) {
+                // Remove the dependencies added by Gradle in case the test directory is missing. Then stop. This allows the use of 'useJUnitJupiter("")' without hassle.
+                project.getConfigurations().getByName(suiteSourceSet.getImplementationConfigurationName(), implementation ->
+                        implementation.withDependencies(dependencySet -> dependencySet.removeIf(d -> "org.junit.jupiter".equals(d.getGroup()) && "junit-jupiter".equals(d.getName()))));
+                project.getConfigurations().getByName(suiteSourceSet.getRuntimeOnlyConfigurationName(), runtimeOnly ->
+                        runtimeOnly.withDependencies(dependencySet -> dependencySet.removeIf(d -> "org.junit.platform".equals(d.getGroup()) && "junit-platform-launcher".equals(d.getName()))));
+                return;
+            }
+
             WhiteboxJvmTestSuite whiteboxJvmTestSuite = project.getObjects().newInstance(WhiteboxJvmTestSuite.class);
             whiteboxJvmTestSuite.getSourcesUnderTest().convention(project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME));
             whiteboxJvmTestSuite.getRequires().addAll(requiresFromModuleInfo((JvmTestSuite) jvmTestSuite, whiteboxJvmTestSuite.getSourcesUnderTest(), false));

src/test/groovy/org/gradlex/javamodule/testing/test/CustomizationTest.groovy

@@ -117,4 +117,23 @@ class CustomizationTest extends Specification {
         then:
         result.task(":app:test").outcome == TaskOutcome.NO_SOURCE
     }
+
+    def "build does not fail when JUnit has no version, the test folder is empty and whitebox was manually configured"() {
+        given:
+        appTestModuleInfoFile.parentFile.deleteDir()
+        appBuildFile << '''
+            testing.suites.withType<JvmTestSuite>().all {
+                useJUnitJupiter("") // <- no version, we want to manage that ourselves
+            }
+            javaModuleTesting.whitebox(testing.suites["test"]) {
+                requires.add("org.junit.jupiter.api")
+            }
+        '''
+
+        when:
+        def result = runTests()
+
+        then:
+        result.task(":app:test").outcome == TaskOutcome.NO_SOURCE
+    }
 }