Selenium 4 changes

pom.xml

@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.browserstack</groupId>
@@ -12,47 +12,44 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
         <surefire.version>2.19.1</surefire.version>
 
         <test.file></test.file>
         <config.file>default</config.file>
     </properties>
 
     <dependencies>
-    <dependency>
-        <groupId>org.testng</groupId>
-        <artifactId>testng</artifactId>
-        <version>6.9.10</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.3.2</version>
-    </dependency>
-    <dependency>
-        <groupId>org.seleniumhq.selenium</groupId>
-        <artifactId>selenium-java</artifactId>
-        <version>2.52.0</version>
-    </dependency>
-    <dependency>
-        <groupId>com.browserstack</groupId>
-        <artifactId>browserstack-local-java</artifactId>
-        <version>0.1.0</version>
-    </dependency>
-    <dependency>
-        <groupId>com.googlecode.json-simple</groupId>
-        <artifactId>json-simple</artifactId>
-        <version>1.1.1</version>
-    </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.9.10</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.browserstack</groupId>
+            <artifactId>browserstack-local-java</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

src/test/java/com/browserstack/BrowserStackTestNGTest.java

@@ -1,60 +1,53 @@
 package com.browserstack;
-import com.browserstack.local.Local;
 
-import java.io.File;
 import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
+import java.util.Map;
+
+import com.browserstack.local.Local;
+
 import org.json.simple.JSONObject;
-import org.json.simple.JSONArray;
 import org.json.simple.parser.JSONParser;
-
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
-
-import org.testng.annotations.BeforeMethod;
+import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Factory;
-import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
 
 
 public class BrowserStackTestNGTest {
     public WebDriver driver;
-    private Local l;
+    private Local bsLocal;
 
     @BeforeMethod(alwaysRun=true)
     @org.testng.annotations.Parameters(value={"config", "environment"})
+    @SuppressWarnings("unchecked")
     public void setUp(String config_file, String environment) throws Exception {
         JSONParser parser = new JSONParser();
         JSONObject config = (JSONObject) parser.parse(new FileReader("src/test/resources/conf/" + config_file));
         JSONObject envs = (JSONObject) config.get("environments");
 
         DesiredCapabilities capabilities = new DesiredCapabilities();
 
-        Map<String, String> envCapabilities = (Map<String, String>) envs.get(environment);
-        Iterator it = envCapabilities.entrySet().iterator();
+        Map<String, Object> envCapabilities = (Map<String, Object>) envs.get(environment);
+        Iterator<Map.Entry<String, Object>> it = envCapabilities.entrySet().iterator();
         while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry)it.next();
-            capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
+            Map.Entry<String, Object> pair = (Map.Entry<String, Object>) it.next();
+            capabilities.setCapability(pair.getKey().toString(), pair.getValue());
         }
-        
-        Map<String, String> commonCapabilities = (Map<String, String>) config.get("capabilities");
+
+        Map<String, Object> commonCapabilities = (Map<String, Object>) config.get("capabilities");
         it = commonCapabilities.entrySet().iterator();
         while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry)it.next();
-            if(capabilities.getCapability(pair.getKey().toString()) == null){
-                capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
+            Map.Entry<String, Object> pair = (Map.Entry<String, Object>) it.next();
+            Object envData = capabilities.getCapability(pair.getKey().toString());
+            Object resultData = pair.getValue();
+            if (envData != null && envData.getClass() == JSONObject.class) {
+                ((JSONObject) resultData).putAll((JSONObject) envData);
             }
+            capabilities.setCapability(pair.getKey().toString(), resultData);
         }
 
         String username = System.getenv("BROWSERSTACK_USERNAME");
@@ -67,19 +60,36 @@ public void setUp(String config_file, String environment) throws Exception {
             accessKey = (String) config.get("key");
         }
 
