Merge pull request #17 from AlfredStenwin/ReportsManagerFix

Fix for - build failing due to missing ReportManager.cs file

Author: AlfredStenwin

WebTestRunner.xml

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

pom.xml

@@ -19,7 +19,7 @@
 	    <dependency>
 	        <groupId>io.github.bonigarcia</groupId>
 	        <artifactId>webdrivermanager</artifactId>
-	        <version>5.0.3</version>
+	        <version>5.3.0</version>
 	    </dependency>
 
 		<!-- TestNG dependency-->

src/main/java/constants/GlobalConstants.java

@@ -7,6 +7,7 @@ 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

@@ -56,7 +56,7 @@ public void onTestStart(ITestResult result) {
 		extentTest = extentReport.createTest(testDesc);
 		ReportManager.setExtentTest(extentTest);
 		ReportManager.getExtentTest().log(Status.INFO, testDesc+" started." );
-		Log.info("\""+testDesc+"\" execution started. EntentTest created");
+		Log.info("\""+testDesc+"\" test execution started.");
 
 	}
 
@@ -74,7 +74,7 @@ public void onTestFailure(ITestResult result) {
 		String testDesc=result.getMethod().getDescription();
 		try {						
 			//Take screenshot and copying to Screenshot folder in the project
-			String screenshotsFolderPath =GlobalConstants.SCREENSHOT_FOLDER + testDesc + ".png";
+			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(ScreenshotUtility.getscreenshot(),new File(screenshotsFolderPath));

src/main/java/reports/ExtentReport.java

@@ -33,7 +33,7 @@ private ExtentReport() {}
 	public static ExtentReports initReport() {	
 		Properties extentReportConfig = PropertyFileReader.readFile(GlobalConstants.EXTENTREPORT_CONFIG);
 		String theme = extentReportConfig.get(ConfigParameters.THEME.name()).toString();
-		String reportName = extentReportConfig.get(ConfigParameters.REPORT_NAME.name()).toString();
+		String fileName = extentReportConfig.get(ConfigParameters.REPORT_NAME.name()).toString();
 		String documentTitle = extentReportConfig.get(ConfigParameters.DOCUMENT_TITLE.name()).toString();
 		String timeStampFormat = extentReportConfig.get(ConfigParameters.TIMESTAMP_FORMAT.name()).toString();
 
@@ -58,7 +58,7 @@ public static ExtentReports initReport() {
 	    	  	break;
 		    }
 
-			extentSparkReporter.config().setReportName(reportName);
+			extentSparkReporter.config().setReportName(fileName);
 			extentSparkReporter.config().setDocumentTitle(documentTitle);
 			extentSparkReporter.config().setTimeStampFormat(timeStampFormat);	
 
@@ -76,6 +76,9 @@ public static ExtentReports initReport() {
 	public static void flushReport() {
 		if(Objects.nonNull(extentReport)) {
 			extentReport.flush();
+			
+			//to open the report in the default browser after flushing
+			//Desktop.getDesktop().browse(new File(fileName).toURI());
 		}
 	}
 }

src/main/java/reports/ReportManager.java

@@ -0,0 +1,23 @@
+package reports;
+
+import com.aventstack.extentreports.ExtentTest;
+
+public class ReportManager {
+	
+	private ReportManager () {}
+
+	private static ThreadLocal<ExtentTest> xtnttest = new ThreadLocal<>();
+	
+	public static ExtentTest getExtentTest() {
+		return xtnttest.get();
+	}
+	
+	public static void setExtentTest(ExtentTest extentTest) {
+		xtnttest.set(extentTest);
+	}
+
+	public static void removeExtentTest() {
+		xtnttest.remove();
+	}
+
+}

src/test/java/Tests/NewUserRegistration.java

@@ -13,24 +13,24 @@ public class NewUserRegistration extends BaseTest{
 
 	@Test
 	public void navigateToHomepage() {
-		String pageTitle = "Home Page - Magento eCommerce - website to practice selenium | demo website for automation testing | selenium practice sites | selenium demo sites | best website to practice selenium automation | automation practice sites Magento Commerce - website to practice selenium | demo website for automation testing | selenium practice sites";
-		String title = homePage.gotoUrl(url).getPageTitle();
-		Assert.assertEquals(title , pageTitle);
+		String expectedTitle = "Home Page";
+		String actualtitle = homePage.gotoUrl(url).getPageTitle();
+		Assert.assertEquals(actualtitle , expectedTitle);
 		Log.info("Completed test for Navigate to home page.");
 	}	
 
 	@Test
 	public void navigateToUserSignupPage() {
-		String pageTitle = "Create New Customer Account Magento Commerce - website to practice selenium | demo website for automation testing | selenium practice sites";						
+		String expectedTitle = "Create New Customer Account";						
 		homePage.gotoUrl(url).clickOnSignUpTab().getPageTitle();			
-		String title = userRegistrationPage.getPageTitle();
-		Assert.assertEquals(title, pageTitle);	
+		String actualtitle = userRegistrationPage.getPageTitle();
+		Assert.assertEquals(actualtitle, expectedTitle);	
 		Log.info("Completed test for Navigate to user signup page.");
 	}
 
 	@Test( dataProvider = "dataProvider1" )
 	public void registerNewUser(Map<String, Object> map) {
-		String title = "My Account Magento Commerce - website to practice selenium | demo website for automation testing | selenium practice sites";		
+		String expectedTitle = "My Account";		
 		homePage.gotoUrl(url)
 		.clickOnSignUpTab()
 		.enterFirstname(map.get("firstname").toString())
@@ -40,8 +40,8 @@ public void registerNewUser(Map<String, Object> map) {
 		.confirmPassword(map.get("password").toString())
 		.ClickCreateAnAccountButton();	
 
-		String pageTitle = myaccountsPage.GetPageTitle();
-		Assert.assertEquals(pageTitle, title);	// Expected to fail now as the page wont be displayed 
+		String actualTitle = myaccountsPage.GetPageTitle();
+		Assert.assertEquals(actualTitle, expectedTitle);	// Expected to fail now as the page wont be displayed 
 		Log.info("Completed test for Register new user.");
 	}
 

src/test/resources/Log4j2.properties

@@ -1,8 +1,8 @@
 status = warn
 name= RollingFileLogConfigDemo
 
-# Log files location
-property.basePath = /IdealAutomationFramework/Advanced_Selenium_Framework/logs
+# Log files location - Add correct individual path to projects 'logs' folder below
+property.basePath = <ADD-PATH-TO-PROJECT>/Advanced-Selenium-Automation-Framework/logs
 
 # RollingFileAppender name, pattern, path and rollover policy
 appender.rolling.type = RollingFile