added comments and improved code quality

Author: Abhi Singh

src/test/java/com/browserstack/RunWebDriverCucumberTests.java

@@ -60,7 +60,8 @@ public void feature(PickleWrapper pickleWrapper, FeatureWrapper featureWrapper,
     @DataProvider(name = "scenarios", parallel = true)
     public Iterator<Object[]> scenarios() {
         Object[][] scenarios = testNGCucumberRunner.provideScenarios();
-        return new LazyInitWebDriverIterator(true, scenarios);
+        //Get Iterator of Object arrays consisting PickleWrapper, FeatureWrapper and ManagedWebDriver
+        return new LazyInitWebDriverIterator(scenarios);
     }
 
     @AfterClass(alwaysRun = true)

src/test/java/com/browserstack/webdriver/LazyInitWebDriverIterator.java

@@ -8,72 +8,65 @@
 import java.util.stream.Collectors;
 
 import org.json.simple.JSONObject;
-import org.openqa.selenium.WebDriver;
 
 public class LazyInitWebDriverIterator implements Iterator<Object[]> {
     private final String testMethodName;
     private final List<JSONObject> platforms;
     private final List<Object[]> testParams;
-    private final boolean createManagedWebDriver;
-    private int paramIdx = 0;
+    private int paramIndex = 0;
 
-    public LazyInitWebDriverIterator(Boolean createManagedWebDriver, Object[][] testParams) {
+    public LazyInitWebDriverIterator(Object[][] testParams) {
         this.testMethodName = "";
         this.platforms = WebDriverFactory.getInstance().getPlatforms();
-        this.createManagedWebDriver = createManagedWebDriver;
         List<Object[]> testParamsList = new ArrayList();
         if (testParams != null) {
             testParamsList = (List)Arrays.stream(testParams).collect(Collectors.toList());
         }
 
+        //Create list of combinations of Scenarios and Platforms
         this.testParams = this.populateTestParams((List)testParamsList);
     }
 
     private List<Object[]> populateTestParams(List<Object[]> testParams) {
-        int idx = 0;
+        int index = 0;
         ArrayList tempTestParams = new ArrayList();
 
         do {
-            Object[] testParam = (Object[])testParams.get(idx);
+            Object[] testParam = (Object[])testParams.get(index);
             if (testParam == null) {
                 testParam = new Object[0];
             }
 
-            Iterator var5 = this.platforms.iterator();
+            Iterator platformsIterator = this.platforms.iterator();
 
-            while(var5.hasNext()) {
-                JSONObject platform = (JSONObject)var5.next();
+            while(platformsIterator.hasNext()) {
+                JSONObject platform = (JSONObject)platformsIterator.next();
                 Object[] paramsWithPlatform = Arrays.copyOf(testParam, testParam.length + 1);
                 paramsWithPlatform[paramsWithPlatform.length - 1] = platform;
                 tempTestParams.add(paramsWithPlatform);
             }
 
-            ++idx;
-        } while(idx < testParams.size());
+            ++index;
+        } while(index < testParams.size());
 
         return tempTestParams;
     }
 
     public boolean hasNext() {
-        return this.paramIdx < this.testParams.size();
+        return this.paramIndex < this.testParams.size();
     }
 
     public Object[] next() {
-        if (this.paramIdx >= this.testParams.size()) {
+        if (this.paramIndex >= this.testParams.size()) {
             throw new NoSuchElementException("No More Platforms configured to create WebDriver for.");
         } else {
-            Object[] methodTestParams = (Object[])this.testParams.get(this.paramIdx++);
+            Object[] methodTestParams = (Object[])this.testParams.get(this.paramIndex++);
             if (methodTestParams[methodTestParams.length - 1] instanceof JSONObject) {
                 JSONObject platform = (JSONObject)methodTestParams[methodTestParams.length - 1];
-                if (this.createManagedWebDriver) {
-                    ManagedWebDriver managedWebDriver = new ManagedWebDriver(this.testMethodName, platform);
-                    methodTestParams[methodTestParams.length - 1] = managedWebDriver;
-                } else {
-                    WebDriver webDriver = WebDriverFactory.getInstance().createWebDriverForPlatform(platform, this.testMethodName);
-                    methodTestParams[methodTestParams.length - 1] = webDriver;
-                }
+                ManagedWebDriver managedWebDriver = new ManagedWebDriver(this.testMethodName, platform);
+                methodTestParams[methodTestParams.length - 1] = managedWebDriver;
             }
-
+            //return an Object array consisting PickleWrapper, FeatureWrapper and ManagedWebDriver
             return methodTestParams;
         }
     }

src/test/java/com/browserstack/webdriver/WebDriverFactory.java

@@ -27,7 +27,6 @@ private WebDriverFactory() {
 
     public static WebDriverFactory getInstance() {
         if (instance == null) {
-            Class var0 = WebDriverFactory.class;
             synchronized(WebDriverFactory.class) {
                 if (instance == null) {
                     instance = new WebDriverFactory();