Merge pull request #14 from AlfredStenwin/development_local

Fixed the issue with taking screenshots when the test fails.

Author: AlfredStenwin

src/main/java/listeners/TestListener.java

@@ -21,6 +21,7 @@
 
 import constants.GlobalConstants;
 import decorators.Driver;
+import drivermanager.DriverManager;
 import logsetup.Log;
 import reports.ExtentReport;
 import utilities.ScreenshotUtility;
@@ -68,22 +69,17 @@ public void onTestSuccess(ITestResult result) {
 	@Override
 	public void onTestFailure(ITestResult result) {
 		String testDesc=result.getMethod().getDescription();
-		
-		//Getting the driver from result parameter for taking the screenshot on failure of test
-		try {
-			Driver driver = (Driver)result.getTestClass().getRealClass().getField("driver").get(result.getInstance());
-			
+		try {						
 			//Take screenshot and copying to Screenshot folder in the project
 			String screenshotsFolderPath =GlobalConstants.SCREENSHOT_FOLDER + testDesc + ".png";
 
-			//Call takescreenshot() method from DriverLogger class and copying the screenshot from source path to Screenshot folder 	
-			//FileHandler.copy(((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE),
-			//		new File(screenshotsFolderPath));
-			
+			//Call takescreenshot() method from DriverLogger class and copying the screenshot from source path to Screenshot folder 				
+			FileHandler.copy(ScreenshotUtility.getscreenshot(),new File(screenshotsFolderPath));
+		
 			//Add screenshot from Screenshot folder to extent report
-			//extentTest.addScreenCaptureFromPath(screenshotsFolderPath);
+			extentTest.addScreenCaptureFromPath(screenshotsFolderPath);
 
-		} catch (IllegalArgumentException | SecurityException | NoSuchFieldException | IllegalAccessException | WebDriverException  e) {
+		} catch (IllegalArgumentException | SecurityException | WebDriverException | IOException  e) {
 			e.printStackTrace();
 		}
 

src/main/java/utilities/ScreenshotUtility.java

@@ -1,24 +1,17 @@
-/**
- * 
- */
 package utilities;
 
 import java.io.File;
 
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
-import decorators.Driver;
 import drivermanager.DriverManager;
 
 /**
  * @author Alfred Sunny
  * 
  */
-public class ScreenshotUtility {
+public final class ScreenshotUtility {
 
-	//Method to get the screenshots
-	public static File takescreenshot(Driver driver) {
-		
-		return ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
+	//Method to get the screenshots. Instance of the threadlocal is used to prevent the thread related issue
+	public static File getscreenshot() {	
+		return DriverManager.getDriver().takescreenshot();
 	}
 }