Build the SynthesizedFirefoxDriver using Buck

This now means that tests run in IJ use Buck by default.
That's a milestone for progress :)

Author: shs96c

java/client/test/org/openqa/selenium/BuckBuild.java

@@ -118,12 +118,13 @@ private void findBuck(Path projectRoot, ImmutableList.Builder<String> builder) t
 
   private void downloadBuckPexIfNecessary(ImmutableList.Builder<String> builder)
     throws IOException {
-    String buckVersion = new String(Files.readAllBytes(Paths.get(".buckversion"))).trim();
+    Path projectRoot = InProject.locate("Rakefile").getParentFile().toPath();
+    String buckVersion = new String(Files.readAllBytes(projectRoot.resolve(".buckversion"))).trim();
 
     Path pex = Paths.get(
       StandardSystemProperty.USER_HOME.value(), ".crazyfun", "buck", buckVersion, "buck.pex");
 
-    String expectedHash = new String(Files.readAllBytes(Paths.get(".buckhash"))).trim();
+    String expectedHash = new String(Files.readAllBytes(projectRoot.resolve(".buckhash"))).trim();
     HashCode md5 = Files.exists(pex) ?
                    Hashing.md5().hashBytes(Files.readAllBytes(pex)) :
                    HashCode.fromString("aa");  // So we have a non-null value

java/client/test/org/openqa/selenium/testing/drivers/SynthesizedFirefoxDriver.java

@@ -17,41 +17,43 @@
 
 package org.openqa.selenium.testing.drivers;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.openqa.selenium.testing.DevMode.isInDevMode;
-import static org.openqa.selenium.testing.InProject.locate;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.io.Files;
 
-import org.openqa.selenium.Build;
+import org.openqa.selenium.BuckBuild;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.testing.DevMode;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class SynthesizedFirefoxDriver extends FirefoxDriver {
 
   private static boolean runBuild = true;
+  private static File cachedExt = null;
 
   public SynthesizedFirefoxDriver() {
     this(new DesiredCapabilities(), new DesiredCapabilities());
   }
 
   public SynthesizedFirefoxDriver(FirefoxProfile profile) throws IOException {
-    this(new DesiredCapabilities(), new DesiredCapabilities(ImmutableMap.of(PROFILE, profile)));
+    this(new DesiredCapabilities(ImmutableMap.of(PROFILE, profile)), new DesiredCapabilities());
   }
 
   public SynthesizedFirefoxDriver(Capabilities desiredCapabilities) {
     this(desiredCapabilities, null);
   }
 
   public SynthesizedFirefoxDriver(Capabilities desiredCapabilities,
-      Capabilities requiredCapabilities) {
+                                  Capabilities requiredCapabilities) {
     super(tweakCapabilities(desiredCapabilities), requiredCapabilities);
   }
 
@@ -103,54 +105,46 @@ private static FirefoxProfile createTemporaryProfile() {
     }
 
     try {
-      File prefs = locate("build/javascript/firefox-driver/webdriver_prefs.json");
-      File noFocus = locate("build/cpp/i386/libnoblur.so");
-      File ime = locate("build/cpp/i386/libimehandler.so");
-      File noFocus64 = locate("build/cpp/amd64/libnoblur64.so");
-      File ime64 = locate("build/cpp/amd64/libimehandler64.so");
-      File dest = locate("java/client/build/production/org/openqa/selenium/firefox");
-      Files.copy(prefs, new File(dest, "webdriver_prefs.json"));
-
-      File libDir = new File(dest, "x86");
-      if (!libDir.exists()) {
-        assertTrue("Cannot create x86 library directory", libDir.mkdir());
-      }
-      Files.copy(noFocus, new File(libDir, "x_ignore_nofocus.so"));
-      Files.copy(ime, new File(libDir, "libibushandler.so"));
-
-      libDir = new File(dest, "amd64");
-      if (!libDir.exists()) {
-        assertTrue("Cannot create x86 library directory", libDir.mkdir());
-      }
-      Files.copy(noFocus64, new File(libDir, "x_ignore_nofocus.so"));
-      Files.copy(ime64, new File(libDir, "libibushandler.so"));
-
       FirefoxProfile profile = new FirefoxProfile();
-
       if (Boolean.getBoolean("webdriver.debug")) {
+
         Firebug.addTo(profile);
       }
 
       profile.setEnableNativeEvents(Boolean.getBoolean("selenium.browser.native_events"));
       profile.setPreference("webdriver.log.file", "/dev/stdout");
 
       return copyExtensionTo(profile);
-    } catch (Exception e) {
+    } catch (IOException e) {
       e.printStackTrace();
-      fail(e.getMessage());
+      throw new RuntimeException(e);
     }
-    return null;
   }
 
   private static FirefoxProfile copyExtensionTo(FirefoxProfile profile) throws IOException {
-    File topDir = locate("Rakefile").getParentFile();
-    File ext = new File(topDir,
-        "build/javascript/firefox-driver/webdriver.xpi");
-    if (!ext.exists() || runBuild) {
-      ext.delete();
-      new Build().of("//javascript/firefox-driver:webdriver").go();
+    // Look for the xpi as a resource first.
+    URL resource = FirefoxDriver.class.getResource("/org/openqa/selenium/firefox/webdriver.xpi");
+    File ext;
+    if (resource != null || !DevMode.isInDevMode()) {
+      Path path = Files.createTempFile("syn-firefox", ".xpi");
+      ext = path.toFile();
+      ext.deleteOnExit();
+      try (InputStream is = resource.openStream()) {
+        Files.copy(is, path);
+      }
+    } else if (runBuild) {
+      Path output = new BuckBuild().of("//javascript/firefox-driver:webdriver").go();
+      ext = output.toFile();
+      cachedExt = ext;
       runBuild = false;
+    } else {
+      ext = cachedExt;
     }
+
+    if (ext == null) {
+      throw new RuntimeException("Cannot compile firefox extension");
+    }
+
     profile.addExtension(ext);
     return profile;
   }