Expose exitValue and isAlive methods on the chrome launcher

Author: kklisura

cdt-java-client/src/main/java/com/github/kklisura/cdt/launch/ChromeLauncher.java

@@ -213,7 +213,7 @@ public Path getChromeBinaryPath() {
 
   @Override
   public void close() {
-    if (chromeProcess != null) {
+    if (chromeProcess != null && chromeProcess.isAlive()) {
       LOGGER.info("Closing chrome process...");
       chromeProcess.destroy();
 
@@ -222,14 +222,12 @@ public void close() {
           chromeProcess.destroyForcibly();
           chromeProcess.waitFor(configuration.getShutdownWaitTime(), TimeUnit.SECONDS);
         }
-        chromeProcess = null;
 
         LOGGER.info("Chrome process closed.");
       } catch (InterruptedException e) {
         LOGGER.error("Interrupted while waiting for chrome process to shutdown.", e);
 
         chromeProcess.destroyForcibly();
-        chromeProcess = null;
       } finally {
         deleteQuietly(userDataDirPath);
       }
@@ -242,6 +240,30 @@ public void close() {
     }
   }
 
+  /**
+   * Returns an exit value. This is just proxy to {@link Process#exitValue}.
+   *
+   * @return Exit value of the process if exited.
+   * @throws {@link IllegalThreadStateException} if the subprocess has not yet terminated. {@link
+   *     IllegalStateException} If the process hasn't even started.
+   */
+  public int exitValue() {
+    if (chromeProcess == null) {
+      throw new IllegalStateException("Chrome process has not been started started.");
+    }
+    return chromeProcess.exitValue();
+  }
+
+  /**
+   * Tests whether the subprocess is alive. This is just proxy to {@link Process#isAlive()}.
+   *
+   * @return True if the subprocess has not yet terminated.
+   * @throws IllegalThreadStateException if the subprocess has not yet terminated.
+   */
+  public boolean isAlive() {
+    return chromeProcess != null && chromeProcess.isAlive();
+  }
+
   /**
    * Launches a chrome process given a chrome binary and its arguments.
    *
@@ -254,7 +276,7 @@ public void close() {
    */
   private int launchChromeProcess(Path chromeBinary, ChromeArguments chromeArguments)
       throws ChromeProcessException {
-    if (chromeProcess != null) {
+    if (isAlive()) {
       throw new IllegalStateException("Chrome process has already been started started.");
     }
 

cdt-java-client/src/test/java/com/github/kklisura/cdt/launch/ChromeLauncherTest.java

@@ -26,6 +26,7 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -176,6 +177,7 @@ public void testLaunchWithBinaryAndArgumentsAndDefaultUserDataDir()
 
     final String trigger = "\r\n\r\nDevTools listening on ws://127.0.0.1:9123/";
     expect(process.getInputStream()).andReturn(new ByteArrayInputStream(trigger.getBytes()));
+    expect(process.isAlive()).andReturn(true);
 
     Capture<List<String>> captureArguments = Capture.newInstance();
     expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
@@ -188,7 +190,6 @@ public void testLaunchWithBinaryAndArgumentsAndDefaultUserDataDir()
 
     ChromeService launch = launcher.launch(binaryPath, chromeArguments);
 
-    verifyAll();
     PowerMock.verify(FilesUtils.class);
 
     assertNotNull(launch);
@@ -213,12 +214,16 @@ public void testLaunchWithBinaryAndArgumentsAndDefaultUserDataDir()
       // Ignore this exception.
     }
 
+    verifyAll();
+
     // Test closing
     resetAll();
     PowerMock.resetAll(FilesUtils.class);
 
     process.destroy();
     expect(process.waitFor(60, TimeUnit.SECONDS)).andReturn(true);
+    expect(process.isAlive()).andReturn(true);
+    expect(process.isAlive()).andReturn(false);
 
     shutdownHookRegistry.remove(anyObject());
 
@@ -260,13 +265,12 @@ public void testLaunchWithBinaryAndArgumentsAndCustomUserDataDir()
     Capture<List<String>> captureArguments = Capture.newInstance();
     expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
         .andReturn(process);
+    expect(process.isAlive()).andReturn(true);
 
     replayAll();
 
     ChromeService launch = launcher.launch(binaryPath, chromeArguments);
 
-    verifyAll();
-
     assertNotNull(launch);
     assertTrue(launch instanceof ChromeServiceImpl);
 
@@ -289,12 +293,17 @@ public void testLaunchWithBinaryAndArgumentsAndCustomUserDataDir()
       // Ignore this exception.
     }
 
+    verifyAll();
+
     // Test closing
     resetAll();
 
     process.destroy();
     expect(process.waitFor(60, TimeUnit.SECONDS)).andReturn(true);
 
+    expect(process.isAlive()).andReturn(true);
+    expect(process.isAlive()).andReturn(false);
+
     shutdownHookRegistry.remove(anyObject());
 
     FilesUtils.deleteQuietly(null);
@@ -321,6 +330,7 @@ public void testLaunchWithBinaryAndArgumentsAndCloseWithInterruptedException()
 
     final String trigger = "\r\n\r\nDevTools listening on ws://127.0.0.1:9123/";
     expect(process.getInputStream()).andReturn(new ByteArrayInputStream(trigger.getBytes()));
+    expect(process.isAlive()).andReturn(true);
 
     Capture<List<String>> captureArguments = Capture.newInstance();
     expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
@@ -330,8 +340,6 @@ public void testLaunchWithBinaryAndArgumentsAndCloseWithInterruptedException()
 
     ChromeService launch = launcher.launch(binaryPath, chromeArguments);
 
-    verifyAll();
-
     assertNotNull(launch);
     assertTrue(launch instanceof ChromeServiceImpl);
 
@@ -352,6 +360,8 @@ public void testLaunchWithBinaryAndArgumentsAndCloseWithInterruptedException()
       // Ignore this exception.
     }
 
+    verifyAll();
+
     // Test closing
     resetAll();
 
@@ -360,6 +370,8 @@ public void testLaunchWithBinaryAndArgumentsAndCloseWithInterruptedException()
 
     expect(process.destroyForcibly()).andReturn(process);
 
+    expect(process.isAlive()).andReturn(true);
+
     shutdownHookRegistry.remove(anyObject());
 
     FilesUtils.deleteQuietly(null);
@@ -446,6 +458,7 @@ public void testLaunchWithBinaryAndArgumentsFailsOnReading()
     expect(processLauncher.isExecutable("/test-binary-path")).andReturn(true);
 
     expect(process.getInputStream()).andThrow(new RuntimeException("test exception"));
+    expect(process.isAlive()).andReturn(true);
 
     Capture<List<String>> captureArguments = Capture.newInstance();
     expect(processLauncher.launch(eq("/test-binary-path"), capture(captureArguments)))
@@ -479,6 +492,7 @@ public void testLaunchWithBinaryAndArgumentsThrowsExceptionOnTimeout()
 
     final String trigger = "test\r\ntest";
     expect(process.getInputStream()).andReturn(new ByteArrayInputStream(trigger.getBytes()));
+    expect(process.isAlive()).andReturn(true);
 
     Capture<List<String>> captureArguments = Capture.newInstance();
     expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
@@ -527,6 +541,7 @@ public void testLaunchWithBinaryAndArgumentsThrowsExceptionOnTimeoutForciblyClos
 
     final String trigger = "test\r\n\r\n";
     expect(process.getInputStream()).andReturn(new ByteArrayInputStream(trigger.getBytes()));
+    expect(process.isAlive()).andReturn(true);
 
     Capture<List<String>> captureArguments = Capture.newInstance();
     expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
@@ -559,6 +574,67 @@ public void testLaunchWithBinaryAndArgumentsThrowsExceptionOnTimeoutForciblyClos
     assertEquals(removeCaptureShutdownThread.getValue(), addCaptureShutdownThread.getValue());
   }
 
