MOSIP-36505 | Split the Testng report into pre-requisite and function…

…al test Signed-off-by: Nandhukumar <[email protected]>
mosip · Oct 17, 2024 · e53b3d0 · e53b3d0
1 parent 3593e38
commit e53b3d0
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 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
@@ -24,6 +24,7 @@
 
 import io.mosip.testrig.apirig.dataprovider.BiometricDataProvider;
 import io.mosip.testrig.apirig.dbaccess.DBManager;
+import io.mosip.testrig.apirig.report.EmailableReport;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthTestsUtil;
 import io.mosip.testrig.apirig.utils.CertsUtil;
@@ -49,6 +50,7 @@ public class MosipTestRunner {
 
 	public static String jarUrl = MosipTestRunner.class.getProtectionDomain().getCodeSource().getLocation().getPath();
 	public static List<String> languageList = new ArrayList<>();
+	public static boolean skipAll = false;
 
 	/**
 	 * C Main method to start mosip test execution
@@ -136,7 +138,6 @@ public static void suiteSetup(String runType) {
 		DBManager.executeDBQueries(ResidentConfigManager.getMASTERDbUrl(), ResidentConfigManager.getMasterDbUser(),
 				ResidentConfigManager.getMasterDbPass(), ResidentConfigManager.getMasterDbSchema(),
 				getGlobalResourcePath() + "/" + "config/masterDataDeleteQueriesForEsignet.txt");
-		BaseTestCase.setReportName(GlobalConstants.RESIDENT);
 		AdminTestUtil.copyResidentTestResource();
 		BaseTestCase.otpListener = new OTPListener();
 		BaseTestCase.otpListener.run();
@@ -159,8 +160,6 @@ private static void setLogLevels() {
 	 */
 	public static void startTestRunner() {
 		File homeDir = null;
-		TestNG runner = new TestNG();
-		List<String> suitefiles = new ArrayList<>();
 		String os = System.getProperty("os.name");
 		LOGGER.info(os);
 		if (getRunType().contains("IDE") || os.toLowerCase().contains("windows")) {
@@ -172,14 +171,26 @@ public static void startTestRunner() {
 			LOGGER.info("ELSE :" + homeDir);
 		}
 		for (File file : homeDir.listFiles()) {
+			TestNG runner = new TestNG();
+			List<String> suitefiles = new ArrayList<>();
 			if (file.getName().toLowerCase().contains(GlobalConstants.RESIDENT)) {
+				if (file.getName().toLowerCase().contains("prerequisite")) {
+					BaseTestCase.setReportName(GlobalConstants.RESIDENT + "-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.RESIDENT);
+				}
 				suitefiles.add(file.getAbsolutePath());
+				runner.setTestSuites(suitefiles);
+				System.getProperties().setProperty("testng.outpur.dir", "testng-report");
+				runner.setOutputDirectory("testng-report");
+				runner.run();
 			}
 		}
-		runner.setTestSuites(suitefiles);
-		System.getProperties().setProperty("testng.outpur.dir", "testng-report");
-		runner.setOutputDirectory("testng-report");
-		runner.run();
 	}
 
 	public static String getGlobalResourcePath() {

diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/utils/ResidentUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/utils/ResidentUtil.java
@@ -4,6 +4,7 @@
 import org.testng.SkipException;
 
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
 
 public class ResidentUtil extends AdminTestUtil {
 
@@ -12,6 +13,10 @@ public class ResidentUtil extends AdminTestUtil {
 	public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
 		String testCaseName = testCaseDTO.getTestCaseName();
 
+		if (MosipTestRunner.skipAll == true) {
+			throw new SkipException(GlobalConstants.PRE_REQUISITE_FAILED_MESSAGE);
+		}
+
 		if (SkipTestCaseHandler.isTestCaseInSkippedList(testCaseName)) {
 			throw new SkipException(GlobalConstants.KNOWN_ISSUES);
 		}

diff --git a/api-test/testNgXmlFiles/residentPrerequisiteSuite.xml b/api-test/testNgXmlFiles/residentPrerequisiteSuite.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+	<suite name="Resident Prerequisite Suite">
+	<!-- Passing Group as parmeter unsing "testType" Possible Groups are: smoke 
+		regression smokeAndRegression -->
+	<listeners>
+		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport"/>
+	</listeners>
+
+
+	<test name="AddIdentity">
+		<parameter name="ymlFile"
+			value="resident/AddIdentity/AddIdentity.yml" />
+			<parameter name="prerequisite" value="Yes" />
+		<classes>
+			<class name="io.mosip.testrig.apirig.testscripts.AddIdentity" />
+		</classes>
+	</test>
+
+</suite>
diff --git a/api-test/testNgXmlFiles/residentApi.xml → api-test/testNgXmlFiles/residentSuite.xml b/api-test/testNgXmlFiles/residentApi.xml → api-test/testNgXmlFiles/residentSuite.xml
@@ -9,14 +9,6 @@
 	</listeners>
 
 
-	<test name="AddIdentity">
-		<parameter name="ymlFile"
-			value="resident/AddIdentity/AddIdentity.yml" />
-			<parameter name="prerequisite" value="Yes" />
-		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.AddIdentity" />
-		</classes>
-	</test>
 	<test name="GenerateVID">
 		<parameter name="ymlFile"
 			value="resident/GenerateVID/createGenerateVID.yml" />