MOSIP-36343

Signed-off-by: Pankaj Godiyal <[email protected]>
mosip · Oct 7, 2024 · 77bb3f4 · 77bb3f4
1 parent e0ec699
commit 77bb3f4
Show file tree

Hide file tree

Showing 98 changed files with 239 additions and 675 deletions.
diff --git a/...sts/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/config/BeanConfig.java b/...sts/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/config/BeanConfig.java
diff --git a/...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/ActivateDeactivate.java b/...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/ActivateDeactivate.java
@@ -2,14 +2,10 @@
 
 import java.util.HashMap;
 import java.util.Properties;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.testng.Reporter;
-
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
@@ -20,8 +16,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class ActivateDeactivate extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(ActivateDeactivate.class);
 	KernelAuthentication kernelAuthLib = new KernelAuthentication();

diff --git a/...chestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/ApproveRejectPacket.java b/...chestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/ApproveRejectPacket.java
@@ -5,20 +5,14 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.testng.Reporter;
-
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
-import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class ApproveRejectPacket extends BaseTestCaseUtil implements StepInterface {
 	private static final String DECISSIONDATA_YML = "preReg/approveRejectPacket/decissionData.yml";
 	public static Logger logger = Logger.getLogger(ApproveRejectPacket.class);

diff --git a/...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/AssignPacketToUser.java b/...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/AssignPacketToUser.java
@@ -5,19 +5,14 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.testng.Reporter;
-
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testscripts.SimplePost;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class AssignPacketToUser extends BaseTestCaseUtil implements StepInterface {
 	private static final String ASSIGNDATA_YML = "preReg/assignPacketToUser/assignData.yml";
 	public static Logger logger = Logger.getLogger(AssignPacketToUser.class);

diff --git a/...orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BioAuthentication.java b/...orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BioAuthentication.java
@@ -9,9 +9,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
@@ -24,8 +21,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.TestRunner;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class BioAuthentication extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(BioAuthentication.class);
 	private static final String BIOMETRIC_FACE = "idaData/BioAuth/BioAuth.yml";

diff --git a/...rator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BioEsignetAuthentication.java b/...rator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BioEsignetAuthentication.java
@@ -4,17 +4,12 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
-import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testscripts.EsignetBioAuth;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
@@ -25,8 +20,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.TestRunner;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class BioEsignetAuthentication extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(BioEsignetAuthentication.class);
 	private static final String AuthenticateUser = "idaData/BioAuthEsignet/BioAuthEsignet.yml";

diff --git a/...v-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BookAppointment.java b/...v-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BookAppointment.java
@@ -2,16 +2,11 @@
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class BookAppointment extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(BookAppointment.class);
 	boolean bookOnHolidays = Boolean.FALSE;

diff --git a/...trator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BookSpecificSlotForPrid.java b/...trator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BookSpecificSlotForPrid.java
@@ -6,19 +6,13 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.e2e.constant.E2EConstants;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class BookSpecificSlotForPrid extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(BookSpecificSlotForPrid.class);
 	String appointment_date = "";

diff --git a/...-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BulkUploadPacket.java b/...-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/BulkUploadPacket.java
@@ -6,18 +6,13 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.PacketUtility;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class BulkUploadPacket extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(BulkUploadPacket.class);
 

diff --git a/...orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CancelAppointment.java b/...orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CancelAppointment.java
@@ -4,17 +4,12 @@
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class CancelAppointment extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(CheckStatus.class);
 

diff --git a/...ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CancelBooking.java b/...ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CancelBooking.java
@@ -9,9 +9,6 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
@@ -20,8 +17,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class CancelBooking extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(CancelBooking.class);
 

diff --git a/...-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/Center.java b/...-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/Center.java
@@ -4,9 +4,6 @@
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testscripts.PatchWithPathParam;
 import io.mosip.testrig.apirig.testscripts.PutWithPathParam;
@@ -19,8 +16,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.UserHelper;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class Center extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(Center.class);
 	UserHelper userHelper = new UserHelper();

diff --git a/...estrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckCredentialStatus.java b/...estrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckCredentialStatus.java
@@ -2,10 +2,7 @@
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.testng.Reporter;
-
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
@@ -15,8 +12,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class CheckCredentialStatus extends BaseTestCaseUtil implements StepInterface {
 	private static final String check_status_YML = "preReg/credentialStatus/credentialStatus.yml";
 	public static Logger logger = Logger.getLogger(CheckCredentialStatus.class);
@@ -31,7 +26,7 @@ public class CheckCredentialStatus extends BaseTestCaseUtil implements StepInter
 	@SuppressWarnings("static-access")
 	@Override
 	public void run() throws RigInternalError {
-		if (!step.getParameters().isEmpty() && step.getParameters().size() == 1) { 
+		if (!step.getParameters().isEmpty() && step.getParameters().size() == 1) {
 			String _requestId = step.getParameters().get(0);
 			if (_requestId.startsWith("$$")) {
 				_requestId = step.getScenario().getVariables().get(_requestId);
@@ -50,8 +45,7 @@ public void run() throws RigInternalError {
 			for (Object object : testCaseList) {
 				for (String requestid : this.step.getScenario().getUinReqIds().values()) {
 					int counter = 0;
-					while (!credentialIssued
-							&& counter < Integer.parseInt(props.getProperty("loopCount"))) {
+					while (!credentialIssued && counter < Integer.parseInt(props.getProperty("loopCount"))) {
 						counter++;
 						try {
 							logger.info("Waiting for 30 sec to get credential Issued");
@@ -69,7 +63,8 @@ public void run() throws RigInternalError {
 									+ " MilliSec");
 
 							if (getWithPathParam.response.getBody().asString().toLowerCase().contains("printed")
-									|| getWithPathParam.response.getBody().asString().toLowerCase().contains("printing"))
+									|| getWithPathParam.response.getBody().asString().toLowerCase()
+											.contains("printing"))
 								credentialIssued = true;
 						} catch (AuthenticationTestException | AdminTestException e) {
 							logger.error("Failed at checking Credential status with error: " + e.getMessage());

diff --git a/...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckForBDBAbsence.java b/...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckForBDBAbsence.java
@@ -6,14 +6,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import io.mosip.kernel.biometrics.commons.CbeffValidator;
 import io.mosip.kernel.biometrics.entities.BIR;
-
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
@@ -25,8 +21,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class CheckForBDBAbsence extends BaseTestCaseUtil implements StepInterface {
 	private static final Logger logger = Logger.getLogger(CheckForBDBAbsence.class);
 	private static final String CheckForBDB = "idaData/RetrieveBioDocumentByID/RetrieveBioDocumentByID.yml";

diff --git a/...chestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckForBDBPresence.java b/...chestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckForBDBPresence.java
@@ -6,14 +6,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import io.mosip.kernel.biometrics.commons.CbeffValidator;
 import io.mosip.kernel.biometrics.entities.BIR;
-
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
@@ -25,8 +21,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class CheckForBDBPresence extends BaseTestCaseUtil implements StepInterface {
 	private static final Logger logger = Logger.getLogger(CheckForBDBPresence.class);
 	private static final String CheckForBDB = "idaData/RetrieveBioDocumentByID/RetrieveBioDocumentByID.yml";

diff --git a/...strator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckMultipleRidStatus.java b/...strator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckMultipleRidStatus.java
@@ -7,15 +7,11 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 import org.testng.Reporter;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
-
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.testscripts.SimplePost;
@@ -25,8 +21,6 @@
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 
-@Scope("prototype")
-@Component
 public class CheckMultipleRidStatus extends BaseTestCaseUtil implements StepInterface {
 	private static final String check_status_YML = "preReg/checkStatus/checkstatus.yml";
 	public static Logger logger = Logger.getLogger(CheckMultipleRidStatus.class);

diff --git a/...v-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckPridStatus.java b/...v-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/CheckPridStatus.java
@@ -4,22 +4,16 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.dslrig.ivv.core.base.StepInterface;
 import io.mosip.testrig.dslrig.ivv.core.exceptions.RigInternalError;
 import io.mosip.testrig.dslrig.ivv.orchestrator.BaseTestCaseUtil;
 import io.mosip.testrig.dslrig.ivv.orchestrator.dslConfigManager;
 import io.restassured.response.Response;
 
-@Scope("prototype")
-@Component
 public class CheckPridStatus extends BaseTestCaseUtil implements StepInterface {
 	public static Logger logger = Logger.getLogger(CheckStatus.class);