Merge branch 'develop' into develop

Signed-off-by: pvsaidurga <[email protected]>
Infosys · Nov 8, 2024 · 4c4c7c9 · 4c4c7c9
2 parents a8e23bc + f85490b
commit 4c4c7c9
Show file tree

Hide file tree

Showing 67 changed files with 2,853 additions and 302 deletions.
diff --git a/api-test/pom.xml b/api-test/pom.xml
@@ -163,7 +163,7 @@
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>
-										io.mosip.testrig.apirig.testrunner.MosipTestRunner</mainClass>
+										io.mosip.testrig.apirig.esignet.testrunner.MosipTestRunner</mainClass>
 								</transformer>
 							</transformers>
 							<!-- add this to prevent some security issues when

diff --git a/...ig/apirig/testrunner/MosipTestRunner.java → ...g/esignet/testrunner/MosipTestRunner.java b/...ig/apirig/testrunner/MosipTestRunner.java → ...g/esignet/testrunner/MosipTestRunner.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testrunner;
+package io.mosip.testrig.apirig.esignet.testrunner;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -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;
@@ -24,13 +25,17 @@
 
 import io.mosip.testrig.apirig.dataprovider.BiometricDataProvider;
 import io.mosip.testrig.apirig.dbaccess.DBManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.report.EmailableReport;
+import io.mosip.testrig.apirig.testrunner.BaseTestCase;
+import io.mosip.testrig.apirig.testrunner.ExtractResource;
+import io.mosip.testrig.apirig.testrunner.HealthChecker;
+import io.mosip.testrig.apirig.testrunner.OTPListener;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthTestsUtil;
 import io.mosip.testrig.apirig.utils.CertificateGenerationUtil;
 import io.mosip.testrig.apirig.utils.CertsUtil;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.JWKKeyUtil;
 import io.mosip.testrig.apirig.utils.KeyCloakUserAndAPIKeyGeneration;
@@ -123,6 +128,8 @@ public static void main(String[] arg) {
 				else
 					startTestRunner();
 			} else {
+				BaseTestCase.isTargetEnvLatest = true;
+				EsignetUtil.getSupportedLanguage();
 				startTestRunner();
 			}
 
@@ -191,30 +198,44 @@ 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.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;
+		// 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);
 					}
-
-					BaseTestCase.setReportName(GlobalConstants.ESIGNET);
+					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);
 		}
-
 	}
 
 	public static String getGlobalResourcePath() {

diff --git a/...strig/apirig/testscripts/AddIdentity.java → ...irig/esignet/testscripts/AddIdentity.java b/...strig/apirig/testscripts/AddIdentity.java → ...irig/esignet/testscripts/AddIdentity.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
@@ -26,12 +26,12 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.GlobalMethods;
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
@@ -135,6 +135,10 @@ public void test(TestCaseDTO testCaseDTO) throws Exception {
 
 				writeAutoGeneratedId("Esignet_PartnerSelfRegistration_All_Valid_Smoke_sid", "partnerId",
 						generateRandomNumberString(20));
+
+				writeAutoGeneratedId("Esignet_PartnerSelfRegistration_Kyc_Valid_Smoke_sid", "partnerId",
+						generateRandomNumberString(20));
+
 				isvalueReplaced = true;
 			}
 		} else {
@@ -146,8 +150,6 @@ public void test(TestCaseDTO testCaseDTO) throws Exception {
 							new KernelAuthentication().getTokenByRole(testCaseDTO.getRole())).asString(),
 					"response.uin");
 
-			testCaseName = isTestCaseValidForExecution(testCaseDTO);
-
 			DateFormat dateFormatter = new SimpleDateFormat("yyyyMMddHHmmss");
 			Calendar cal = Calendar.getInstance();
 			String timestampValue = dateFormatter.format(cal.getTime());

