Fix #65 Now checks System Props and Env Variables

Author: Ardesco

pom.xml

@@ -164,7 +164,7 @@
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
             <artifactId>system-rules</artifactId>
-            <version>1.16.0</version>
+            <version>1.16.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/lazerycode/selenium/download/DetectProxyConfig.java

@@ -28,8 +28,9 @@ public boolean isProxyAvailable() {
 
     public DetectProxyConfig() {
 
-        String proxyHost = System.getProperty("http.proxyHost");
-        Integer proxyPort = Integer.getInteger(System.getProperty("http.proxyPort"));
+        String proxyHost = System.getProperty("http.proxyHost", System.getenv("http.proxyHost"));
+        String proxyPortFromSystem = System.getProperty("http.proxyPort", System.getenv("http.proxyPort"));
+        Integer proxyPort = Integer.valueOf(proxyPortFromSystem);
 
         if (Strings.isNullOrEmpty(proxyHost) || null == proxyPort) {
 

src/test/java/com/lazerycode/selenium/download/DetectProxyConfigTest.java

@@ -3,13 +3,20 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ClearSystemProperties;
+import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
 
 public class DetectProxyConfigTest {
 
+    private static final String envHost = "localhost-env";
+    private static final Integer envPort = 8081;
+
+    @Rule
+    public final EnvironmentVariables envVars = new EnvironmentVariables();
+
     @Rule
     public final ClearSystemProperties proxyProperties = new ClearSystemProperties("http.proxyHost", "http.proxyPort", "java.net.useSystemProxies");
 
@@ -26,4 +33,31 @@ public void proxySettingsUsedIfTheyAreSet() {
         assertThat(proxyConfig.getPort(), is(equalTo(port)));
         assertThat(proxyConfig.isProxyAvailable(), is(equalTo(true)));
     }
+
+    @Test
+    public void proxySettingsUsesEnvVariablesIfTheyAreSet() throws Exception {
+        envVars.set("http.proxyHost", envHost);
+        envVars.set("http.proxyPort", Integer.toString(envPort));
+
+        DetectProxyConfig proxyConfig = new DetectProxyConfig();
+        assertThat(proxyConfig.getHost(), is(equalTo(envHost)));
+        assertThat(proxyConfig.getPort(), is(equalTo(envPort)));
+        assertThat(proxyConfig.isProxyAvailable(), is(equalTo(true)));
+    }
+
+    @Test
+    public void propertyOverridesEnvVariable() throws Exception {
+        String propHost = "localhost";
+        Integer propPort = 8080;
+        System.setProperty("http.proxyHost", propHost);
+        System.setProperty("http.proxyPort", "" + propPort);
+        envVars.set("http.proxyHost", envHost);
+        envVars.set("http.proxyPort", Integer.toString(envPort));
+
+        DetectProxyConfig proxyConfig = new DetectProxyConfig();
+        assertThat(proxyConfig.getHost(), is(equalTo(propHost)));
+        assertThat(proxyConfig.getPort(), is(equalTo(propPort)));
+        assertThat(proxyConfig.isProxyAvailable(), is(equalTo(true)));
+    }
+
 }