diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java index 1f2153a55f..c249816558 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java @@ -7,7 +7,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.json.JSONObject; -import org.springframework.stereotype.Component; import org.testng.ITest; import org.testng.ITestContext; import org.testng.ITestResult; @@ -26,8 +25,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.PartnerRegistration; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java index 4e152f59a3..db1bc649bd 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java @@ -8,7 +8,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.json.JSONObject; -import org.springframework.stereotype.Component; import org.testng.ITest; import org.testng.ITestContext; import org.testng.ITestResult; @@ -28,14 +27,14 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.PartnerRegistration; import io.mosip.testrig.apirig.utils.ReportUtil; import io.restassured.response.Response; -@Component + public class DemoAuth extends AdminTestUtil implements ITest { private static final Logger logger = Logger.getLogger(DemoAuth.class); protected String testCaseName = ""; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java index 28a7c509f2..77e3f3adde 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java @@ -33,9 +33,9 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; import io.mosip.testrig.apirig.utils.GlobalMethods; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.PartnerRegistration; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java index ed10deaf04..08030623cb 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java @@ -27,8 +27,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java index 1a5de33bbf..7f7d801213 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java @@ -27,8 +27,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java index d31b1966e7..8b32e31140 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java @@ -8,7 +8,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.json.JSONObject; -import org.springframework.stereotype.Component; import org.testng.ITest; import org.testng.ITestContext; import org.testng.ITestResult; @@ -28,14 +27,14 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.PartnerRegistration; import io.mosip.testrig.apirig.utils.ReportUtil; import io.restassured.response.Response; -@Component + public class MultiFactorAuthNew extends AdminTestUtil implements ITest { private static final Logger logger = Logger.getLogger(MultiFactorAuthNew.class); protected String testCaseName = ""; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java index 433cdd6d8a..2fc7877cba 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java @@ -8,7 +8,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.json.JSONObject; -import org.springframework.stereotype.Component; import org.testng.ITest; import org.testng.ITestContext; import org.testng.ITestResult; @@ -26,16 +25,15 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil; import io.mosip.testrig.apirig.utils.FileUtil; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.PartnerRegistration; import io.mosip.testrig.apirig.utils.ReportUtil; import io.restassured.response.Response; -@Component public class OtpAuthNew extends AdminTestUtil implements ITest { private static final Logger logger = Logger.getLogger(OtpAuthNew.class); protected String testCaseName = ""; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java index c94921f56e..bcab8430fc 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java @@ -26,8 +26,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java index 0533f4ebec..81102e614e 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java @@ -27,8 +27,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java index 4070f0a0fb..fc7e653446 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java @@ -26,8 +26,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java index 6fe7d3805e..d902d72d73 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java @@ -27,8 +27,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java index 561d78778e..9193f9c8a9 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java @@ -27,8 +27,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java index c675565bf7..77223091da 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java @@ -28,8 +28,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java index d9cb10cebb..aed021490c 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java @@ -26,8 +26,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil; diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java index ad6f3bd222..2ba5caaeee 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java @@ -31,8 +31,8 @@ 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.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.GlobalConstants; +import io.mosip.testrig.apirig.utils.IdAuthConfigManager; import io.mosip.testrig.apirig.utils.IdAuthenticationUtil; import io.mosip.testrig.apirig.utils.OutputValidationUtil; import io.mosip.testrig.apirig.utils.ReportUtil;