[java] Adding a test for noProxy

SeleniumHQ · May 9, 2018 · d42e6ac · d42e6ac
1 parent bd1ae59
commit d42e6ac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/Proxy.java b/java/client/src/org/openqa/selenium/Proxy.java
@@ -246,7 +246,7 @@ public String getNoProxy() {
   /**
    * Sets proxy bypass (noproxy) addresses
    *
-   * @param noProxy The proxy bypass (noproxy) addresses
+   * @param noProxy The proxy bypass (noproxy) addresses separated by commas
    * @return reference to self
    */
   public Proxy setNoProxy(String noProxy) {

diff --git a/java/client/test/org/openqa/selenium/ProxySettingTest.java b/java/client/test/org/openqa/selenium/ProxySettingTest.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 import static org.openqa.selenium.testing.Driver.SAFARI;
@@ -86,6 +87,24 @@ public void canConfigureManualHttpProxy() {
     assertTrue("Proxy should have been called", proxyServer.hasBeenCalled("simpleTest.html"));
   }
 
+  @Test
+  @Ignore(SAFARI)
+  @NeedsLocalEnvironment
+  public void canConfigureNoProxy() {
+    Proxy proxyToUse = proxyServer.asProxy();
+    proxyToUse.setNoProxy("localhost, 127.0.0.*");
+    Capabilities caps = new ImmutableCapabilities(PROXY, proxyToUse);
+
+    WebDriver driver = new WebDriverBuilder().get(caps);
+    registerDriverTeardown(driver);
+
+    driver.get(appServer.whereIs("simpleTest.html"));
+    assertFalse("Proxy should not have been called", proxyServer.hasBeenCalled("simpleTest.html"));
+
+    driver.get(appServer.whereElseIs("simpleTest.html"));
+    assertTrue("Proxy should have been called", proxyServer.hasBeenCalled("simpleTest.html"));
+  }
+
   @Test
   @Ignore(SAFARI)
   @NeedsLocalEnvironment