[java] Moving code that finds Firefox binary from WindowsUtils to Fir…

…efoxBinary
SeleniumHQ · Nov 2, 2018 · 1911c51 · 1911c51
1 parent 530eca5
commit 1911c51
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 160 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java b/java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java
@@ -23,7 +23,6 @@
 import static org.openqa.selenium.Platform.MAC;
 import static org.openqa.selenium.Platform.UNIX;
 import static org.openqa.selenium.Platform.WINDOWS;
-import static org.openqa.selenium.os.WindowsUtils.getPathsInProgramFiles;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -49,7 +48,9 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class FirefoxBinary {
@@ -400,9 +401,10 @@ private static Stream<Executable> locateFirefoxBinariesFromPlatform() {
 
     Platform current = Platform.getCurrent();
     if (current.is(WINDOWS)) {
-      executables.addAll(Stream.of(getPathsInProgramFiles("Mozilla Firefox\\firefox.exe"),
-                                   getPathsInProgramFiles("Firefox Developer Edition\\firefox.exe"),
-                                   getPathsInProgramFiles("Nightly\\firefox.exe"))
+      executables.addAll(Stream.of("Mozilla Firefox\\firefox.exe",
+                                   "Firefox Developer Edition\\firefox.exe",
+                                   "Nightly\\firefox.exe")
+          .map(FirefoxBinary::getPathsInProgramFiles)
           .flatMap(List::stream)
           .map(File::new).filter(File::exists)
           .map(Executable::new).collect(toList()));
@@ -454,4 +456,35 @@ private static Stream<Executable> locateFirefoxBinariesFromPlatform() {
     return executables.build().stream();
   }
 
+  private static List<String> getPathsInProgramFiles(final String childPath) {
+    return Stream.of(getProgramFilesPath(), getProgramFiles86Path())
+        .map(parent -> new File(parent, childPath).getAbsolutePath())
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Returns the path to the Windows Program Files. On non-English versions, this is not necessarily
+   * "C:\Program Files".
+   *
+   * @return the path to the Windows Program Files
+   */
+  private static String getProgramFilesPath() {
+    return getEnvVarPath("ProgramFiles", "C:\\Program Files").replace(" (x86)", "");
+  }
+
+  private static String getProgramFiles86Path() {
+    return getEnvVarPath("ProgramFiles(x86)", "C:\\Program Files (x86)");
+  }
+
+  private static String getEnvVarPath(final String envVar, final String defaultValue) {
+    return getEnvVarIgnoreCase(envVar)
+        .map(File::new).filter(File::exists).map(File::getAbsolutePath)
+        .orElseGet(() -> new File(defaultValue).getAbsolutePath());
+  }
+
+  private static Optional<String> getEnvVarIgnoreCase(String var) {
+    return System.getenv().entrySet().stream()
+        .filter(e -> e.getKey().equalsIgnoreCase(var))
+        .findFirst().map(Map.Entry::getValue);
+  }
 }
diff --git a/java/client/src/org/openqa/selenium/os/WindowsUtils.java b/java/client/src/org/openqa/selenium/os/WindowsUtils.java
diff --git a/java/client/test/org/openqa/selenium/SmallTests.java b/java/client/test/org/openqa/selenium/SmallTests.java
@@ -31,7 +31,6 @@
 import org.openqa.selenium.net.NetworkUtilsTest;
 import org.openqa.selenium.net.UrlCheckerTest;
 import org.openqa.selenium.os.CommandLineTest;
-import org.openqa.selenium.os.WindowsUtilsUnitTest;
 import org.openqa.selenium.testing.drivers.IgnoreComparatorUnitTest;
 
 @RunWith(Suite.class)
@@ -59,7 +58,6 @@
     TemporaryFilesystemTest.class,
     UrlCheckerTest.class,
     WebDriverExceptionTest.class,
-    WindowsUtilsUnitTest.class,
     ZipTest.class,
 
     org.openqa.selenium.support.SmallTests.class,

diff --git a/java/client/test/org/openqa/selenium/os/WindowsUtilsUnitTest.java b/java/client/test/org/openqa/selenium/os/WindowsUtilsUnitTest.java