MOSIP-38489 - Generated single report with 2 sections (#1097)

* MOSIP-36485 Signed-off-by: Nandhukumar <nandhukumare@gmail.com> * MOSIP-36485 Signed-off-by: Nandhukumar <nandhukumare@gmail.com> * MOSIP-36485 Signed-off-by: Nandhukumar <nandhukumare@gmail.com> * MOSIP-38489 - Generated single report with 2 sections Signed-off-by: Nandhukumar <nandhukumare@gmail.com> * MOSIP-38489 - Generated single report with 2 sections Signed-off-by: Nandhukumar <nandhukumare@gmail.com> --------- Signed-off-by: Nandhukumar <nandhukumare@gmail.com>
mosip · Jan 16, 2025 · e550b99 · e550b99
1 parent e71d278
commit e550b99
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/esignet/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/esignet/testrunner/MosipTestRunner.java
@@ -199,34 +199,15 @@ public static void startTestRunner() {
 			homeDir = new File(dir.getParent() + "/mosip/testNgXmlFiles");
 			LOGGER.info("ELSE :" + homeDir);
 		}
-		// List and sort the files
 		File[] files = homeDir.listFiles();
 		if (files != null) {
-			Arrays.sort(files, (f1, f2) -> {
-				// Customize the comparison based on file names
-				if (f1.getName().toLowerCase().contains("prerequisite")) {
-					return -1; // f1 should come before f2
-				} else if (f2.getName().toLowerCase().contains("prerequisite")) {
-					return 1; // f2 comes before f1
-				}
-				return f1.getName().compareTo(f2.getName()); // default alphabetical order
-			});
 
 			for (File file : files) {
 				TestNG runner = new TestNG();
 				List<String> suitefiles = new ArrayList<>();
 
-				if (file.getName().toLowerCase().contains(GlobalConstants.ESIGNET)) {
-					if (file.getName().toLowerCase().contains("prerequisite")) {
-						BaseTestCase.setReportName(GlobalConstants.ESIGNET + "-prerequisite");
-					} else {
-						// if the prerequisite total skipped/failed count is greater than zero
-						if (EmailableReport.getFailedCount() > 0 || EmailableReport.getSkippedCount() > 0) {
-							// skipAll = true;
-						}
-
-						BaseTestCase.setReportName(GlobalConstants.ESIGNET);
-					}
+				if (file.getName().toLowerCase().contains("mastertestsuite")) {
+					BaseTestCase.setReportName(GlobalConstants.ESIGNET);
 					suitefiles.add(file.getAbsolutePath());
 					runner.setTestSuites(suitefiles);
 					System.getProperties().setProperty("testng.outpur.dir", "testng-report");

diff --git a/api-test/testNgXmlFiles/esignetMasterTestSuite.xml b/api-test/testNgXmlFiles/esignetMasterTestSuite.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="eSignet API Test Rig Master Suite">
+	<listeners>
+		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
+	</listeners>
+	<suite-files>
+		<suite-file path="esignetPrerequisiteSuite.xml" />
+		<suite-file path="esignetSuite.xml" />
+	</suite-files>
+</suite>
diff --git a/api-test/testNgXmlFiles/esignetPrerequisiteSuite.xml b/api-test/testNgXmlFiles/esignetPrerequisiteSuite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 
-	<suite name="e-Signet Prerequisite Suite">
+	<suite name="eSignet Pre-requisite API Test">
 	<!-- Passing Group as parmeter unsing "testType" Possible Groups are: smoke 
 		regression smokeAndRegression -->
 	<listeners>

diff --git a/api-test/testNgXmlFiles/esignetSuite.xml b/api-test/testNgXmlFiles/esignetSuite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 
-	<suite name="e-Signet Suite">
+	<suite name="eSignet API Test">
 	<!-- Passing Group as parmeter unsing "testType" Possible Groups are: smoke 
 		regression smokeAndRegression -->
 	<listeners>