Merge pull request #430 from dmlloyd/oops

Fix accidental loss of setting the CWD of the subprocess

Author: dmlloyd

process/src/main/java/io/smallrye/common/process/PipelineRunner.java

@@ -598,6 +598,7 @@ int createThreads(final ThreadFactory tf, final ProcessRunner<O> runner, final P
             throws IOException {
         pb = processBuilder.pb;
         pb.command(Stream.concat(Stream.of(processBuilder.command.toString()), processBuilder.arguments.stream()).toList());
+        pb.directory(processBuilder.directory);
         int cnt = createInputThread(tf, runner)
                 + createErrorThreads(tf, runner)
                 + createOutputThreads(tf, runner, nextRunner)

process/src/test/java/io/smallrye/common/process/TestBasicExecution.java

@@ -7,6 +7,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Path;
 import java.util.ArrayDeque;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -16,6 +17,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.smallrye.common.process.helpers.Cat;
+import io.smallrye.common.process.helpers.Cwd;
 import io.smallrye.common.process.helpers.Errorifier;
 import io.smallrye.common.process.helpers.ErrorifierWithOutput;
 
@@ -216,6 +218,31 @@ public void testSplitPipeline() throws Exception {
         assertTrue(q.isEmpty());
     }
 
+    @Test
+    public void testWorkingDirectory() throws Exception {
+        assertEquals("test-a", ProcessBuilder.newBuilder(ProcessUtil.pathOfJava())
+                .arguments(findHelper(Cwd.class))
+                .directory(findResource("test-a/empty.txt").getParent())
+                .output().toSingleString(1000)
+                .run());
+        assertEquals("test-b", ProcessBuilder.newBuilder(ProcessUtil.pathOfJava())
+                .arguments(findHelper(Cwd.class))
+                .directory(findResource("test-b/empty.txt").getParent())
+                .output().toSingleString(1000)
+                .run());
+    }
+
+    static Path findResource(String name) throws URISyntaxException {
+        URL url = TestBasicExecution.class.getClassLoader().getResource(name);
+        if (url == null) {
+            throw new IllegalStateException("Unexpected missing file for " + name);
+        }
+        if (!url.getProtocol().equals("file")) {
+            throw new IllegalStateException("Unexpected wrong protocol for " + url);
+        }
+        return Path.of(url.toURI());
+    }
+
     /**
      * Build a command line for the {@code java} command to execute a class which is on our class path.
      * This allows us to test process execution on any platform.

process/src/test/java/io/smallrye/common/process/helpers/Cwd.java

@@ -0,0 +1,12 @@
+package io.smallrye.common.process.helpers;
+
+import java.nio.file.Path;
+
+/**
+ * Get and return the current working directory file name.
+ */
+public final class Cwd {
+    public static void main(String[] args) {
+        System.out.print(Path.of("").toAbsolutePath().getFileName());
+    }
+}