latest modifications done.

Author: swtestacademy

ExtentReports/ExtentReportResults.html

@@ -3,6 +3,7 @@
 import org.testng.annotations.Test;
 import pages.HomePage;
 import pages.LoginPage;
+import utils.ExtentReports.ExtentTestManager;
 
 public class LoginTests extends BaseTest {
 
@@ -12,8 +13,10 @@ public class LoginTests extends BaseTest {
     //    Homepage homepage = new HomePage(driver,wait);
     // 3) super () method in page class transfer the driver and wait variables values to the BasePage class.
 
-    @Test (priority = 0)
+    @Test (priority = 0, description="Invalid Login Scenario with wrong username and password.")
     public void invalidLoginTest_InvalidUserNameInvalidPassword () throws InterruptedException {
+        //ExtentReports Description
+        ExtentTestManager.getTest().setDescription("Invalid Login Scenario with wrong username and password.");
 
         //*************PAGE INSTANTIATIONS*************
         HomePage homePage = new HomePage(driver,wait);
@@ -34,8 +37,11 @@ public void invalidLoginTest_InvalidUserNameInvalidPassword () throws Interrupte
         loginPage.verifyLoginPassword(("E-posta adresiniz veya şifreniz hatalı"));
     }
 
-    @Test (priority = 1)
+    @Test (priority = 1, description="Invalid Login Scenario with empty username and password.")
     public void invalidLoginTest_EmptyUserEmptyPassword () throws InterruptedException {
+        //ExtentReports Description
+        ExtentTestManager.getTest().setDescription("Invalid Login Scenario with empty username and password.");
+
         //*************PAGE INSTANTIATIONS*************
         HomePage homePage = new HomePage(driver,wait);
         LoginPage loginPage = new LoginPage(driver,wait);

src/test/java/tests/LoginTests.java

@@ -10,6 +10,7 @@ public class ExtentManager {
 
     public synchronized static ExtentReports getReporter(){
         if(extent == null){
+            //Set HTML reporting file location
             String workingDir = System.getProperty("user.dir");
             extent = new ExtentReports(workingDir+"\\ExtentReports\\ExtentReportResults.html", true);
         }

src/test/java/utils/ExtentReports/ExtentManager.java

@@ -6,11 +6,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-        /* OB: A map extentTestMap holds the information of the thread id and ExtentTest.
-         *     ExtentReports instance created by calling getReporter() method from ExtentManager.
-         *     At startTest() method, an instance of ExtentTest created and put into extentTestMap.
-         *     At endTest() method, test ends and thread id got from extentTestMap.
-         *     At getTest() method, information held in extentTestMap called.
+        /* OB: extentTestMap holds the information of thread ids and ExtentTest instances.
+                ExtentReports instance created by calling getReporter() method from ExtentManager.
+                At startTest() method, an instance of ExtentTest created and put into extentTestMap with current thread id.
+                At endTest() method, test ends and ExtentTest instance got from extentTestMap via current thread id.
+                At getTest() method, return ExtentTest instance in extentTestMap by using current thread id.
          */
 
 public class ExtentTestManager {

src/test/java/utils/ExtentReports/ExtentTestManager.java

@@ -19,7 +19,7 @@ public boolean retry(ITestResult iTestResult) {
         if (!iTestResult.isSuccess()) {                      //Check if test not succeed
             if (count < maxTry) {                            //Check if maxtry count is reached
                 count++;                                     //Increase the maxTry count by 1
-                iTestResult.setStatus(ITestResult.FAILURE);  //Mark test as failed
+                iTestResult.setStatus(ITestResult.FAILURE);  //Mark test as failed and take base64Screenshot
                 extendReportsFailOperations(iTestResult);    //ExtentReports fail operations
                 return true;                                 //Tells TestNG to re-run the test
             }

src/test/java/utils/Listeners/Retry.java

@@ -27,42 +27,52 @@ public void onStart(ITestContext iTestContext) {
     @Override
     public void onFinish(ITestContext iTestContext) {
         System.out.println("I am in onFinish method " + iTestContext.getName());
+        //Do tier down operations for extentreports reporting!
         ExtentTestManager.endTest();
         ExtentManager.getReporter().flush();
     }
 
     @Override
     public void onTestStart(ITestResult iTestResult) {
         System.out.println("I am in onTestStart method " +  getTestMethodName(iTestResult) + " start");
+        //Start operation for extentreports.
         ExtentTestManager.startTest(iTestResult.getMethod().getMethodName(),"");
     }
 
     @Override
     public void onTestSuccess(ITestResult iTestResult) {
         System.out.println("I am in onTestSuccess method " +  getTestMethodName(iTestResult) + " succeed");
+        //Extentreports log operation for passed tests.
         ExtentTestManager.getTest().log(LogStatus.PASS, "Test passed");
-
     }
 
     @Override
     public void onTestFailure(ITestResult iTestResult) {
         System.out.println("I am in onTestFailure method " +  getTestMethodName(iTestResult) + " failed");
+
+        //Get driver from BaseTest and assign to local webdriver variable.
         Object testClass = iTestResult.getInstance();
         WebDriver webDriver = ((BaseTest) testClass).getDriver();
-        String base64Screenshot = "data:image/png;base64,"+((TakesScreenshot)webDriver).getScreenshotAs(OutputType.BASE64);
-        ExtentTestManager.getTest().log(LogStatus.FAIL,"Test Failed", ExtentTestManager.getTest().addBase64ScreenShot(base64Screenshot));
+
+        //Take base64Screenshot screenshot.
+        String base64Screenshot = "data:image/png;base64,"+((TakesScreenshot)webDriver).
+                getScreenshotAs(OutputType.BASE64);
+
+        //Extentreports log and screenshot operations for failed tests.
+        ExtentTestManager.getTest().log(LogStatus.FAIL,"Test Failed",
+                ExtentTestManager.getTest().addBase64ScreenShot(base64Screenshot));
     }
 
     @Override
     public void onTestSkipped(ITestResult iTestResult) {
         System.out.println("I am in onTestSkipped method "+  getTestMethodName(iTestResult) + " skipped");
+        //Extentreports log operation for skipped tests.
+        ExtentTestManager.getTest().log(LogStatus.SKIP, "Test Skipped");
     }
 
     @Override
     public void onTestFailedButWithinSuccessPercentage(ITestResult iTestResult) {
         System.out.println("Test failed but it is in defined success ratio " + getTestMethodName(iTestResult));
-        ExtentTestManager.getTest().log(LogStatus.SKIP, "Test Skipped");
     }
 
-
 }