Merge pull request #496 from nandhu-kumar/develop

MOSIP-36505 | Split the Testng report into pre-requisite and functional test rig- core
mosip · Oct 23, 2024 · 68ac3fe · 68ac3fe
2 parents 6e91af7 + dc2a084
commit 68ac3fe
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 17 deletions.
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
@@ -10,6 +10,7 @@
 import java.security.PublicKey;
 import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -167,26 +168,42 @@ public static void startTestRunner() {
 			homeDir = new File(dir.getParent() + "/mosip/testNgXmlFiles");
 			LOGGER.info("ELSE :" + homeDir);
 		}
-		for (File file : homeDir.listFiles()) {
-			TestNG runner = new TestNG();
-			List<String> suitefiles = new ArrayList<>();
-			if (file.getName().toLowerCase().contains(GlobalConstants.MIMOTO)) {
-				if (file.getName().toLowerCase().contains("prerequisite")) {
-					BaseTestCase.setReportName(GlobalConstants.MIMOTO + "-prerequisite");
-				} else {
-					// if the prerequisite total skipped/failed count is greater than zero
-					if (EmailableReport.getFailedCount() > 0 || EmailableReport.getSkippedCount() > 0) {
-//						skipAll = true;
+		// 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.MIMOTO)) {
+					if (file.getName().toLowerCase().contains("prerequisite")) {
+						BaseTestCase.setReportName(GlobalConstants.MIMOTO + "-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.MIMOTO);
 					}
-
-					BaseTestCase.setReportName(GlobalConstants.MIMOTO);
+					suitefiles.add(file.getAbsolutePath());
+					runner.setTestSuites(suitefiles);
+					System.getProperties().setProperty("testng.outpur.dir", "testng-report");
+					runner.setOutputDirectory("testng-report");
+					runner.run();
 				}
-				suitefiles.add(file.getAbsolutePath());
-				runner.setTestSuites(suitefiles);
-				System.getProperties().setProperty("testng.outpur.dir", "testng-report");
-				runner.setOutputDirectory("testng-report");
-				runner.run();
 			}
+		} else {
+			LOGGER.error("No files found in directory: " + homeDir);
 		}
 	}
 

diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/utils/MimotoUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/utils/MimotoUtil.java
@@ -39,6 +39,13 @@ public static TestCaseDTO changeContextURLByFlag(TestCaseDTO testCaseDTO) {
 
 	public static TestCaseDTO isTestCaseValidForTheExecution(TestCaseDTO testCaseDTO) {
 		String testCaseName = testCaseDTO.getTestCaseName();
+
+		int indexof = testCaseName.indexOf("_");
+		String modifiedTestCaseName = testCaseName.substring(indexof + 1);
+
+		addTestCaseDetailsToMap(modifiedTestCaseName, testCaseDTO.getUniqueIdentifier());
+
+
 		String endpoint = testCaseDTO.getEndPoint();
 		String inputJson = testCaseDTO.getInput();