Fix issue with cleaning user data dir

Author: kklisura

cdtp-definition-builder/pom.xml

@@ -117,7 +117,7 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>com.coveo</groupId>
@@ -168,6 +168,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>

cdtp-java-client/src/main/java/com/github/kklisura/cdtp/launch/ChromeArguments.java

@@ -21,8 +21,6 @@
  */
 
 import com.github.kklisura.cdtp.launch.support.annotations.ChromeArgument;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,6 +30,8 @@
  * @author Kenan Klisura
  */
 public class ChromeArguments {
+  public static final String USER_DATA_DIR_ARGUMENT = "user-data-dir";
+
   @ChromeArgument("headless")
   private Boolean headless;
 
@@ -44,7 +44,7 @@ public class ChromeArguments {
   @ChromeArgument("no-first-run")
   private Boolean noFirstRun;
 
-  @ChromeArgument("user-data-dir")
+  @ChromeArgument(USER_DATA_DIR_ARGUMENT)
   private String userDataDir;
 
   @ChromeArgument("incognito")
@@ -331,8 +331,7 @@ public static Builder defaults(boolean headless) {
             .disableSync()
             .disableTranslate()
             .metricsRecordingOnly()
-            .safebrowsingDisableAutoUpdate()
-            .userDataDir(randomUserDataDir());
+            .safebrowsingDisableAutoUpdate();
 
     if (headless) {
       builder.headless().disableGpu().hideScrollbars().muteAudio();
@@ -341,20 +340,6 @@ public static Builder defaults(boolean headless) {
     return builder;
   }
 
-  /**
-   * Returns a random user data dir.
-   *
-   * @return Random user data dir absolute path.
-   * @throws RuntimeException If it fails to create temp directory.
-   */
-  public static String randomUserDataDir() {
-    try {
-      return Files.createTempDirectory("cdtp-user-data-dir").toAbsolutePath().toString();
-    } catch (IOException e) {
-      throw new RuntimeException("Failed creating temp directory for user data dir.", e);
-    }
-  }
-
   /** The type Builder. */
   public static class Builder {
     private ChromeArguments arguments;

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

@@ -20,7 +20,10 @@
  * #L%
  */
 
+import static com.github.kklisura.cdtp.launch.ChromeArguments.USER_DATA_DIR_ARGUMENT;
 import static com.github.kklisura.cdtp.utils.ChromeDevToolsUtils.closeQuietly;
+import static com.github.kklisura.cdtp.utils.FilesUtils.deleteQuietly;
+import static com.github.kklisura.cdtp.utils.FilesUtils.randomTempDir;
 
 import com.github.kklisura.cdtp.launch.config.ChromeLauncherConfiguration;
 import com.github.kklisura.cdtp.launch.exceptions.ChromeProcessException;
@@ -60,6 +63,8 @@ public class ChromeLauncher implements AutoCloseable {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ChromeLauncher.class);
 
+  private static final String TEMP_PREFIX = "cdtp-user-data-dir";
+
   private static final Pattern DEVTOOLS_LISTENING_LINE_PATTERN =
       Pattern.compile("^DevTools listening on ws:\\/\\/.+?:(\\d+)\\/");
 
@@ -86,6 +91,8 @@ public class ChromeLauncher implements AutoCloseable {
 
   private ChromeLauncherConfiguration configuration;
 
+  private Path userDataDirPath;
+
   /** Instantiates a new Chrome launcher. */
   public ChromeLauncher() {
     this(new ChromeLauncherConfiguration());
@@ -224,6 +231,8 @@ public void close() {
 
         chromeProcess.destroyForcibly();
         chromeProcess = null;
+      } finally {
+        deleteQuietly(userDataDirPath);
       }
 
       try {
@@ -254,13 +263,21 @@ private int launchChromeProcess(Path chromeBinary, ChromeArguments chromeArgumen
 
     Map<String, Object> argumentsMap = getArguments(chromeArguments);
 
+    // Special case for user data directory.
+    if (chromeArguments.getUserDataDir() == null) {
+      String userDatDir = randomTempDir(TEMP_PREFIX);
+      userDataDirPath = Paths.get(userDatDir);
+      argumentsMap.put(USER_DATA_DIR_ARGUMENT, userDatDir);
+    }
+
     List<String> arguments = argsMapToArgsList(argumentsMap);
 
     LOGGER.info(
         "Launching chrome process {} with arguments {}", chromeBinary.toString(), argumentsMap);
 
     try {
       chromeProcess = processLauncher.launch(chromeBinary.toString(), arguments);
+
       return waitForDevToolsServer(chromeProcess);
     } catch (IOException e) {
       // Unsubscribe from registry on exceptions.

cdtp-java-client/src/main/java/com/github/kklisura/cdtp/utils/FilesUtils.java

@@ -0,0 +1,73 @@
+package com.github.kklisura.cdtp.utils;
+
+/*-
+ * #%L
+ * cdpt-java-client
+ * %%
+ * Copyright (C) 2018 Kenan Klisura
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Files utils.
+ *
+ * @author Kenan Klisura
+ */
+public final class FilesUtils {
+  /**
+   * Deletes the files/directories on a given path.
+   *
+   * @param path Path to delete.
+   */
+  public static void deleteQuietly(Path path) {
+    if (path != null) {
+      try {
+        File file = path.toFile();
+        if (file.isDirectory()) {
+          File[] directoryFiles = file.listFiles();
+
+          if (directoryFiles != null) {
+            for (File directoryFile : directoryFiles) {
+              deleteQuietly(directoryFile.toPath());
+            }
+          }
+        }
+
+        file.delete();
+      } catch (Exception e) {
+        // Ignore this exception.
+      }
+    }
+  }
+
+  /**
+   * Returns a random temp dir.
+   *
+   * @return Random temp data dir absolute path.
+   * @throws RuntimeException If it fails to create temp directory.
+   */
+  public static String randomTempDir(String prefix) {
+    try {
+      return Files.createTempDirectory(prefix).toAbsolutePath().toString();
+    } catch (IOException e) {
+      throw new RuntimeException("Failed creating temp directory for " + prefix, e);
+    }
+  }
+}

cdtp-java-client/src/test/java/com/github/kklisura/cdtp/launch/ChromeArgumentsTest.java

@@ -117,7 +117,7 @@ private void assertDefaults(ChromeArguments args) {
     assertTrue(args.getSafebrowsingDisableAutoUpdate());
     assertTrue(args.getDisablePopupBlocking());
 
-    assertNotNull(args.getUserDataDir());
+    assertNull(args.getUserDataDir());
 
     assertEquals(0, args.getRemoteDebuggingPort().intValue());
   }