Major refactor with package names and maven configuration

anirudha13 · anirudha13 · commit 41942d32036b · 2021-06-28T16:59:41.000+05:30
diff --git a/pom.xml b/pom.xml
@@ -122,10 +122,21 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/resources/conf/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
+                    <properties>
+                        <property>
+                            <name>parallel</name>
+                            <value>methods</value>
+                        </property>
+                        <property>
+                            <name>dataproviderthreadcount</name>
+                            <value>20</value>
+                        </property>
+                    </properties>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/test/java/com/browserstack/examples/core/ManagedWebDriver.java b/src/test/java/com/browserstack/examples/core/ManagedWebDriver.java
@@ -1,9 +1,9 @@
-package browserstack.providers;
+package com.browserstack.examples.core;
 
 import org.openqa.selenium.WebDriver;
 
-import browserstack.driverconfig.Platform;
-import browserstack.driverconfig.WebDriverFactory;
+import com.browserstack.examples.core.config.Platform;
+import com.browserstack.examples.core.WebDriverFactory;
 
 /**
  * Created with IntelliJ IDEA.
diff --git a/src/test/java/com/browserstack/examples/core/WebDriverFactory.java b/src/test/java/com/browserstack/examples/core/WebDriverFactory.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -28,6 +28,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.browserstack.examples.core.config.BrowserType;
+import com.browserstack.examples.core.config.CommonCapabilities;
+import com.browserstack.examples.core.config.DriverType;
+import com.browserstack.examples.core.config.LocalFactory;
+import com.browserstack.examples.core.config.Platform;
+import com.browserstack.examples.core.config.RemoteDriverConfig;
+import com.browserstack.examples.core.config.WebDriverConfiguration;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
diff --git a/src/test/java/com/browserstack/examples/core/WebDriverManager.java b/src/test/java/com/browserstack/examples/core/WebDriverManager.java
@@ -1,4 +1,4 @@
-package browserstack.providers;
+package com.browserstack.examples.core;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/test/java/com/browserstack/examples/core/config/BrowserType.java b/src/test/java/com/browserstack/examples/core/config/BrowserType.java
@@ -1,5 +1,5 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 public enum BrowserType {
     chrome, firefox, edge, ie, safari, opera
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/Capabilities.java b/src/test/java/com/browserstack/examples/core/config/Capabilities.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
@@ -18,4 +18,4 @@ public void setCapabilities(String key, Object value) {
     public Map<String, Object> getCapabilityMap() {
         return capabilityMap;
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/CommonCapabilities.java b/src/test/java/com/browserstack/examples/core/config/CommonCapabilities.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 public class CommonCapabilities {
 
@@ -31,4 +31,4 @@ public Capabilities getCapabilities() {
     public void setCapabilities(Capabilities capabilities) {
         this.capabilities = capabilities;
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/DriverType.java b/src/test/java/com/browserstack/examples/core/config/DriverType.java
@@ -1,7 +1,7 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 public enum DriverType {
     cloudDriver,
     onPremGridDriver,
     onPremDriver
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/LocalFactory.java b/src/test/java/com/browserstack/examples/core/config/LocalFactory.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 import com.browserstack.local.Local;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -63,4 +63,4 @@ public void run() {
             }
         }
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/LocalTunnelConfig.java b/src/test/java/com/browserstack/examples/core/config/LocalTunnelConfig.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -29,4 +29,4 @@ public void setLocalOption(String key, String value) {
         this.localOptions.put(key, value);
     }
 
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/OnPremDriverConfig.java b/src/test/java/com/browserstack/examples/core/config/OnPremDriverConfig.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 import java.util.List;
 
@@ -9,4 +9,4 @@ public class OnPremDriverConfig {
     public List<Platform> getPlatforms() {
         return platforms;
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/Platform.java b/src/test/java/com/browserstack/examples/core/config/Platform.java
@@ -1,4 +1,4 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -96,4 +96,4 @@ public Capabilities getCapabilities() {
     public void setCapabilities(Capabilities capabilities) {
         this.capabilities = capabilities;
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/RemoteDriverConfig.java b/src/test/java/com/browserstack/examples/core/config/RemoteDriverConfig.java
@@ -1,9 +1,12 @@
-package browserstack.driverconfig;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+package com.browserstack.examples.core.config;
 
 import java.util.List;
 
+import com.browserstack.examples.core.config.CommonCapabilities;
+import com.browserstack.examples.core.config.LocalTunnelConfig;
+import com.browserstack.examples.core.config.Platform;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class RemoteDriverConfig {
 
     private String hubUrl;
@@ -66,4 +69,4 @@ public List<Platform> getPlatforms() {
     public void setPlatforms(List<Platform> platforms) {
         this.platforms = platforms;
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/SpecificCapabilities.java b/src/test/java/com/browserstack/examples/core/config/SpecificCapabilities.java
@@ -1,11 +1,11 @@
-package browserstack.driverconfig;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
+package com.browserstack.examples.core.config;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
 public class SpecificCapabilities {
 
     private final Map<String, List<Capabilities>> specificCapabilitiesMap = new LinkedHashMap<>();
@@ -18,4 +18,4 @@ public void setSpecificCapabilities(String key, List<Capabilities> value) {
     public List<Capabilities> getSpecificCapabilities(String key) {
         return this.specificCapabilitiesMap.get(key);
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/core/config/WebDriverConfiguration.java b/src/test/java/com/browserstack/examples/core/config/WebDriverConfiguration.java
@@ -1,11 +1,12 @@
-package browserstack.driverconfig;
+package com.browserstack.examples.core.config;
+
+import java.util.Collections;
+import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class WebDriverConfiguration {
 
@@ -90,4 +91,4 @@ public SpecificCapabilities getSpecificCapabilities() {
     public void setSpecificCapabilities(SpecificCapabilities specificCapabilities) {
         this.specificCapabilities = specificCapabilities;
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/stepdefs/AbstractBaseSteps.java b/src/test/java/com/browserstack/examples/stepdefs/AbstractBaseSteps.java
@@ -1,9 +1,9 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 import org.openqa.selenium.WebDriver;
 
-import browserstack.driverconfig.WebDriverFactory;
-import browserstack.providers.WebDriverManager;
+import com.browserstack.examples.core.WebDriverFactory;
+import com.browserstack.examples.core.WebDriverManager;
 
 /**
  * Created with IntelliJ IDEA.
diff --git a/src/test/java/com/browserstack/examples/stepdefs/CheckoutPageSteps.java b/src/test/java/com/browserstack/examples/stepdefs/CheckoutPageSteps.java
@@ -1,4 +1,4 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 
 import org.openqa.selenium.By;
diff --git a/src/test/java/com/browserstack/examples/stepdefs/CommonSteps.java b/src/test/java/com/browserstack/examples/stepdefs/CommonSteps.java
@@ -1,4 +1,4 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
diff --git a/src/test/java/com/browserstack/examples/stepdefs/HomePageSteps.java b/src/test/java/com/browserstack/examples/stepdefs/HomePageSteps.java
@@ -1,4 +1,4 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 
 
@@ -10,7 +10,7 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 import org.testng.Assert;
-import browserstack.utils.Utility;
+import com.browserstack.examples.utils.Utility;
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Then;
 
diff --git a/src/test/java/com/browserstack/examples/stepdefs/LoginPageSteps.java b/src/test/java/com/browserstack/examples/stepdefs/LoginPageSteps.java
@@ -1,4 +1,4 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 
 import org.openqa.selenium.By;
@@ -8,7 +8,7 @@
 import org.openqa.selenium.support.ui.WebDriverWait;
 import org.testng.Assert;
 
-import browserstack.utils.Utility;
+import com.browserstack.examples.utils.Utility;
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Then;
 
diff --git a/src/test/java/com/browserstack/examples/stepdefs/OfferPageSteps.java b/src/test/java/com/browserstack/examples/stepdefs/OfferPageSteps.java
@@ -1,4 +1,4 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
diff --git a/src/test/java/com/browserstack/examples/stepdefs/OrderPageSteps.java b/src/test/java/com/browserstack/examples/stepdefs/OrderPageSteps.java
@@ -1,4 +1,4 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 import java.util.List;
 
diff --git a/src/test/java/com/browserstack/examples/stepdefs/WebDriverHooks.java b/src/test/java/com/browserstack/examples/stepdefs/WebDriverHooks.java
@@ -1,11 +1,11 @@
-package browserstack.stepdefs;
+package com.browserstack.examples.stepdefs;
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-import browserstack.driverconfig.WebDriverFactory;
-import browserstack.providers.WebDriverManager;
+import com.browserstack.examples.core.WebDriverFactory;
+import com.browserstack.examples.core.WebDriverManager;
 import io.cucumber.java.After;
 import io.cucumber.java.Scenario;
 
diff --git a/src/test/java/com/browserstack/examples/tests/RunWebDriverCucumberTests.java b/src/test/java/com/browserstack/examples/tests/RunWebDriverCucumberTests.java
@@ -1,4 +1,4 @@
-package browserstack;
+package com.browserstack.examples.tests;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,10 +9,10 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import browserstack.driverconfig.Platform;
-import browserstack.driverconfig.WebDriverFactory;
-import browserstack.providers.ManagedWebDriver;
-import browserstack.providers.WebDriverManager;
+import com.browserstack.examples.core.config.Platform;
+import com.browserstack.examples.core.WebDriverFactory;
+import com.browserstack.examples.core.ManagedWebDriver;
+import com.browserstack.examples.core.WebDriverManager;
 import io.cucumber.testng.CucumberOptions;
 import io.cucumber.testng.FeatureWrapper;
 import io.cucumber.testng.PickleWrapper;
@@ -24,6 +24,8 @@
  * @author Anirudha Khanna
  */
 @CucumberOptions(
+  features = "classpath:features",
+  glue = "com.browserstack.examples.stepdefs"
 )
 public class RunWebDriverCucumberTests {
 
diff --git a/src/test/java/com/browserstack/examples/utils/OsUtility.java b/src/test/java/com/browserstack/examples/utils/OsUtility.java
@@ -1,4 +1,4 @@
-package browserstack.utils;
+package com.browserstack.examples.utils;
 
 public class OsUtility {
     private static String OS = null;
@@ -23,4 +23,4 @@ public static boolean isUnix() {
     public static boolean isMac() {
         return (getOsName().contains("mac"));
     }
-}
+}
diff --git a/src/test/java/com/browserstack/examples/utils/Utility.java b/src/test/java/com/browserstack/examples/utils/Utility.java
@@ -1,4 +1,4 @@
-package browserstack.utils;
+package com.browserstack.examples.utils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/resources/conf/testng.xml b/src/test/resources/conf/testng.xml
@@ -3,7 +3,7 @@
 <suite name="BDD Test Suite" verbose="1" thread-count="20" parallel="methods" data-provider-thread-count="20">
     <test name="Cucumber Tests">
         <classes>
-            <class name="browserstack.RunWebDriverCucumberTests" />
+            <class name="com.browserstack.examples.tests.RunWebDriverCucumberTests" />
         </classes>
     </test>
 </suite>
diff --git a/src/test/resources/features/e2e.feature b/src/test/resources/features/e2e.feature
diff --git a/src/test/resources/features/login.feature b/src/test/resources/features/login.feature
diff --git a/src/test/resources/features/offers.feature b/src/test/resources/features/offers.feature
diff --git a/src/test/resources/features/product.feature b/src/test/resources/features/product.feature
diff --git a/src/test/resources/features/user.feature b/src/test/resources/features/user.feature

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package browserstack.providers;`
	`1`	`+package com.browserstack.examples.core;`
`2`	`2`
`3`	`3`	`import java.util.Map;`
`4`	`4`	`import java.util.concurrent.ConcurrentHashMap;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package browserstack.driverconfig;`
	`1`	`+package com.browserstack.examples.core.config;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonAnySetter;`
`4`	`4`
`@@ -18,4 +18,4 @@ public void setCapabilities(String key, Object value) {`
`18`	`18`	`public Map<String, Object> getCapabilityMap() {`
`19`	`19`	`return capabilityMap;`
`20`	`20`	`}`
`21`		`-}`
	`21`	`+}`