fixes #17

Author: anshooarora

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.aventstack</groupId>
 	<artifactId>extentreports-testng-adapter</artifactId>
-	<version>1.2.0</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<name>extentreports-testng-adapter</name>
 	<url>http://extentreports.com</url>
 	<description>TestNG adapter for Extent Framework</description>

src/main/java/com/aventstack/extentreports/testng/listener/ExtentITestListenerAdapter.java

@@ -1,7 +1,5 @@
 package com.aventstack.extentreports.testng.listener;
 
-import org.testng.IInvokedMethod;
-import org.testng.IInvokedMethodListener;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
@@ -10,9 +8,7 @@
 import com.aventstack.extentreports.service.ExtentService;
 import com.aventstack.extentreports.service.ExtentTestManager;
 
-public class ExtentITestListenerAdapter implements ITestListener, IInvokedMethodListener {
-
-    private Boolean createdMethodBeforeInvocation = false;
+public class ExtentITestListenerAdapter implements ITestListener {
 
     @Override
     public synchronized void onStart(ITestContext context) {
@@ -26,8 +22,7 @@ public synchronized void onFinish(ITestContext context) {
 
     @Override
     public synchronized void onTestStart(ITestResult result) {
-        if (!createdMethodBeforeInvocation)
-            ExtentTestManager.createMethod(result);
+        ExtentTestManager.createMethod(result);
     }
 
     @Override
@@ -42,27 +37,11 @@ public synchronized void onTestFailure(ITestResult result) {
 
     @Override
     public synchronized void onTestSkipped(ITestResult result) {
-        if (result.wasRetried()) {
-            ExtentService.getInstance().removeTest(result.getName());
-        } else
-            ExtentTestManager.log(result);
+        ExtentTestManager.log(result);
     }
 
     @Override
     public synchronized void onTestFailedButWithinSuccessPercentage(ITestResult result) {
     }
 
-    @Override
-    public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
-        if (method.getTestMethod().isBeforeMethodConfiguration()) {
-            createdMethodBeforeInvocation = true;
-            ExtentTestManager.createMethod(testResult);
-        }
-    }
-
-    @Override
-    public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
-
-    }
-
-}
+}

src/main/java/com/aventstack/extentreports/testng/listener/ExtentITestListenerClassAdapter.java

@@ -1,14 +1,14 @@
 package com.aventstack.extentreports.testng.listener;
 
-import org.testng.*;
+import org.testng.ITestContext;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
 
 import com.aventstack.extentreports.AnalysisStrategy;
 import com.aventstack.extentreports.service.ExtentService;
 import com.aventstack.extentreports.service.ExtentTestManager;
 
-public class ExtentITestListenerClassAdapter implements ITestListener, IInvokedMethodListener {
-
-    private Boolean createdMethodBeforeInvocation = false;
+public class ExtentITestListenerClassAdapter implements ITestListener {
 
     @Override
     public synchronized void onStart(ITestContext context) {
@@ -22,8 +22,7 @@ public synchronized void onFinish(ITestContext context) {
 
     @Override
     public synchronized void onTestStart(ITestResult result) {
-        if (!createdMethodBeforeInvocation)
-            ExtentTestManager.createMethod(result, true);
+        ExtentTestManager.createMethod(result, true);
     }
 
     @Override
@@ -38,26 +37,11 @@ public synchronized void onTestFailure(ITestResult result) {
 
     @Override
     public synchronized void onTestSkipped(ITestResult result) {
-        if (result.wasRetried()) {
-            ExtentService.getInstance().removeTest(result.getName());
-        } else
-            ExtentTestManager.log(result);
+        ExtentTestManager.log(result, true);
     }
 
     @Override
     public synchronized void onTestFailedButWithinSuccessPercentage(ITestResult result) {
     }
 
-    @Override
-    public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
-        if (method.getTestMethod().isBeforeMethodConfiguration()) {
-            createdMethodBeforeInvocation = true;
-            ExtentTestManager.createMethod(testResult, true);
-        }
-    }
-
-    @Override
-    public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
-
-    }
-}
+}