Merge pull request #15 from AlfredStenwin/development_local

Added threadlocal to extentreport to make the Extenttest thread safe.

Author: AlfredStenwin

src/main/java/constants/GlobalConstants.java

@@ -7,7 +7,6 @@ private GlobalConstants() {}
 	public static final String RUNSETUP = System.getProperty("user.dir")+"/src/test/resources/RunSetup.csv";
 	public static final String CONFIG = System.getProperty("user.dir")+"/src/test/resources/Config.properties";
 	public static final String SCREENSHOT_FOLDER = System.getProperty("user.dir")+"/Screenshots/";
-	public static final String EXTENTREPORT_HTML = System.getProperty("user.dir")+"/ExtentReports/ExtentReports.html";
 	public static final String EXTENTREPORT_CONFIG = System.getProperty("user.dir")+"/src/test/resources/ExtentReport.properties";
 
 }

src/main/java/listeners/TestListener.java

@@ -24,6 +24,7 @@
 import drivermanager.DriverManager;
 import logsetup.Log;
 import reports.ExtentReport;
+import reports.ReportManager;
 import utilities.ScreenshotUtility;
 
 public class TestListener implements ITestListener, ISuiteListener{
@@ -53,15 +54,17 @@ public void onStart(ITestContext context) {
 	public void onTestStart(ITestResult result) {
 		String testDesc=result.getMethod().getDescription();
 		extentTest = extentReport.createTest(testDesc);
-		extentTest.log(Status.INFO, testDesc+" started." );
+		ReportManager.setExtentTest(extentTest);
+		ReportManager.getExtentTest().log(Status.INFO, testDesc+" started." );
 		Log.info("\""+testDesc+"\" execution started. EntentTest created");
 
 	}
 
 	@Override
 	public void onTestSuccess(ITestResult result) {
 		String testDesc=result.getMethod().getDescription();
-		extentTest.log(Status.PASS, testDesc+" test passed." );
+		ReportManager.getExtentTest().log(Status.PASS, testDesc+" test passed." );
+		ReportManager.removeExtentTest();
 		Log.info("\""+testDesc+"\" passed.");		
 
 	}
@@ -77,22 +80,24 @@ public void onTestFailure(ITestResult result) {
 			FileHandler.copy(ScreenshotUtility.getscreenshot(),new File(screenshotsFolderPath));
 
 			//Add screenshot from Screenshot folder to extent report
-			extentTest.addScreenCaptureFromPath(screenshotsFolderPath);
+			ReportManager.getExtentTest().addScreenCaptureFromPath(screenshotsFolderPath);
 
 		} catch (IllegalArgumentException | SecurityException | WebDriverException | IOException  e) {
 			e.printStackTrace();
 		}
 
-		extentTest.log(Status.FAIL, testDesc +" failed.");
-		extentTest.fail(Arrays.toString(result.getThrowable().getStackTrace()));//beautify stacktrace		
+		ReportManager.getExtentTest().log(Status.FAIL, testDesc +" failed.");
+		ReportManager.getExtentTest().fail(Arrays.toString(result.getThrowable().getStackTrace()));//beautify stacktrace		
+		ReportManager.removeExtentTest();
 		Log.error("\""+result.getName()+"\" failed.", result.getThrowable());
 	}
 
 	@Override
 	public void onTestSkipped(ITestResult result) {
 		String testName=result.getName();
-		extentTest.log(Status.SKIP, testName +" skipped.");		
-		extentTest.skip(Arrays.toString(result.getThrowable().getStackTrace()));		
+		ReportManager.getExtentTest().log(Status.SKIP, testName +" skipped.");		
+		ReportManager.getExtentTest().skip(Arrays.toString(result.getThrowable().getStackTrace()));		
+		ReportManager.removeExtentTest();
 		Log.error("\""+result.getName()+"\" skipped.", result.getThrowable());		
 	}
 

src/test/resources/ExtentReport.properties

@@ -2,4 +2,4 @@
 THEME=Standard
 REPORT_NAME=Selenium Test Automation
 DOCUMENT_TITLE=Demo Test Automation Results
-TIMESTAMP_FORMAT=yyyy/MM/dd hh:mm:ss
+TIMESTAMP_FORMAT=yyyy-MM-dd hh:mm:ss