Refactoring constructor that accepts FirefoxBinary and FirefoxProfile

Author: barancev

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -58,7 +58,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -151,6 +150,10 @@ public FirefoxDriver(FirefoxProfile profile) {
     this(new FirefoxOptions().setProfile(profile));
   }
 
+  public FirefoxDriver(FirefoxBinary binary, FirefoxProfile profile) {
+    this(new FirefoxOptions().setBinary(binary).setProfile(profile));
+  }
+
   public FirefoxDriver(Capabilities desiredCapabilities) {
     this(getBinary(desiredCapabilities), null, desiredCapabilities);
   }
@@ -284,10 +287,6 @@ private static FirefoxBinary getBinary(Capabilities capabilities) {
     return new FirefoxBinary();
   }
 
-  public FirefoxDriver(FirefoxBinary binary, FirefoxProfile profile) {
-    this(binary, profile, DesiredCapabilities.firefox());
-  }
-
   public FirefoxDriver(FirefoxBinary binary, FirefoxProfile profile, Capabilities capabilities) {
     this(binary, profile, capabilities, null);
   }

java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -28,9 +28,7 @@
 import com.google.gson.JsonPrimitive;
 
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.remote.CommandExecutor;
 import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.remote.service.DriverCommandExecutor;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -166,7 +164,7 @@ public FirefoxBinary getBinaryOrNull() {
   }
 
   public FirefoxOptions setProfile(FirefoxProfile profile) {
-    this.profile = checkNotNull(profile);
+    this.profile = profile;
     return this;
   }
 

java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java

@@ -106,6 +106,18 @@ public void canStartDriverWithSpecifiedProfile() throws IOException {
     verifyItIsLegacy(localDriver);
   }
 
+  @Test
+  public void canStartDriverWithSpecifiedBinaryAndProfile() throws IOException {
+    FirefoxBinary binary = spy(new FirefoxBinary());
+    FirefoxProfile profile = new FirefoxProfile();
+    profile.setPreference("browser.startup.page", 1);
+    profile.setPreference("browser.startup.homepage", pages.xhtmlTestPage);
+    localDriver = new FirefoxDriver(binary, profile);
+    wait.until($ -> "XHTML Test Page".equals(localDriver.getTitle()));
+    verifyItIsLegacy(localDriver);
+    verify(binary).startFirefoxProcess(any());
+  }
+
   private static class ConnectionCapturingDriver extends FirefoxDriver {
     public ExtensionConnection keptConnection;
 

java/client/test/org/openqa/selenium/firefox/MarionetteTest.java

@@ -77,6 +77,19 @@ public void canStartDriverWithSpecifiedProfile() throws IOException {
     verifyItIsMarionette(localDriver);
   }
 
+  @Test
+  public void canStartDriverWithSpecifiedBinaryAndProfile() throws IOException {
+    FirefoxBinary binary = spy(new FirefoxBinary());
+    FirefoxProfile profile = new FirefoxProfile();
+    profile.setPreference("browser.startup.page", 1);
+    profile.setPreference("browser.startup.homepage", pages.xhtmlTestPage);
+    localDriver = new FirefoxDriver(binary, profile);
+    wait.until($ -> "XHTML Test Page".equals(localDriver.getTitle()));
+    verifyItIsMarionette(localDriver);
+    verify(binary, atLeastOnce()).getPath();
+    verify(binary, never()).startFirefoxProcess(any());
+  }
+
   @Test
   public void shouldUseFirefoxOptions() throws InterruptedException {
     DesiredCapabilities caps = new FirefoxOptions()