Add runProcessAndWait method overload and coresponding unit test

DEVSIX-4144

Author: introfog

io/src/main/java/com/itextpdf/io/util/SystemUtil.java

@@ -107,26 +107,40 @@ public static String getPropertyOrEnvironmentVariable(String name) {
     }
 
     public static boolean runProcessAndWait(String exec, String params) throws IOException, InterruptedException {
-        return runProcessAndGetExitCode(exec, params) == 0;
+        return runProcessAndWait(exec, params, null);
+    }
+
+    public static boolean runProcessAndWait(String exec, String params, String workingDirPath) throws IOException, InterruptedException {
+        return runProcessAndGetExitCode(exec, params, workingDirPath) == 0;
     }
 
     public static int runProcessAndGetExitCode(String exec, String params) throws IOException, InterruptedException {
-        Process p = runProcess(exec, params);
+        return runProcessAndGetExitCode(exec, params, null);
+    }
+
+    public static int runProcessAndGetExitCode(String exec, String params, String workingDirPath) throws IOException, InterruptedException {
+        Process p = runProcess(exec, params, workingDirPath);
         System.out.println(getProcessOutput(p));
         return p.waitFor();
     }
 
     public static String runProcessAndGetOutput(String command, String params) throws IOException {
-        return getProcessOutput(runProcess(command, params));
+        return getProcessOutput(runProcess(command, params, null));
     }
 
     public static StringBuilder runProcessAndCollectErrors(String execPath, String params) throws IOException {
-        return printProcessErrorsOutput(runProcess(execPath, params));
+        return printProcessErrorsOutput(runProcess(execPath, params, null));
     }
 
-    static Process runProcess(String execPath, String params) throws IOException {
+    static Process runProcess(String execPath, String params, String workingDirPath) throws IOException {
         List<String> cmdList = prepareProcessArguments(execPath, params);
-        return Runtime.getRuntime().exec(cmdList.toArray(new String[cmdList.size()]));
+        String[] cmdArray = cmdList.toArray(new String[cmdList.size()]);
+        if (workingDirPath != null) {
+            File workingDir = new File(workingDirPath);
+            return Runtime.getRuntime().exec(cmdArray, null, workingDir);
+        } else {
+            return Runtime.getRuntime().exec(cmdArray);
+        }
     }
 
     static List<String> prepareProcessArguments(String exec, String params) {

io/src/test/java/com/itextpdf/io/util/SystemUtilTest.java

@@ -30,21 +30,30 @@ This file is part of the iText (R) project.
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 @Category(UnitTest.class)
 public class SystemUtilTest extends ExtendedITextTest {
-
     private final static String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/io/util/SystemUtilTest/";
 
+    private static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/io/util/SystemUtilTest/";
+
     // This is empty file that used to check the logic for existed execution file
     private final static String STUB_EXEC_FILE = SOURCE_FOLDER + "folder with space/stubFile";
 
+    @Before
+    public void setUp() {
+        createOrClearDestinationFolder(DESTINATION_FOLDER);
+    }
+
     @Test
     public void prepareProcessArgumentsStubExecFileTest() {
         List<String> processArguments = SystemUtil.prepareProcessArguments(STUB_EXEC_FILE, "param1 param2");
@@ -133,6 +142,28 @@ public void getProcessOutputEmptyTest() throws IOException {
         Assert.assertEquals("This is error info", result);
     }
 
+    @Test
+    public void runProcessAndWaitWithWorkingDirectoryTest() throws IOException, InterruptedException {
+        String imageMagickPath = SystemUtil.getPropertyOrEnvironmentVariable(ImageMagickHelper.MAGICK_COMPARE_ENVIRONMENT_VARIABLE);
+        if (imageMagickPath == null) {
+            imageMagickPath = SystemUtil.getPropertyOrEnvironmentVariable(ImageMagickHelper.MAGICK_COMPARE_ENVIRONMENT_VARIABLE_LEGACY);
+        }
+        String inputImage = "image.jpg";
+        String cmpImage = "cmp_image.jpg";
+        String diff = System.getProperty("user.dir") + DESTINATION_FOLDER.substring(1) + "diff.png";
+
+        StringBuilder currCompareParams = new StringBuilder();
+        currCompareParams
+                .append("'")
+                .append(inputImage).append("' '")
+                .append(cmpImage).append("' '")
+                .append(diff).append("'");
+        boolean result = SystemUtil.runProcessAndWait(imageMagickPath, currCompareParams.toString(), SOURCE_FOLDER);
+
+        Assert.assertFalse(result);
+        Assert.assertTrue(FileUtil.fileExists(diff));
+    }
+
 
     static class TestProcess extends Process {