Completed & tested a complete refactor of all the drivers and implementation with SauceLabs & BrowserStack

Author: jleeh

pom.xml

@@ -134,7 +134,6 @@
       <groupId>com.paulhammant</groupId>
       <artifactId>ngwebdriver</artifactId>
       <version>0.9.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

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

@@ -1,12 +1,11 @@
 package com.frameworkium.config;
 
-import com.frameworkium.config.browsers.*;
+import com.frameworkium.config.drivers.*;
 import com.frameworkium.config.remotes.BrowserStack;
 import com.frameworkium.config.remotes.Sauce;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.openqa.selenium.remote.DesiredCapabilities;
-import sun.security.krb5.internal.crypto.Des;
 
 import static com.frameworkium.config.SystemProperty.*;
 
@@ -15,10 +14,10 @@ public class DriverSetup {
     private static final SupportedBrowsers DEFAULT_BROWSER = SupportedBrowsers.FIREFOX;
 
     /**
-     * List of supported browsers
+     * List of supported drivers
      */
     private enum SupportedBrowsers {
-        FIREFOX,CHROME,OPERA,IE,PHANTOMJS,SAFARI
+        FIREFOX,CHROME,OPERA,IE,PHANTOMJS,SAFARI,IOS
     }
 
     /**
@@ -32,7 +31,7 @@ private enum SupportedRemotes {
      * List of supported platforms on remote grids
      */
     public enum SupportedPlatforms {
-        IOS,ANDROID,BROWSER
+        WINDOWS,OSX,IOS,ANDROID,NONE
     }
 
     protected final static Logger logger = LogManager.getLogger(DriverType.class);
@@ -108,7 +107,7 @@ private static SupportedPlatforms returnPlatformType() {
             return SupportedPlatforms.valueOf(SystemProperty.PLATFORM.getValue().toUpperCase());
         }
         else {
-            return null;
+            return SupportedPlatforms.NONE;
         }
     }
 

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

@@ -5,13 +5,11 @@
 import com.frameworkium.listeners.EventListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.SessionNotFoundException;
 
 import static com.frameworkium.config.SystemProperty.*;
-import static com.frameworkium.config.SystemProperty.BROWSER_VERSION;
 import static com.frameworkium.config.DriverSetup.useRemoteDriver;
 
 public abstract class DriverType {
@@ -54,21 +52,15 @@ public WebDriverWrapper getDriver() {
      * @return - Boolean, whether using mobile or not
      */
     public static boolean isMobile() {
-        return "ios".equalsIgnoreCase(PLATFORM.getValue()) || "android".equalsIgnoreCase(PLATFORM.getValue());
+        return false;
     }
 
     /**
      * Maximises the browser window based on paramaters
      */
     public void maximiseBrowserWindow() {
         if (!MAXIMISE.isSpecified() || Boolean.parseBoolean(MAXIMISE.getValue())) {
-            if (DriverType.isNative()) {
-                webDriverWrapper.getWrappedAppiumDriver().manage().window().maximize();
-            }
-            if(useRemoteDriver()) {
-                webDriverWrapper.getWrappedRemoteWebDriver().manage().window().maximize();
-            }
-            else {
+            if((!useRemoteDriver() && !isNative()) || GRID_URL.isSpecified()) {
                 webDriverWrapper.getWrappedDriver().manage().window().maximize();
             }
         }
@@ -116,22 +108,6 @@ public static boolean isNative() {
         return APP_PATH.isSpecified();
     }
 
-    /**
-     * Used by the drivers which are remote, as common desired capabilities
-     *
-     * @param desiredCapabilities - The browser desired capabilities
-     * @return - The browser desired capabilities
-     */
-    protected static DesiredCapabilities setGeneralRemoteCapabilities(DesiredCapabilities desiredCapabilities) {
-        if (PLATFORM.isSpecified()) {
-            desiredCapabilities.setPlatform(Platform.valueOf(PLATFORM.getValue().toUpperCase()));
-        }
-        if (BROWSER_VERSION.isSpecified()) {
-            desiredCapabilities.setVersion(BROWSER_VERSION.getValue());
-        }
-        return desiredCapabilities;
-    }
-
     /**
      * Implemented in each Driver Type to specify the capabilities of that browser
      *

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

@@ -22,7 +22,8 @@ public enum SystemProperty {
     SUT_VERSION("sutVersion"),
     JIRA_RESULT_FIELDNAME("jiraResultFieldName"),
     JIRA_RESULT_TRANSITION("jiraResultTransition"),
-    MAXIMISE("maximise");
+    MAXIMISE("maximise"),
+    RESOLUTION("resolution");
 
 
     private String value;