+  @Test
+  public void testIsAlive() throws IOException {
+    assertFalse(launcher.isAlive());
+
+    final Path binaryPath = Paths.get("test-binary-path");
+
+    final ChromeArguments chromeArguments =
+        ChromeArguments.builder().incognito().userDataDir("user-data-dir-param").build();
+
+    shutdownHookRegistry.register(anyObject());
+
+    final String trigger = "\r\n\r\nDevTools listening on ws://127.0.0.1:9123/";
+    expect(process.getInputStream()).andReturn(new ByteArrayInputStream(trigger.getBytes()));
+
+    expect(process.isAlive()).andReturn(true);
+
+    Capture<List<String>> captureArguments = Capture.newInstance();
+    expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
+        .andReturn(process);
+
+    replayAll();
+
+    launcher.launch(binaryPath, chromeArguments);
+
+    assertTrue(launcher.isAlive());
+
+    verifyAll();
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void testExitValueThrowsExceptionWhenProcessNotStarted() throws IOException {
+    launcher.exitValue();
+  }
+
+  @Test
+  public void testExitValue() throws IOException {
+    final Path binaryPath = Paths.get("test-binary-path");
+
+    final ChromeArguments chromeArguments =
+        ChromeArguments.builder().incognito().userDataDir("user-data-dir-param").build();
+
+    shutdownHookRegistry.register(anyObject());
+
+    final String trigger = "\r\n\r\nDevTools listening on ws://127.0.0.1:9123/";
+    expect(process.getInputStream()).andReturn(new ByteArrayInputStream(trigger.getBytes()));
+
+    expect(process.exitValue()).andReturn(123);
+
+    Capture<List<String>> captureArguments = Capture.newInstance();
+    expect(processLauncher.launch(eq("test-binary-path"), capture(captureArguments)))
+        .andReturn(process);
+
+    replayAll();
+
+    launcher.launch(binaryPath, chromeArguments);
+
+    assertEquals(123, launcher.exitValue());
+
+    verifyAll();
+  }
+
   private static void assertUserDataDir(List<String> arguments) {
     boolean hasUserDataDir = false;
     for (String argument : arguments) {