diff --git a/...g/apirig/testscripts/DeleteWithParam.java → .../esignet/testscripts/DeleteWithParam.java b/...g/apirig/testscripts/DeleteWithParam.java → .../esignet/testscripts/DeleteWithParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,12 +22,12 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
@@ -79,7 +79,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = EsignetUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

diff --git a/...ig/apirig/testscripts/EsignetBioAuth.java → ...g/esignet/testscripts/EsignetBioAuth.java b/...ig/apirig/testscripts/EsignetBioAuth.java → ...g/esignet/testscripts/EsignetBioAuth.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.Base64;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.BioDataUtility;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
@@ -84,9 +84,10 @@ public Object[] getTestCaseList(ITestContext context) {
 	 */
 	@Test(dataProvider = "testcaselist")
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
-		testCaseName = testCaseDTO.getTestCaseName();
-		testCaseName = EsignetUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
+		testCaseName = testCaseDTO.getTestCaseName();		
+		if (BaseTestCase.currentModule.equals(GlobalConstants.MASTERDATA)== false) {
+			testCaseName = EsignetUtil.isTestCaseValidForExecution(testCaseDTO);
+		}
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

diff --git a/...trig/apirig/testscripts/GetWithParam.java → ...rig/esignet/testscripts/GetWithParam.java b/...trig/apirig/testscripts/GetWithParam.java → ...rig/esignet/testscripts/GetWithParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,13 +23,13 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = EsignetUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

diff --git a/...apirig/testscripts/GetWithQueryParam.java → ...signet/testscripts/GetWithQueryParam.java b/...apirig/testscripts/GetWithQueryParam.java → ...signet/testscripts/GetWithQueryParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,13 +23,13 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;

diff --git a/...p/testrig/apirig/testscripts/KycAuth.java → ...g/apirig/esignet/testscripts/KycAuth.java b/...p/testrig/apirig/testscripts/KycAuth.java → ...g/apirig/esignet/testscripts/KycAuth.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -23,13 +23,13 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
@@ -101,7 +101,6 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
 				throw new SkipException(GlobalConstants.VID_FEATURE_NOT_SUPPORTED);
 			}
 		}
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		JSONObject request = new JSONObject(testCaseDTO.getInput());
 		String kycAuthEndPoint = null;
 		if (request.has(GlobalConstants.KYCAUTHENDPOINT)) {

diff --git a/...stscripts/PatchWithPathParamsAndBody.java → ...stscripts/PatchWithPathParamsAndBody.java b/...stscripts/PatchWithPathParamsAndBody.java → ...stscripts/PatchWithPathParamsAndBody.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -20,13 +20,13 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;

diff --git a/...pts/PostWithAutogenIdWithOtpGenerate.java → ...pts/PostWithAutogenIdWithOtpGenerate.java b/...pts/PostWithAutogenIdWithOtpGenerate.java → ...pts/PostWithAutogenIdWithOtpGenerate.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -22,13 +22,13 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
@@ -103,8 +103,6 @@ public void test(TestCaseDTO testCaseDTO)
 				throw new SkipException(GlobalConstants.VID_FEATURE_NOT_SUPPORTED);
 			}
 		}
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
-
 		String inputJson = testCaseDTO.getInput().toString();
 		JSONObject req = new JSONObject(testCaseDTO.getInput());
 

diff --git a/...stWithAutogenIdWithOtpGenerateForWla.java → ...stWithAutogenIdWithOtpGenerateForWla.java b/...stWithAutogenIdWithOtpGenerateForWla.java → ...stWithAutogenIdWithOtpGenerateForWla.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.esignet.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -22,13 +22,13 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.esignet.utils.EsignetConfigManager;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
-import io.mosip.testrig.apirig.utils.EsignetConfigManager;
-import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
@@ -93,7 +93,6 @@ public void test(TestCaseDTO testCaseDTO) throws AdminTestException {
 			}
 		}
 
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		JSONObject req = new JSONObject(testCaseDTO.getInput());
 		String otpRequest = null;
 		String sendOtpReqTemplate = null;