test constructor with timeout

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java

@@ -92,7 +92,7 @@ public Executor(List<String> cmdList) {
      * @param cmdList A list containing the command to execute
      * @param workingDirectory The directory the process should have as the working directory
      */
-    public Executor(List<String> cmdList, File workingDirectory) {
+    public Executor(List<String> cmdList, @Nullable File workingDirectory) {
         this(cmdList, workingDirectory, new HashMap<>());
     }
 
@@ -104,7 +104,7 @@ public Executor(List<String> cmdList, File workingDirectory) {
      *                it will be terminated. If the value is 0, no timer
      *                will be set up.
      */
-    public Executor(List<String> cmdList, File workingDirectory, int timeout) {
+    public Executor(List<String> cmdList, @Nullable File workingDirectory, int timeout) {
         this(cmdList, workingDirectory, new HashMap<>());
 
         this.timeout = timeout * 1000;
@@ -116,7 +116,7 @@ public Executor(List<String> cmdList, File workingDirectory, int timeout) {
      * @param cmdList A list containing the command to execute
      * @param workingDirectory The directory the process should have as the working directory
      */
-    public Executor(List<String> cmdList, File workingDirectory, Map<String, String> environ) {
+    public Executor(List<String> cmdList, @Nullable File workingDirectory, Map<String, String> environ) {
         this.cmdList = cmdList;
         this.workingDirectory = workingDirectory;
         this.environ = environ;
@@ -144,6 +144,10 @@ private void setDefaultTimeout() {
         this.timeout = timeoutSec * 1000;
     }
 
+    int getTimeout() {
+        return timeout / 1000;
+    }
+
     /**
      * Execute the command and collect the output. All exceptions will be
      * logged.
@@ -239,7 +243,7 @@ public int exec(final boolean reportExceptions, StreamHandler handler) {
                     @Override public void run() {
                         LOGGER.log(Level.WARNING,
                             String.format("Terminating process of command [%s] in directory '%s' " +
-                            "due to timeout %d seconds", cmd_str, dir_str, timeout / 1000));
+                            "due to timeout %d seconds", cmd_str, dir_str, getTimeout()));
                         proc.destroy();
                     }
                 }, timeout);

opengrok-indexer/src/test/java/org/opengrok/indexer/util/ExecutorTest.java

@@ -48,6 +48,13 @@
  */
 class ExecutorTest {
 
+    @Test
+    void testConstructorWithTimeout() {
+        int timeout = 42;
+        Executor executor = new Executor(List.of("foo"), null, timeout);
+        assertEquals(timeout, executor.getTimeout());
+    }
+
     @Test
     void testString() {
         List<String> cmdList = new ArrayList<>();