diff --git a/pom.xml b/pom.xml index cf1bd4a..40f5129 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.aventstack extentreports-testng-adapter - 1.2.3 + 1.2.4 extentreports-testng-adapter http://extentreports.com TestNG adapter for Extent Framework diff --git a/src/main/java/com/aventstack/extentreports/service/ExtentTestManager.java b/src/main/java/com/aventstack/extentreports/service/ExtentTestManager.java index eed181e..cea25e7 100644 --- a/src/main/java/com/aventstack/extentreports/service/ExtentTestManager.java +++ b/src/main/java/com/aventstack/extentreports/service/ExtentTestManager.java @@ -91,6 +91,7 @@ private static synchronized ExtentTest createTest(ITestResult result, ExtentTest } public static synchronized void log(ITestResult result, Boolean createTestAsChild) { + String testDescription = result.getMethod().getDescription() == null ? "" : result.getMethod().getDescription().trim(); String msg = "Test "; Status status = Status.PASS; switch (result.getStatus()) { @@ -106,9 +107,14 @@ public static synchronized void log(ITestResult result, Boolean createTestAsChil msg += "passed"; break; } + msg = createTestAsChild && !testDescription.isEmpty() ? testDescription : msg; if (ExtentTestManager.getTest(result) == null) ExtentTestManager.createMethod(result, createTestAsChild); - if (result.getThrowable() != null) { + + if ((result.getThrowable() != null) && createTestAsChild && !testDescription.isEmpty()) { + if (!testDescription.isEmpty()) { + ExtentTestManager.getTest(result).info(testDescription); + } ExtentTestManager.getTest(result).log(status, result.getThrowable()); return; } diff --git a/src/test/java/com/aventstack/extentreports/adapter/ireporter/DescriptionTests.java b/src/test/java/com/aventstack/extentreports/adapter/ireporter/DescriptionTests.java new file mode 100644 index 0000000..e6107ac --- /dev/null +++ b/src/test/java/com/aventstack/extentreports/adapter/ireporter/DescriptionTests.java @@ -0,0 +1,32 @@ +package com.aventstack.extentreports.adapter.ireporter; + +import org.testng.Assert; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + +import com.aventstack.extentreports.testng.listener.ExtentIReporterSuiteClassListenerAdapter; + +@Listeners({ExtentIReporterSuiteClassListenerAdapter.class}) +public class DescriptionTests { + + @Test + public void passClass2() { + Assert.assertTrue(true); + } + + @Test(description = "This is a test description") + public void passClass2Description() { + Assert.assertTrue(true); + } + + @Test + public void failClass2() { + Assert.assertTrue(false); + } + + @Test(description = "This is a test description") + public void failClass2Description() { + Assert.assertTrue(false); + } + +} \ No newline at end of file diff --git a/src/test/java/com/aventstack/extentreports/adapter/testlistener/DescriptionTests.java b/src/test/java/com/aventstack/extentreports/adapter/testlistener/DescriptionTests.java new file mode 100644 index 0000000..685db2a --- /dev/null +++ b/src/test/java/com/aventstack/extentreports/adapter/testlistener/DescriptionTests.java @@ -0,0 +1,31 @@ +package com.aventstack.extentreports.adapter.testlistener; + +import com.aventstack.extentreports.testng.listener.ExtentITestListenerAdapter; +import org.testng.Assert; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + +@Listeners({ExtentITestListenerAdapter.class}) +public class DescriptionTests extends BaseDataProvider { + + @Test + public void passClass2() { + Assert.assertTrue(true); + } + + @Test(description = "This is a test description") + public void passClass2Description() { + Assert.assertTrue(true); + } + + @Test(groups = { "functest", "checkintest" }) + public void failClass2() { + Assert.assertTrue(false); + } + + @Test(groups = { "functest", "checkintest" }, description = "This is a test description") + public void failClass2Description() { + Assert.assertTrue(false); + } + +} diff --git a/src/test/java/com/aventstack/extentreports/adapter/testlistenerclass/DescriptionTests.java b/src/test/java/com/aventstack/extentreports/adapter/testlistenerclass/DescriptionTests.java new file mode 100644 index 0000000..6e3492a --- /dev/null +++ b/src/test/java/com/aventstack/extentreports/adapter/testlistenerclass/DescriptionTests.java @@ -0,0 +1,31 @@ +package com.aventstack.extentreports.adapter.testlistenerclass; + +import com.aventstack.extentreports.testng.listener.ExtentITestListenerClassAdapter; +import org.testng.Assert; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + +@Listeners({ExtentITestListenerClassAdapter.class}) +public class DescriptionTests extends BaseDataProvider { + + @Test + public void passClass2() { + Assert.assertTrue(true); + } + + @Test(description = "This is a test description") + public void passClass2Description() { + Assert.assertTrue(true); + } + + @Test(groups = { "functest", "checkintest" }) + public void failClass2() { + Assert.assertTrue(false); + } + + @Test(groups = { "functest", "checkintest" }, description = "This is a test description") + public void failClass2Description() { + Assert.assertTrue(false); + } + +}