-        if(capabilities.getCapability("browserstack.local") != null && capabilities.getCapability("browserstack.local") == "true"){
-            l = new Local();
+        this.checkAndStartBrowserStackLocal(capabilities, accessKey);
+
+        driver = new RemoteWebDriver(new URL("https://"+username+":"+accessKey+"@"+config.get("server")+"/wd/hub"), capabilities);
+    }
+
+    public void checkAndStartBrowserStackLocal(DesiredCapabilities capabilities, String accessKey) throws Exception {
+        if (bsLocal != null) {
+            return;
+        }
+        if (capabilities.getCapability("bstack:options") != null
+                && ((JSONObject) capabilities.getCapability("bstack:options")).get("local") != null
+                && ((Boolean) ((JSONObject) capabilities.getCapability("bstack:options")).get("local")) == true) {
+            bsLocal = new Local();
             Map<String, String> options = new HashMap<String, String>();
             options.put("key", accessKey);
-            l.start(options);
+            try {
+                bsLocal.start(options);
+            } catch (Exception e) {
+                System.out.println("Error: could not start browserstack local");
+                e.printStackTrace();
+                throw e;
+            }
         }
-
-        driver = new RemoteWebDriver(new URL("http://"+username+":"+accessKey+"@"+config.get("server")+"/wd/hub"), capabilities);
     }
 
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         driver.quit();
-        if(l != null) l.stop();
+        if (bsLocal != null) {
+            bsLocal.stop();
+        }
     }
 }

src/test/resources/conf/local.conf.json

@@ -2,14 +2,18 @@
   "server": "hub-cloud.browserstack.com",
   "user": "BROWSERSTACK_USERNAME",
   "key": "BROWSERSTACK_ACCESS_KEY",
-
   "capabilities": {
-    "build": "testng-browserstack",
-    "name": "local_test",
-    "browserstack.debug": true,
-    "browserstack.local": true
+    "browserstack.use_w3c": true,
+    "bstack:options": {
+      "os": "Windows",
+      "osVersion": "7",
+      "sessionName": "local_test",
+      "buildName": "testng-browserstack",
+      "projectName": "My Awesome App",
+      "debug": true,
+      "local": true
+    }
   },
-
   "environments": {
     "chrome": {
       "browser": "chrome"

src/test/resources/conf/parallel.conf.json

@@ -2,13 +2,15 @@
   "server": "hub-cloud.browserstack.com",
   "user": "BROWSERSTACK_USERNAME",
   "key": "BROWSERSTACK_ACCESS_KEY",
-
   "capabilities": {
-    "build": "testng-browserstack",
-    "name": "parallel_test",
-    "browserstack.debug": true
+    "browserstack.use_w3c": true,
+    "bstack:options": {
+      "sessionName": "parallel_test",
+      "buildName": "testng-browserstack",
+      "projectName": "My Awesome App",
+      "debug": true
+    }
   },
-
   "environments": {
     "chrome": {
       "browser": "chrome"
@@ -17,10 +19,17 @@
       "browser": "firefox"
     },
     "safari": {
-      "browser": "safari"
+      "browser": "safari",
+      "bstack:options": {
+        "os": "OS X",
+        "osVersion": "High Sierra"
+      }
     },
     "ie": {
-      "browser": "internet explorer"
+      "browser": "Internet Explorer",
+      "bstack:options": {
+        "os": "Windows",
+      }
     }
   }
 }

src/test/resources/conf/single.conf.json

@@ -2,13 +2,17 @@
   "server": "hub-cloud.browserstack.com",
   "user": "BROWSERSTACK_USERNAME",
   "key": "BROWSERSTACK_ACCESS_KEY",
-
   "capabilities": {
-    "build": "testng-browserstack",
-    "name": "single_test",
-    "browserstack.debug": true
+    "browserstack.use_w3c": true,
+    "bstack:options": {
+      "os": "Windows",
+      "osVersion": "7",
+      "sessionName": "single_test",
+      "buildName": "testng-browserstack",
+      "projectName": "My Awesome App",
+      "debug": true
+    }
   },
-
   "environments": {
     "chrome": {
       "browser": "chrome"

src/test/resources/conf/suite.conf.json

@@ -2,13 +2,15 @@
   "server": "hub-cloud.browserstack.com",
   "user": "BROWSERSTACK_USERNAME",
   "key": "BROWSERSTACK_ACCESS_KEY",
-
   "capabilities": {
-    "build": "testng-browserstack",
-    "name": "suite_test",
-    "browserstack.debug": true
+    "browserstack.use_w3c": true,
+    "bstack:options": {
+      "sessionName": "suite_test",
+      "buildName": "testng-browserstack",
+      "projectName": "My Awesome App",
+      "debug": true
+    }
   },
-
   "environments": {
     "chrome": {
       "browser": "chrome"
@@ -17,10 +19,17 @@
       "browser": "firefox"
     },
     "safari": {
-      "browser": "safari"
+      "browser": "safari",
+      "bstack:options": {
+        "os": "OS X",
+        "osVersion": "High Sierra"
+      }
     },
     "ie": {
-      "browser": "internet explorer"
+      "browser": "Internet Explorer",
+      "bstack:options": {
+        "os": "Windows",
+      }
     }
   }
 }