Merge pull request #694 from jayesh12234/develop

MOSIP-37102
mosip · Jan 15, 2025 · 8c27ee5 · 8c27ee5
2 parents 7047366 + 2683631
commit 8c27ee5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...ts/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/OidcClient.java b/...ts/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/OidcClient.java
@@ -7,7 +7,7 @@
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.idrepo.testscripts.PostWithOnlyPathParam;
 import io.mosip.testrig.apirig.auth.testscripts.SimplePost;
-import io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId;
+import io.mosip.testrig.apirig.esignet.testscripts.SimplePostForAutoGenId;
 import io.mosip.testrig.apirig.masterdata.testscripts.SimplePut;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
 import io.mosip.testrig.apirig.utils.AdminTestException;

diff --git a/...ests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/UserInfo.java b/...ests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/UserInfo.java
@@ -8,8 +8,8 @@
 import org.json.JSONObject;
 import com.nimbusds.jose.jwk.RSAKey;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
-import io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam;
-import io.mosip.testrig.apirig.masterdata.testscripts.SimplePost;
+import io.mosip.testrig.apirig.esignet.testscripts.GetWithParam;
+import io.mosip.testrig.apirig.esignet.testscripts.SimplePostForAutoGenId;
 import io.mosip.testrig.apirig.resident.testscripts.SimplePostForAutoGenIdForUrlEncoded;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -29,7 +29,7 @@ public class UserInfo extends BaseTestCaseUtil implements StepInterface {
 	private static final String AuthorizationCodeYml = "idaData/AuthorizationCode/AuthorizationCode.yml";
 	private static final String GenerateTokenYml = "idaData/GenerateToken/GenerateToken.yml";
 	private static final String GetUserInfoYml = "idaData/GetOidcUserInfo/GetOidcUserInfo.yml";
-	SimplePost authorizationCode = new SimplePost();
+	SimplePostForAutoGenId authorizationCode = new SimplePostForAutoGenId();
 	SimplePostForAutoGenIdForUrlEncoded generateToken = new SimplePostForAutoGenIdForUrlEncoded();
 	GetWithParam getUserInfo = new GetWithParam();
 	String clientId = "";
@@ -129,7 +129,7 @@ else if (idType.contains("UIN") || idType.contains("uin")) {
 
 				}
 
-			} catch (AuthenticationTestException | AdminTestException e) {
+			} catch (AuthenticationTestException | AdminTestException | NoSuchAlgorithmException e) {
 				this.hasError = true;
 				throw new RigInternalError(e.getMessage());
 
@@ -157,7 +157,7 @@ else if (idType.contains("UIN") || idType.contains("uin")) {
 
 				}
 
-			} catch (AuthenticationTestException | AdminTestException e) {
+			} catch (AuthenticationTestException | AdminTestException | NoSuchAlgorithmException e) {
 				this.hasError = true;
 				throw new RigInternalError(e.getMessage());
 

diff --git a/...s/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/TestRunner.java b/...s/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/TestRunner.java
@@ -50,7 +50,7 @@ public static void main(String[] args) {
 		BaseTestCase.initialize();
 
 		BaseTestCase.languageList = BaseTestCase.getLanguageList();
-
+		AdminTestUtil.getRequiredField();
 		// Selecting the language based on index for example- eng,ara,fra (To run suite
 		// in ara lang pass 1 in langselect property)