ReflectionBackendDriverSupplier: two arguments Capabilities

This allows ReflectionBackendDriverSupplier to check if the driver class has a constructor with two Capabilities, and if so it is called, otherwise the single Capabilities constructor is used. Signed-off-by: Luke Inman-Semerau <[email protected]>
SeleniumHQ · Aug 22, 2015 · 4d94ba0 · 4d94ba0
1 parent 409699b
commit 4d94ba0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java
@@ -249,6 +249,10 @@ public HtmlUnitDriver(Capabilities capabilities) {
     setProxySettings(Proxy.extractFrom(capabilities));
   }
 
+  public HtmlUnitDriver(Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
+    this(new DesiredCapabilities(desiredCapabilities, requiredCapabilities));
+  }
+
   // Package visibility for testing
   static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
     String browserName = null;

diff --git a/java/client/test/org/openqa/selenium/ProxySettingTest.java b/java/client/test/org/openqa/selenium/ProxySettingTest.java
@@ -163,7 +163,6 @@ public void canUsePACThatOnlyProxiesCertainHosts() throws Exception {
   }
 
   @Ignore({CHROME, IE, PHANTOMJS, REMOTE, SAFARI})
-  @NotYetImplemented(HTMLUNIT)
   @NeedsLocalEnvironment
   @Test
   public void canConfigureProxyWithRequiredCapability() {
@@ -179,7 +178,6 @@ public void canConfigureProxyWithRequiredCapability() {
   }
 
   @Ignore({CHROME, IE, PHANTOMJS, REMOTE, SAFARI})
-  @NotYetImplemented(HTMLUNIT)
   @NeedsLocalEnvironment
   @Test
   public void requiredProxyCapabilityShouldHavePriority() {

diff --git a/java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java b/java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java
@@ -36,6 +36,10 @@ public HtmlUnitDriverForTest(Capabilities capabilities) {
       super(tweak(capabilities));
     }
 
+    public HtmlUnitDriverForTest(Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
+      super(tweak(desiredCapabilities), tweak(requiredCapabilities));
+    }
+
     private static Capabilities tweak(Capabilities capabilities) {
       DesiredCapabilities caps = new DesiredCapabilities(capabilities);
       caps.setJavascriptEnabled(true);

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java b/java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java
@@ -75,7 +75,14 @@ public WebDriver get() {
             Capabilities.class).newInstance(desiredCapsToUse, requiredCapabilities);
       }
 
-      //TODO: Call constructor with two Capabilities arguments for all driver classes
+      try {
+          return driverClass.getConstructor(Capabilities.class,
+             Capabilities.class).newInstance(desiredCapsToUse, requiredCapabilities);
+      } catch (NoSuchMethodException e) {
+          // ignore
+      }
+
+      //TODO: All driver classes to have two Capabilities arguments
       return driverClass.getConstructor(Capabilities.class).newInstance(desiredCapsToUse);
     } catch (InvocationTargetException e) {
       throw Throwables.propagate(e.getTargetException());