Added Threadlocal to fix the thread safety issues during parallel

execution

Author: AlfredStenwin

WebTestRunner.xml

@@ -1,42 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Demo test suite" >
+<suite name="Demo test suite" parallel="methods" thread-count="3">
 
 
 	<listeners>
 		<listener class-name="listeners.TestListener" ></listener>
 		<listener class-name="listeners.MethodInterceptor" ></listener>
-
 	</listeners> 
 
 	<parameter name = "browser" value = "chrome"></parameter> 
-	<test name="Navigate to home page" parallel="tests" thread-count="1">
-
+	<test name="Navigate to home page" thread-count="3">
 		<classes>
 			<class name="Tests.NewUserRegistration"/> 
 		</classes>
 	</test>
-<!--
-	<parameter name = "browser" value = "chrome"></parameter> 
-	<test name="Navigate to user signup page" parallel="tests" thread-count="1">
-			<classes>
-				<class name="Tests.NewUserRegistration"> 
-					<methods>
-					  <include name="navigateToUserSignupPage"></include>
-					</methods>
-				</class>
-			</classes>
-	</test>
 
-	<parameter name = "browser" value = "chrome"></parameter> 
-	<test name="Register new user" parallel="tests" thread-count="1">	
-			<classes>
-				<class name="Tests.NewUserRegistration"> 
-					<methods>
-					  <include name="registerNewUser"></include>
-					</methods>
-				</class>
-			</classes>
-	</test>
-	-->
 </suite> 

resources/chromedriver.exe

@@ -1,9 +1,9 @@
-package driverfactory;
+package browserfactory;
 
-public class DriverFactory  {
+public class BrowserFactory  {
 
-	public static DriverManager getDriverManager(String browser) {
-        DriverManager driverManager; 
+	public static BrowserManager getDriverManager(String browser) {
+        BrowserManager driverManager; 
 
         switch (browser) {
 		case "chrome":

src/main/java/driverfactory/DriverFactory.java renamed to src/main/java/browserfactory/BrowserFactory.java

@@ -1,8 +1,8 @@
-package driverfactory;
+package browserfactory;
 
 import org.openqa.selenium.WebDriver;
 
-public interface DriverManager {
+public interface BrowserManager {
 
     WebDriver initDriver();       
 }

src/main/java/driverfactory/DriverManager.java renamed to src/main/java/browserfactory/BrowserManager.java

@@ -1,12 +1,12 @@
-package driverfactory;
+package browserfactory;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 
 import io.github.bonigarcia.wdm.WebDriverManager;
 
-public class ChromeDriverManager implements DriverManager{
+public class ChromeDriverManager implements BrowserManager{
 	WebDriver driver;
 
 	public WebDriver initDriver() {

src/main/java/driverfactory/ChromeDriverManager.java renamed to src/main/java/browserfactory/ChromeDriverManager.java

@@ -1,11 +1,11 @@
-package driverfactory;
+package browserfactory;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.edge.EdgeDriver;
 
 import io.github.bonigarcia.wdm.WebDriverManager;
 
-public class EdgeDriverManager implements DriverManager{
+public class EdgeDriverManager implements BrowserManager{
 
 	WebDriver driver;
 

src/main/java/driverfactory/EdgeDriverManager.java renamed to src/main/java/browserfactory/EdgeDriverManager.java

@@ -0,0 +1,10 @@
+package constants;
+
+public final class GlobalConstants {
+	
+	private GlobalConstants() {}
+	
+	public static final String RUN_SETUP_CSV = System.getProperty("user.dir")+"/src/test/resources/RunSetup.csv";
+	public static final String CONFIGFILE = System.getProperty("user.dir")+"/src/test/resources/Config.properties";
+
+}

src/main/java/constants/GlobalConstants.java

@@ -13,31 +13,27 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import driverfactory.DriverFactory;
+import browserfactory.BrowserFactory;
 
 public class DriverBase implements Driver {
     private WebDriver driver;
     private WebDriverWait wait;
-    
-	protected static ThreadLocal<WebDriver> threadLocaldriver = new ThreadLocal<>();
- 
-    public void start(String browser) {
-    	driver = DriverFactory.getDriverManager(browser).initDriver();
+     
+    public void start(String browser) { 
+    	driver = BrowserFactory.getDriverManager(browser).initDriver();
     	wait = new WebDriverWait(driver, 60);
-    	threadLocaldriver.set(driver);
     }
 
     public void quit() {
-        threadLocaldriver.get().quit();
-        threadLocaldriver.remove();
+        driver.quit();
     }
 
     public void goToUrl(String url) {
-    	threadLocaldriver.get().get(url);
+    	driver.get(url);
     }
 
 	public String getPageTitle() {  	
-    	return threadLocaldriver.get().getTitle();
+    	return driver.getTitle();
 	}
 
     public Element findElement(By locator) {
@@ -63,12 +59,12 @@ public List<Element> findElements(By locator) {
     }
 
     public void waitForAjax() {
-        JavascriptExecutor javascriptExecutor = (JavascriptExecutor) threadLocaldriver.get();
+        JavascriptExecutor javascriptExecutor = (JavascriptExecutor) driver;
         wait.until(d -> (Boolean) javascriptExecutor.executeScript("return window.jQuery != undefined && jQuery.active == 0"));
     }
 
     public void waitUntilPageLoadsCompletely() {
-        JavascriptExecutor javascriptExecutor = (JavascriptExecutor) threadLocaldriver.get();
+        JavascriptExecutor javascriptExecutor = (JavascriptExecutor) driver;
         wait.until(d -> javascriptExecutor.executeScript("return document.readyState").toString().equals("complete"));
     }
 

src/main/java/decorators/DriverBase.java

@@ -0,0 +1,30 @@
+package drivermanager;
+
+import decorators.Driver;
+
+/*
+ * Driver manager is used to create thread safe driver in parallel
+ */
+
+public final class DriverManager {
+				
+	public static final ThreadLocal<Driver> threadlocal = new ThreadLocal<>();
+	
+	//Method to get the thread local driver. Should be used to get the driver 
+	//throughout the project for parallel threads to work as expected
+	public static Driver getDriver() {
+		return threadlocal.get();	
+	}
+	
+	// Method to set the Thread local driver. Type driver of type Driver is accepted  
+	public static void setDriver(Driver driver) {
+		threadlocal.set(driver);
+	}
+	
+	// Methos to remove the driver after excecution
+	public static void removeDriver() {
+		threadlocal.get().quit();
+		threadlocal.remove();
+	}
+	
+}