Merge pull request #124 from nandhu-kumar/develop

MOSIP-37137 | changed package name
mosip · Nov 5, 2024 · b55a4fe · b55a4fe
2 parents 836486f + ef182f0
commit b55a4fe
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 92 deletions.
diff --git a/...ig/apirig/testrunner/MosipTestRunner.java → ...jicertify/testrunner/MosipTestRunner.java b/...ig/apirig/testrunner/MosipTestRunner.java → ...jicertify/testrunner/MosipTestRunner.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testrunner;
+package io.mosip.testrig.apirig.injicertify.testrunner;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,12 +25,16 @@
 
 import io.mosip.testrig.apirig.dataprovider.BiometricDataProvider;
 import io.mosip.testrig.apirig.dbaccess.DBManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
 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.CertsUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
 import io.mosip.testrig.apirig.utils.JWKKeyUtil;
 import io.mosip.testrig.apirig.utils.KeyCloakUserAndAPIKeyGeneration;
 import io.mosip.testrig.apirig.utils.KeycloakUserManager;

diff --git a/...strig/apirig/testscripts/AddIdentity.java → .../injicertify/testscripts/AddIdentity.java b/...strig/apirig/testscripts/AddIdentity.java → .../injicertify/testscripts/AddIdentity.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
@@ -26,14 +26,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
 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.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -22,14 +22,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;

diff --git a/...stWithBodyAndQueryParamsForAutoGenId.java → ...stWithBodyAndQueryParamsForAutoGenId.java b/...stWithBodyAndQueryParamsForAutoGenId.java → ...stWithBodyAndQueryParamsForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -22,15 +22,15 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.AuthUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerTypes;
 import io.mosip.testrig.apirig.utils.ReportUtil;

diff --git a/...ig/testscripts/PostWithOnlyPathParam.java → ...fy/testscripts/PostWithOnlyPathParam.java b/...ig/testscripts/PostWithOnlyPathParam.java → ...fy/testscripts/PostWithOnlyPathParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;

diff --git a/...testscripts/PutWithPathParamsAndBody.java → ...testscripts/PutWithPathParamsAndBody.java b/...testscripts/PutWithPathParamsAndBody.java → ...testscripts/PutWithPathParamsAndBody.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;

diff --git a/...estrig/apirig/testscripts/SimplePost.java → ...g/injicertify/testscripts/SimplePost.java b/...estrig/apirig/testscripts/SimplePost.java → ...g/injicertify/testscripts/SimplePost.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;

diff --git a/...g/testscripts/SimplePostForAutoGenId.java → ...y/testscripts/SimplePostForAutoGenId.java b/...g/testscripts/SimplePostForAutoGenId.java → ...y/testscripts/SimplePostForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -24,14 +24,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;

diff --git a/.../SimplePostForAutoGenIdForUrlEncoded.java → .../SimplePostForAutoGenIdForUrlEncoded.java b/.../SimplePostForAutoGenIdForUrlEncoded.java → .../SimplePostForAutoGenIdForUrlEncoded.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 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.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;

diff --git a/...pirig/utils/InjiCertifyConfigManager.java → ...rtify/utils/InjiCertifyConfigManager.java b/...pirig/utils/InjiCertifyConfigManager.java → ...rtify/utils/InjiCertifyConfigManager.java
@@ -1,12 +1,13 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.injicertify.utils;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
 
-import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.injicertify.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.ConfigManager;
 
 public class InjiCertifyConfigManager extends ConfigManager{
 	private static final Logger LOGGER = Logger.getLogger(InjiCertifyConfigManager.class);

diff --git a/...testrig/apirig/utils/InjiCertifyUtil.java → ...ig/injicertify/utils/InjiCertifyUtil.java b/...testrig/apirig/utils/InjiCertifyUtil.java → ...ig/injicertify/utils/InjiCertifyUtil.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.injicertify.utils;
 
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
@@ -7,8 +7,12 @@
 import com.nimbusds.jose.jwk.RSAKey;
 
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
-import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.injicertify.testrunner.MosipTestRunner;
 import io.mosip.testrig.apirig.testrunner.OTPListener;
+import io.mosip.testrig.apirig.utils.AdminTestUtil;
+import io.mosip.testrig.apirig.utils.GlobalConstants;
+import io.mosip.testrig.apirig.utils.JWKKeyUtil;
+import io.mosip.testrig.apirig.utils.SkipTestCaseHandler;
 
 public class InjiCertifyUtil extends AdminTestUtil {
 

diff --git a/apitest/testNgXmlFiles/injicertifyPrerequisiteSuite.xml b/apitest/testNgXmlFiles/injicertifyPrerequisiteSuite.xml
@@ -12,7 +12,7 @@
 		<parameter name="ymlFile" value="injicertify/AddIdentity/AddIdentity.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.AddIdentity" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.AddIdentity" />
 		</classes>
 	</test>
 </suite>