Merge pull request #1714 from nandhu-kumar/develop

MOSIP-38489 - Generated single report with 2 sections
mosip · Jan 15, 2025 · 159714a · 159714a
2 parents 01a6ce0 + 802d807
commit 159714a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/report/EmailableReport.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/report/EmailableReport.java
@@ -91,8 +91,11 @@ public static int getSkippedCount() {
 
 	@Override
 	public void generateReport(List<XmlSuite> xmlSuites, List<ISuite> suites, String outputDirectory) {
-		generateReport(xmlSuites, suites,  outputDirectory, false); // Generate full report
-		generateReport(xmlSuites, suites,  outputDirectory, true); // Generate error report
+		generateReport(xmlSuites, suites, outputDirectory, false); // Generate full report
+		if (totalFailedTests > 0 || totalSkippedTests > 0) {
+			generateReport(xmlSuites, suites, outputDirectory, true); // Generate error report
+		}
+
 	}
 
 	private SuiteResult createFilteredSuiteResult(ISuite suite) {
@@ -162,6 +165,11 @@ public void generateOutputFile(boolean skipPassed) {
 			temp = "-" + reportContext + "report_T-" + totalTestCases + "_P-" + totalPassedTests + "_S-" + totalSkippedTests + "_F-"
 					+ totalFailedTests + "_KI-" + totalKnownIssueTests;
 		}
+
+		if (skipPassed == true) {
+			temp = temp.replaceAll("P-\\d+_", ""); // Removes passed count (P-*_) from the report title.
+		}
+
 		String newString = oldString.replace("-report", temp);
 
 		File orignialReportFile = new File(