Merge branch 'big-andy-coates-bug_209'

Author: siordache

src/main/java/org/javamodularity/moduleplugin/tasks/RunTaskMutator.java

@@ -12,6 +12,7 @@
 import org.javamodularity.moduleplugin.extensions.RunModuleOptions;
 import org.javamodularity.moduleplugin.internal.TaskOption;
 
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -53,7 +54,10 @@ private List<String> buildJavaExecJvmArgs() {
                 .collect(Collectors.toList()).toArray());
         var patchModuleContainer = PatchModuleContainer.copyOf(
                 helper().modularityExtension().optionContainer().getPatchModuleContainer());
-        patchModuleContainer.addDir(moduleName, helper().mainSourceSet().getOutput().getResourcesDir().getAbsolutePath());
+        var resourceDir = helper().mainSourceSet().getOutput().getResourcesDir();
+        if (resourceDir != null && Files.isDirectory(resourceDir.toPath())) {
+            patchModuleContainer.addDir(moduleName, resourceDir.getAbsolutePath());
+        }
         patchModuleContainer.buildModulePathOption(filteredClasspath).ifPresent(option -> option.mutateArgs(jvmArgs));
         patchModuleContainer.mutator(filteredClasspath).mutateArgs(jvmArgs);
 

src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java

@@ -104,12 +104,17 @@ private Stream<Path> buildPatchModulePathStream() {
         sourceSets.add(mainSourceSet);
         sourceSets.addAll(classesSourceSets);
 
-        Stream<File> classesFileStream = classesSourceSets.stream()
-                .flatMap(sourceSet -> sourceSet.getOutput().getClassesDirs().getFiles().stream());
-        Stream<File> resourceFileStream = sourceSets.stream()
-                .map(sourceSet -> sourceSet.getOutput().getResourcesDir());
+        Stream<Path> classesFileStream = classesSourceSets.stream()
+                .flatMap(sourceSet -> sourceSet.getOutput().getClassesDirs().getFiles().stream())
+                .map(File::toPath);
 
-        return Stream.concat(classesFileStream, resourceFileStream).map(File::toPath);
+        Stream<Path> resourceFileStream = sourceSets.stream()
+                .map(sourceSet -> sourceSet.getOutput().getResourcesDir())
+                .filter(Objects::nonNull)
+                .map(File::toPath)
+                .filter(Files::isDirectory);
+
+        return Stream.concat(classesFileStream, resourceFileStream);
     }
 
     private TaskOption buildAddReadsOption(TestEngine testEngine) {

test-project/greeter.provider/src/test/java/examples/greeter/ModuleReaderTest.java

@@ -0,0 +1,25 @@
+package examples.greeter;
+
+import java.lang.module.ModuleReader;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ModuleReaderTest {
+    @Test
+    void testList() throws Exception {
+        ModuleReader reader = ModuleReaderTest.class.getModule()
+                .getLayer()
+                .configuration()
+                .findModule("greeter.provider")
+                .orElseThrow()
+                .reference()
+                .open();
+
+        List<String> content = reader.list().collect(Collectors.toList());
+
+        assertFalse(content.isEmpty());
+    }
+}