Merge pull request #12 from AlfredStenwin/development_local

Moved file reader utilities from filereaders folder to utilities package

Author: AlfredStenwin

WebTestRunner.xml

@@ -8,6 +8,7 @@
 		<listener class-name="listeners.MethodInterceptor" ></listener>
 	</listeners> 
 
+	<!-- Browser takes two values 'edge' and 'chrome'-->
 	<parameter name = "browser" value = "chrome"></parameter> 
 	<test name="Navigate to home page" thread-count="3">
 		<classes>

src/main/java/listeners/MethodInterceptor.java

@@ -12,7 +12,7 @@
 
 import constants.GlobalConstants;
 import enums.TestCaseDetails;
-import utilities.filereaders.CsvReaderUtility;
+import utilities.CsvReaderUtility;
 
 /* 
  * MethodInterceptor implements the IMethodInterceptor listener from TestNG. The intercept method returns

src/main/java/listeners/TestListener.java

@@ -1,10 +1,10 @@
 package listeners;
 
-import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.io.FileHandler;
 import org.testng.ISuite;
 import org.testng.ISuiteListener;
@@ -19,6 +19,7 @@
 import decorators.Driver;
 import logsetup.Log;
 import reports.ExtentReport;
+import utilities.ScreenshotUtility;
 
 public class TestListener implements ITestListener, ISuiteListener{
 	ExtentReports extentReport;
@@ -66,19 +67,18 @@ public void onTestFailure(ITestResult result) {
 
 		//Getting the driver from result parameter for taking the screenshot on failure of test
 		try {
-			result.getTestClass().getRealClass().getFields();
 			Driver driver = (Driver)result.getTestClass().getRealClass().getField("driver").get(result.getInstance());
 
 			//Take screenshot and copying to Screenshot folder in the project
-			//String screenshotsFolderPath =System.getProperty("user.dir")+"/Screenshots/"+testDesc+".png";
+			String screenshotsFolderPath =System.getProperty("user.dir")+"/Screenshots/"+testDesc+".png";
 
 			//Call takescreenshot() method from DriverLogger class and copying the screenshot from source path to Screenshot folder 	
-			//FileHandler.copy(driver.takescreenshot(), new File(screenshotsFolderPath));
+			//FileHandler.copy(ScreenshotUtility.takescreenshot(driver), new File(screenshotsFolderPath));
 
 			//Add screenshot from Screenshot folder to extent report
 			//extentTest.addScreenCaptureFromPath(screenshotsFolderPath);
 
-		} catch (IllegalArgumentException | SecurityException | NoSuchFieldException | IllegalAccessException e) {
+		} catch (IllegalArgumentException | SecurityException | NoSuchFieldException | IllegalAccessException  e) {
 			e.printStackTrace();
 		}
 

src/main/java/reports/ExtentReport.java

@@ -10,7 +10,7 @@
 import com.aventstack.extentreports.reporter.ExtentSparkReporter;
 import com.aventstack.extentreports.reporter.configuration.Theme;
 
-import utilities.filereaders.PropertyFileReader;
+import utilities.PropertyFileReader;
 
 public final class ExtentReport {
 

src/main/java/utilities/filereaders/CsvReaderUtility.java renamed to src/main/java/utilities/CsvReaderUtility.java

@@ -1,4 +1,4 @@
-package utilities.filereaders;
+package utilities;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/utilities/filereaders/JsonFileReader.java renamed to src/main/java/utilities/JsonFileReader.java

@@ -1,4 +1,4 @@
-package utilities.filereaders;
+package utilities;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/utilities/filereaders/PropertyFileReader.java renamed to src/main/java/utilities/PropertyFileReader.java

@@ -1,4 +1,4 @@
-package utilities.filereaders;
+package utilities;
 
 import java.io.FileReader;
 import java.util.Properties;

src/main/java/utilities/ScreenshotUtility.java

@@ -0,0 +1,24 @@
+/**
+ * 
+ */
+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 {
+	
+	//Method to get the screenshots
+	public static File takescreenshot(Driver driver) {
+		
+		return ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
+	}
+}

src/main/resources/chromedriver.exe

@@ -10,7 +10,7 @@
 import decorators.DriverLogger;
 import drivermanager.DriverManager;
 import logsetup.Log;
-import utilities.filereaders.PropertyFileReader;
+import utilities.PropertyFileReader;
 import webpages.HomePage;
 import webpages.MyAccountPage;
 import webpages.UserRegistrationPage;