Remove obsolete property setting

Naimadnap · May 25, 2015 · b87f506 · b87f506
1 parent fe4baca
commit b87f506
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 45 deletions.
diff --git a/src/test/java/com/lazerycode/selenium/DriverFactory.java b/src/test/java/com/lazerycode/selenium/DriverFactory.java
@@ -1,6 +1,5 @@
 package com.lazerycode.selenium;
 
-import com.lazerycode.selenium.config.DriverType;
 import com.lazerycode.selenium.config.WebDriverThread;
 import com.lazerycode.selenium.listeners.ScreenshotListener;
 import org.openqa.selenium.WebDriver;
@@ -19,25 +18,6 @@ public class DriverFactory {
     private static List<WebDriverThread> webDriverThreadPool = Collections.synchronizedList(new ArrayList<WebDriverThread>());
     private static ThreadLocal<WebDriverThread> driverThread;
 
-    public DriverFactory() {
-        setBinaryVariables();
-    }
-
-    private void setBinaryVariables() {
-        for (DriverType driverType : DriverType.values()) {
-            String variable = driverType.getWebDriverSystemPropertyKey();
-            if (null != variable) {
-                String systemProperty = System.getProperty(variable);
-                if (null == systemProperty || systemProperty.isEmpty()) {
-                    String environmentalVariable = System.getenv(variable);
-                    if (null != environmentalVariable && !environmentalVariable.isEmpty()) {
-                        System.setProperty(variable, environmentalVariable);
-                    }
-                }
-            }
-        }
-    }
-
     @BeforeSuite
     public static void instantiateDriverObject() {
         driverThread = new ThreadLocal<WebDriverThread>() {

diff --git a/src/test/java/com/lazerycode/selenium/config/DriverType.java b/src/test/java/com/lazerycode/selenium/config/DriverType.java
@@ -43,11 +43,6 @@ public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
         public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
             return new ChromeDriver(capabilities);
         }
-
-        @Override
-        public String getWebDriverSystemPropertyKey() {
-            return "webdriver.chrome.driver";
-        }
     },
     IE {
         public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
@@ -61,11 +56,6 @@ public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
         public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
             return new InternetExplorerDriver(capabilities);
         }
-
-        @Override
-        public String getWebDriverSystemPropertyKey() {
-            return "webdriver.ie.driver";
-        }
     },
     SAFARI {
         public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
@@ -87,11 +77,6 @@ public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
         public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
             return new OperaDriver(capabilities);
         }
-
-        @Override
-        public String getWebDriverSystemPropertyKey() {
-            return "webdriver.opera.driver";
-        }
     },
     PHANTOMJS {
         public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
@@ -109,18 +94,8 @@ public DesiredCapabilities getDesiredCapabilities(Proxy proxySettings) {
         public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
             return new PhantomJSDriver(capabilities);
         }
-
-        @Override
-        public String getWebDriverSystemPropertyKey() {
-            return "phantomjs.binary.path";
-        }
     };
 
-
-    public String getWebDriverSystemPropertyKey() {
-        return null;
-    }
-
     protected DesiredCapabilities addProxySettings(DesiredCapabilities capabilities, Proxy proxySettings) {
         if (null != proxySettings) {
             capabilities.setCapability(PROXY, proxySettings);