Merge pull request #693 from jayesh12234/develop

MOSIP-38852--Update Dsl Pom with latest version Of api-test commons
mosip · Jan 10, 2025 · 7047366 · 7047366
2 parents ef8451e + b297f30
commit 7047366
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/mosip-acceptance-tests/ivv-orchestrator/pom.xml b/mosip-acceptance-tests/ivv-orchestrator/pom.xml
@@ -114,9 +114,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
+			<groupId>io.mosip.testrig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.3.1-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
@@ -138,7 +138,7 @@
 		<dependency>
 			<groupId>io.mosip.esignet</groupId>
 			<artifactId>apitest-esignet</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.5.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

diff --git a/...ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/restcall/GetWithParam.java b/...ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/restcall/GetWithParam.java
@@ -81,7 +81,7 @@ public Object[] getTestCaseList(ITestContext context) {
 	@Test(dataProvider = "testcaselist")
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
+//		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
 		}

diff --git a/...s/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/restcall/SimplePost.java b/...s/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/restcall/SimplePost.java
@@ -83,7 +83,7 @@ public Object[] getTestCaseList(ITestContext context) {
 	@Test(dataProvider = "testcaselist")
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
+//		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		auditLogCheck = testCaseDTO.isAuditLogCheck();
 		String[] templateFields = testCaseDTO.getTemplateFields();
 		if (HealthChecker.signalTerminateExecution) {
@@ -106,19 +106,19 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
 			inputJson = inputJson.replace("&quot;", "\"");
 		}
 
-		if (inputJson.contains("$PHONENUMBERFROMREGEXFORSIGNUP$")) {
-			String phoneNumber = getPhoneNumber();
-			if (phoneNumber != null && !phoneNumber.isEmpty()) {
-				inputJson = replaceKeywordWithValue(inputJson, "$PHONENUMBERFROMREGEXFORSIGNUP$", phoneNumber);
-				writeAutoGeneratedId(testCaseDTO.getTestCaseName(), "PHONE", phoneNumber);
-			}
-		}
-
-		if (inputJson.contains("$FULLNAMETOREGISTERUSER$")) {
-			String jsonString = generateFullNameToRegisterUser(inputJson, testCaseDTO.getTestCaseName());
-			if (!jsonString.isBlank())
-				inputJson = jsonString;
-		}
+//		if (inputJson.contains("$PHONENUMBERFROMREGEXFORSIGNUP$")) {
+//			String phoneNumber = getPhoneNumber();
+//			if (phoneNumber != null && !phoneNumber.isEmpty()) {
+//				inputJson = replaceKeywordWithValue(inputJson, "$PHONENUMBERFROMREGEXFORSIGNUP$", phoneNumber);
+//				writeAutoGeneratedId(testCaseDTO.getTestCaseName(), "PHONE", phoneNumber);
+//			}
+//		}
+//		
+//		if (inputJson.contains("$FULLNAMETOREGISTERUSER$")) {
+//			String jsonString = generateFullNameToRegisterUser(inputJson, testCaseDTO.getTestCaseName());
+//			if (!jsonString.isBlank())
+//				inputJson = jsonString;
+//		}
 
 
 

diff --git a/...vv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/PacketUtility.java b/...vv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/PacketUtility.java
@@ -50,6 +50,7 @@
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.esignet.testscripts.EsignetBioAuth;
+import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalMethods;
@@ -1198,7 +1199,7 @@ public void esignetBioAuth(String modility, String bioValue, String uin, String
 
 	private String getAuthTransactionId(String oidcTransactionId) {
 	    final String transactionId = oidcTransactionId.replaceAll("_|-", "");
-	    String lengthOfTransactionId =  AdminTestUtil.getValueFromEsignetActuator("/mosip/mosip-config/esignet-default.properties", "mosip.esignet.auth-txn-id-length");
+	    String lengthOfTransactionId =  EsignetUtil.getValueFromEsignetActuator("/mosip/mosip-config/esignet-default.properties", "mosip.esignet.auth-txn-id-length");
 	   int authTransactionIdLength = lengthOfTransactionId != null ? Integer.parseInt(lengthOfTransactionId): 0;
 	    final byte[] oidcTransactionIdBytes = transactionId.getBytes();
 	    final byte[] authTransactionIdBytes = new byte[authTransactionIdLength];