From 36c0ebd94b0288aa9132d98a1507b0dc8d235f3b Mon Sep 17 00:00:00 2001 From: Kanaduchi Date: Thu, 21 Nov 2024 12:20:43 +0000 Subject: [PATCH 1/2] Fix for #3189 - fixed ignored testcases count --- .../org/testng/reporters/AbstractXmlReporter.java | 2 +- .../test/java/test/reports/SimpleIgnoredSample.java | 13 +++++++++++++ .../src/test/java/test/reports/XmlReporterTest.java | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 testng-core/src/test/java/test/reports/SimpleIgnoredSample.java diff --git a/testng-core/src/main/java/org/testng/reporters/AbstractXmlReporter.java b/testng-core/src/main/java/org/testng/reporters/AbstractXmlReporter.java index e669978c5..81d728bb8 100644 --- a/testng-core/src/main/java/org/testng/reporters/AbstractXmlReporter.java +++ b/testng-core/src/main/java/org/testng/reporters/AbstractXmlReporter.java @@ -228,7 +228,7 @@ public void add(Count count) { this.failed += count.failed; this.skipped += count.skipped; this.retried += count.retried; - this.ignored += count.retried; + this.ignored += count.ignored; } private Count(Builder builder) { diff --git a/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java b/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java new file mode 100644 index 000000000..2ce1236d7 --- /dev/null +++ b/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java @@ -0,0 +1,13 @@ +package test.reports; + +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; + +public class SimpleIgnoredSample { + + @Test + @Ignore + public void ignored() { + + } +} diff --git a/testng-core/src/test/java/test/reports/XmlReporterTest.java b/testng-core/src/test/java/test/reports/XmlReporterTest.java index 13553f1be..2258a7d9f 100644 --- a/testng-core/src/test/java/test/reports/XmlReporterTest.java +++ b/testng-core/src/test/java/test/reports/XmlReporterTest.java @@ -93,7 +93,7 @@ public void ensureReportGenerationWhenTestMethodIsWrappedWithWrappedTestNGMethod @Test(description = "GITHUB-2886") public void ensureConfigurationMethodsAreNotCountedAsSkippedInXmlReports() throws Exception { File file = - runTest(RuntimeBehavior.FILE_NAME, null, JekyllTestSample.class, HydeTestSample.class); + runTest(RuntimeBehavior.FILE_NAME, null, JekyllTestSample.class, HydeTestSample.class, SimpleIgnoredSample.class); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); Document doc = builder.parse(file); @@ -103,8 +103,8 @@ public void ensureConfigurationMethodsAreNotCountedAsSkippedInXmlReports() throw int total = Integer.parseInt(node.getAttributes().getNamedItem("total").getNodeValue()); int passed = Integer.parseInt(node.getAttributes().getNamedItem("passed").getNodeValue()); int failed = Integer.parseInt(node.getAttributes().getNamedItem("failed").getNodeValue()); - assertThat(ignored).isZero(); - assertThat(total).isEqualTo(2); + assertThat(ignored).isEqualTo(1); + assertThat(total).isEqualTo(3); assertThat(passed).isEqualTo(2); assertThat(failed).isZero(); } From fb8328942fec5845b3921afefe4832e4a79c0928 Mon Sep 17 00:00:00 2001 From: Kanaduchi Date: Thu, 21 Nov 2024 12:23:25 +0000 Subject: [PATCH 2/2] Fix for #3189 - fixed ignored testcases count --- CHANGES.txt | 1 + .../src/test/java/test/reports/SimpleIgnoredSample.java | 4 +--- .../src/test/java/test/reports/XmlReporterTest.java | 7 ++++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 99f86edc3..7c9edb612 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ Fixed: GITHUB-3028: Execution stalls when using "use-global-thread-pool" (Krishn Fixed: GITHUB-3122: Update JCommander to 1.83 (Antoine Dessaigne) Fixed: GITHUB-3135: assertEquals on arrays - Failure message is missing information about the array index when an array element is unexpectedly null or non-null (Albert Choi) Fixed: GITHUB-3140: assertEqualsDeep on Sets - Deep comparison was using the wrong expected value +Fixed: GITHUB-3189: Incorrect number of ignored tests displayed in the XML results 7.10.2 Fixed: GITHUB-3117: ListenerComparator doesn't work (Krishnan Mahadevan) diff --git a/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java b/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java index 2ce1236d7..55073caaa 100644 --- a/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java +++ b/testng-core/src/test/java/test/reports/SimpleIgnoredSample.java @@ -7,7 +7,5 @@ public class SimpleIgnoredSample { @Test @Ignore - public void ignored() { - - } + public void ignored() {} } diff --git a/testng-core/src/test/java/test/reports/XmlReporterTest.java b/testng-core/src/test/java/test/reports/XmlReporterTest.java index 2258a7d9f..7744c2763 100644 --- a/testng-core/src/test/java/test/reports/XmlReporterTest.java +++ b/testng-core/src/test/java/test/reports/XmlReporterTest.java @@ -93,7 +93,12 @@ public void ensureReportGenerationWhenTestMethodIsWrappedWithWrappedTestNGMethod @Test(description = "GITHUB-2886") public void ensureConfigurationMethodsAreNotCountedAsSkippedInXmlReports() throws Exception { File file = - runTest(RuntimeBehavior.FILE_NAME, null, JekyllTestSample.class, HydeTestSample.class, SimpleIgnoredSample.class); + runTest( + RuntimeBehavior.FILE_NAME, + null, + JekyllTestSample.class, + HydeTestSample.class, + SimpleIgnoredSample.class); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); Document doc = builder.parse(file);