Refactored DriverType/DriverSetup to provide a lot more readability and scalability in terms of browsers & remotes.

 Included the library ngWebDriver to provide libraries for AngularJS support.

Author: jleeh

pom.xml

@@ -130,6 +130,12 @@
       <artifactId>aspectjweaver</artifactId>
       <version>1.8.5</version>
     </dependency>
+    <dependency>
+      <groupId>com.paulhammant</groupId>
+      <artifactId>ngwebdriver</artifactId>
+      <version>0.9.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <repositories>

src/main/java/com/frameworkium/capture/ScreenshotCapture.java

@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.net.UnknownHostException;
 
+import com.frameworkium.config.DriverSetup;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.openqa.selenium.OutputType;
@@ -74,7 +75,7 @@ private void initExecution(CreateExecution createExecutionMessage) {
     private String getNode(WebDriver webdriver) {
 
         String node = "n/a";
-        if (DriverType.useRemoteWebDriver) {
+        if (DriverSetup.useRemoteDriver()) {
             try {
                 RemoteWebDriver r = ((WebDriverWrapper) webdriver).getWrappedRemoteWebDriver();
                 URL gridURL = new URL(SystemProperty.GRID_URL.getValue());

src/main/java/com/frameworkium/config/DriverSetup.java

@@ -1,11 +1,131 @@
 package com.frameworkium.config;
 
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.remote.DesiredCapabilities;
+import com.frameworkium.config.browsers.*;
+import com.frameworkium.config.remotes.BrowserStack;
+import com.frameworkium.config.remotes.Sauce;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-public interface DriverSetup {
+import static com.frameworkium.config.SystemProperty.*;
 
-    WebDriver getWebDriverObject(DesiredCapabilities desiredCapabilities);
+public class DriverSetup {
 
-    DesiredCapabilities getDesiredCapabilities();
+    private static final SupportedBrowsers DEFAULT_BROWSER = SupportedBrowsers.FIREFOX;
+
+    /**
+     * List of supported browsers
+     */
+    private static enum SupportedBrowsers {
+        FIREFOX,CHROME,OPERA,IE,PHANTOMJS,SAFARI
+    }
+
+    /**
+     * List of supported remote grids
+     */
+    private static enum SupportedRemotes {
+        SAUCE,BROWSERSTACK,GRID
+    }
+
+    /**
+     * List of supported platforms on remote grids
+     */
+    public static enum SupportedPlatforms {
+        IOS,ANDROID,BROWSER
+    }
+
+    protected final static Logger logger = LogManager.getLogger(DriverType.class);
+
+    /**
+     * Returns the driver type to the base test, which initialises it
+     *
+     * @return - Driver Type
+     */
+    public static DriverType returnDesiredDriverType() {
+        return initialiseDesiredDriverType();
+    }
+
+    /**
+     * Uses the paramaters given to determine which browser/remote/platform to use
+     *
+     * @return - The correct driver type based on parameters
+     */
+    private static DriverType initialiseDesiredDriverType() {
+        if (useRemoteDriver()) {
+            SupportedPlatforms platform = returnPlatformType();
+            switch(returnRemoteType()) {
+                case SAUCE:
+                    return new SauceImpl(platform);
+                case BROWSERSTACK:
+                    return new BrowserStackImpl(platform);
+                case GRID:
+                    return new GridImpl();
+            }
+        }
+        else {
+            switch (returnBrowserType()) {
+                case FIREFOX:
+                    return new FirefoxImpl();
+                case CHROME:
+                    return new ChromeImpl();
+                case OPERA:
+                    return new OperaImpl();
+                case IE:
+                    return new InternetExporerImpl();
+                case PHANTOMJS:
+                    return new PhantomJSImpl();
+                case SAFARI:
+                    return new SafariImpl();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Checks whether a remote driver is wanting to be used
+     *
+     * @return - True/False to whether to use a remote driver
+     */
+    public static boolean useRemoteDriver() {
+        return GRID_URL.isSpecified() || Sauce.isDesired() || BrowserStack.isDesired();
+    }
+
+    /**
+     * Returns the platform type, if it's been given
+     *
+     * @return - Platform type
+     */
+    private static SupportedPlatforms returnPlatformType() {
+        return SupportedPlatforms.valueOf(SystemProperty.PLATFORM.getValue().toUpperCase());
+    }
+
+    /**
+     * Returns the browser type and returns default if not specified
+     *
+     * @return - Browser Type
+     */
+    private static SupportedBrowsers returnBrowserType() {
+        if (!SystemProperty.BROWSER.isSpecified()) {
+           return DEFAULT_BROWSER;
+        }
+        else {
+            return SupportedBrowsers.valueOf(SystemProperty.BROWSER.getValue().toUpperCase());
+        }
+    }
+
+    /**
+     * Returns what type of remote driver has been specified to be used
+     *
+     * @return - Remote Driver Type
+     */
+    private static SupportedRemotes returnRemoteType() {
+        if (Sauce.isDesired()) {
+            return SupportedRemotes.SAUCE;
+        }
+        else if (BrowserStack.isDesired()) {
+            return SupportedRemotes.BROWSERSTACK;
+        }
+        else {
+            return SupportedRemotes.GRID;
+        }
+    }
 }