migrate master branch scripts to Sel 4

Author: kamal-kaur04

pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>3.12.0</version>
+            <version>4.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.browserstack</groupId>

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

@@ -34,15 +34,19 @@ public void setUp(String config_file, String environment) throws Exception {
         Iterator it = envCapabilities.entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry pair = (Map.Entry) it.next();
-            capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
+            capabilities.setCapability(pair.getKey().toString(), pair.getValue());
         }
 
         Map<String, String> commonCapabilities = (Map<String, String>) 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());
+                capabilities.setCapability(pair.getKey().toString(), pair.getValue());
+            } else if (pair.getKey().toString().equalsIgnoreCase("bstack:options")) {
+                HashMap bstackOptionsMap = (HashMap) pair.getValue();
+               bstackOptionsMap.putAll((HashMap) capabilities.getCapability("bstack:options"));
+               capabilities.setCapability(pair.getKey().toString(), bstackOptionsMap);
             }
         }
 
@@ -56,12 +60,14 @@ 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();
-            Map<String, String> options = new HashMap<String, String>();
-            options.put("key", accessKey);
-            l.start(options);
+        if (capabilities.getCapability("bstack:options") != null) {
+            HashMap bstackOptionsMap = (HashMap) capabilities.getCapability("bstack:options");
+            if (bstackOptionsMap.get("local").toString().equalsIgnoreCase("true")) {
+                l = new Local();
+                Map<String, String> options = new HashMap<String, String>();
+                options.put("key", accessKey);
+                l.start(options);
+            }
         }
 
         driver = new RemoteWebDriver(

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

@@ -4,15 +4,19 @@
   "key": "BROWSERSTACK_ACCESS_KEY",
 
   "capabilities": {
-    "build": "browserstack-build-1",
-    "name": "local_test",
-    "browserstack.debug": true,
-    "browserstack.local": true
+    "bstack:options": {
+      "buildName": "browserstack-build-1",
+      "sessionName": "local_test",
+      "debug": true,
+      "local": true
+    }
   },
 
   "environments": {
     "chrome": {
-      "browser": "chrome"
+      "bstack:options": {
+        "browserName": "chrome"
+      }
     }
   }
 }

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

@@ -4,21 +4,30 @@
   "key": "BROWSERSTACK_ACCESS_KEY",
 
   "capabilities": {
-    "build": "browserstack-build-1",
-    "name": "parallel_test",
-    "browserstack.debug": true
+    "bstack:options": {
+      "buildName": "browserstack-build-1",
+      "sessionName": "parallel_test",
+      "browserVersion": "latest",
+      "debug": true
+    }
   },
 
   "environments": {
     "env1": {
-      "browser": "chrome"
+      "bstack:options": {
+        "browserName": "chrome"
+      }
     },
     "env2": {
-      "browser": "firefox"
+      "bstack:options": {
+        "browserName": "firefox"
+      }
     },
     "env3": {
-      "os": "OS X",
-      "browser": "safari"
+      "bstack:options": {
+        "os": "OS X",
+        "browserName": "safari"
+      }
     }
   }
 }

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

@@ -4,14 +4,19 @@
   "key": "BROWSERSTACK_ACCESS_KEY",
 
   "capabilities": {
-    "build": "browserstack-build-1",
-    "name": "single_test",
-    "browserstack.debug": true
+    "bstack:options": {
+      "buildName": "browserstack-build-1",
+      "sessionName": "single_test",
+      "browserVersion": "latest",
+      "debug": true
+    }
   },
 
   "environments": {
     "chrome": {
-      "browser": "chrome"
+      "bstack:options": {
+        "browserName": "chrome"
+      }
     }
   }
 }

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

@@ -4,24 +4,34 @@
   "key": "BROWSERSTACK_ACCESS_KEY",
 
   "capabilities": {
-    "build": "browserstack-build-1",
-    "name": "suite_test",
-    "browserstack.debug": true
+    "bstack:options": {
+      "buildName": "browserstack-build-1",
+      "sessionName": "suite_test",
+      "debug": true
+    }
   },
 
   "environments": {
     "chrome": {
-      "browser": "chrome"
+      "bstack:options": {
+        "browserName": "chrome"
+      }
     },
     "firefox": {
-      "browser": "firefox"
+      "bstack:options": {
+        "browserName": "firefox"
+      }
     },
     "safari": {
-      "os": "OS X",
-      "browser": "safari"
+      "bstack:options": {
+        "os": "OS X",
+        "browserName": "safari"
+      }
     },
     "ie": {
-      "browser": "internet explorer"
+      "bstack:options": {
+        "browserName": "internet explorer"
+      }
     }
   }
 }