Support 'requires runtime' in 'java9/module-info.java'

Extends #18

Author: jjohannes

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

@@ -122,20 +122,21 @@ public void whitebox(TestSuite jvmTestSuite, Action<WhiteboxJvmTestSuite> conf)
         if (jvmTestSuite instanceof JvmTestSuite) {
             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()));
+            whiteboxJvmTestSuite.getRequires().addAll(requiresFromModuleInfo((JvmTestSuite) jvmTestSuite, whiteboxJvmTestSuite.getSourcesUnderTest(), false));
+            whiteboxJvmTestSuite.getRequiresRuntime().addAll(requiresFromModuleInfo((JvmTestSuite) jvmTestSuite, whiteboxJvmTestSuite.getSourcesUnderTest(), true));
             conf.execute(whiteboxJvmTestSuite);
             configureJvmTestSuiteForWhitebox((JvmTestSuite) jvmTestSuite, whiteboxJvmTestSuite);
         }
     }
 
-    private Provider<List<String>> requiresFromModuleInfo(JvmTestSuite jvmTestSuite, Provider<SourceSet> sourcesUnderTest) {
+    private Provider<List<String>> requiresFromModuleInfo(JvmTestSuite jvmTestSuite, Provider<SourceSet> sourcesUnderTest, boolean runtimeOnly) {
         RegularFile moduleInfoFile = project.getLayout().getProjectDirectory().file(whiteboxModuleInfo(jvmTestSuite).getAbsolutePath());
         Provider<String> moduleInfoContent = project.getProviders().fileContents(moduleInfoFile).getAsText();
         return moduleInfoContent.map(c -> {
             ModuleInfoParser moduleInfoParser = new ModuleInfoParser(project.getLayout(), project.getProviders());
             String mainModuleName = moduleInfoParser.moduleName(sourcesUnderTest.get().getAllJava().getSrcDirs());
-            List<String> requires = ModuleInfoRequiresParser.parse(moduleInfoContent.get());
-            if (requires.stream().anyMatch(r -> r.equals(mainModuleName))) {
+            List<String> requires = ModuleInfoRequiresParser.parse(moduleInfoContent.get(), runtimeOnly);
+            if (requires.stream().anyMatch(r -> r.equals(mainModuleName)) || runtimeOnly) {
                 return requires.stream().filter(r -> !r.equals(mainModuleName)).collect(Collectors.toList());
             }
             return Collections.<String>emptyList();
@@ -235,5 +236,14 @@ private void configureJvmTestSuiteForWhitebox(JvmTestSuite jvmTestSuite, Whitebo
                 }
             }
         });
+        Configuration runtimeOnly = configurations.getByName(testSources.getRuntimeOnlyConfigurationName());
+        runtimeOnly.withDependencies(d -> {
+            for (String requiresModuleName : whiteboxJvmTestSuite.getRequiresRuntime().get()) {
+                Provider<?> gav = JavaModuleDependenciesBridge.gav(project, requiresModuleName);
+                if (gav != null) {
+                    dependencies.addProvider(runtimeOnly.getName(), gav);
+                }
+            }
+        });
     }
 }

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

@@ -38,6 +38,14 @@ public interface WhiteboxJvmTestSuite {
      */
     ListProperty<String> getRequires();
 
+    /**
+     * Add a runtime-only dependency via Module Name when combined with
+     * 'java-module-dependencies' plugin.
+     *
+     * @return modifiable list of addition 'runtimeOnly' dependencies
+     */
+    ListProperty<String> getRequiresRuntime();
+
     /**
      * Open all packages of this Whitebox Test Suite to a given Module
      * for reflection at runtime.

src/main/java/org/gradlex/javamodule/testing/internal/ModuleInfoRequiresParser.java

@@ -21,27 +21,29 @@
 import java.util.List;
 
 public class ModuleInfoRequiresParser {
+    private static final String RUNTIME_KEYWORD = "/*runtime*/";
 
-    public static List<String> parse(String moduleInfoFileContent) {
+    public static List<String> parse(String moduleInfoFileContent, boolean runtimeOnly) {
         List<String> requires = new ArrayList<>();
         boolean insideComment = false;
         for(String line: moduleInfoFileContent.split("\n")) {
-            insideComment = parseLine(line, insideComment, requires);
+            insideComment = parseLine(line, insideComment, requires, runtimeOnly);
         }
         return requires;
     }
 
     /**
      * @return true, if we are inside a multi-line comment after this line
      */
-    private static boolean parseLine(String moduleLine, boolean insideComment, List<String> requires) {
+    private static boolean parseLine(String moduleLine, boolean insideComment, List<String> requires, boolean runtimeOnly) {
         if (insideComment) {
             return !moduleLine.contains("*/");
         }
 
         List<String> tokens = Arrays.asList(moduleLine
                 .replace(";", "")
                 .replace("{", "")
+                .replace(RUNTIME_KEYWORD, "runtime")
                 .replaceAll("/\\*.*?\\*/", " ")
                 .trim().split("\\s+"));
         int singleLineCommentStartIndex = tokens.indexOf("//");
@@ -50,14 +52,20 @@ private static boolean parseLine(String moduleLine, boolean insideComment, List<
         }
 
         if (tokens.size() > 1 && tokens.get(0).equals("requires")) {
-            if (tokens.size() > 3 && tokens.contains("static") && tokens.contains("transitive")) {
-                requires.add(tokens.get(3));
-            } else if (tokens.size() > 2 && tokens.contains("transitive")) {
-                requires.add(tokens.get(2));
-            } else if (tokens.size() > 2 && tokens.contains("static")) {
-                requires.add(tokens.get(2));
+            if (runtimeOnly) {
+                if (tokens.size() > 2 && tokens.contains("runtime")) {
+                    requires.add(tokens.get(2));
+                }
             } else {
-                requires.add(tokens.get(1));
+                if (tokens.size() > 3 && tokens.contains("static") && tokens.contains("transitive")) {
+                    requires.add(tokens.get(3));
+                } else if (tokens.size() > 2 && tokens.contains("transitive")) {
+                    requires.add(tokens.get(2));
+                } else if (tokens.size() > 2 && tokens.contains("static")) {
+                    requires.add(tokens.get(2));
+                } else if (!tokens.contains("runtime")) {
+                    requires.add(tokens.get(1));
+                }
             }
         }
         return moduleLine.lastIndexOf("/*") > moduleLine.lastIndexOf("*/");