Merge pull request #371 from nandhu-kumar/develop

MOSIP-33845

apitest/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java

@@ -86,55 +86,16 @@ public static void main(String[] arg) {
 
 			List<String> localLanguageList = new ArrayList<>(BaseTestCase.getLanguageList());
 			AdminTestUtil.getLocationData();
-
-			String partnerKeyURL = "";
-			String updatedPartnerKeyURL = "";
-			String ekycPartnerKeyURL = "";
-
+
+			// Generate device certificates to be consumed by Mock-MDS
 			PartnerRegistration.deleteCertificates();
-			CertificateGenerationUtil.getThumbprints();
 			AdminTestUtil.createAndPublishPolicy();
 			AdminTestUtil.createEditAndPublishPolicy();
-			partnerKeyURL = PartnerRegistration.generateAndGetPartnerKeyUrl();
-			updatedPartnerKeyURL = PartnerRegistration.generateAndGetUpdatedPartnerKeyUrl();
+			PartnerRegistration.deviceGeneration();
 
-			AdminTestUtil.createAndPublishPolicyForKyc();
-			ekycPartnerKeyURL = PartnerRegistration.generateAndGetEkycPartnerKeyUrl();
-
 			BiometricDataProvider.generateBiometricTestData("Registration");
 
-
-			if (BaseTestCase.listOfModules.contains(GlobalConstants.MASTERDATA)) {
-				AdminTestUtil.getHierarchyZoneCode();
-				BaseTestCase.mapUserToZone();
-				BaseTestCase.mapZone();
-				AdminTestUtil.getLocationLevelData();
-				AdminTestUtil.getLocationData();
-				AdminTestUtil.getZoneName();
-
-
-
-				for (int i = 0; i < localLanguageList.size(); i++) {
-					BaseTestCase.languageList.clear();
-					BaseTestCase.languageList.add(localLanguageList.get(i));
-
-					DBManager.clearMasterDbData();
-					BaseTestCase.currentModule = GlobalConstants.MASTERDATA;
-					BaseTestCase.setReportName("masterdata-" + localLanguageList.get(i));
-					startTestRunner();
-
-				}
-
-			} else if (BaseTestCase.listOfModules.contains("auth")
-					|| BaseTestCase.listOfModules.contains(GlobalConstants.ESIGNET)) {
-				if (partnerKeyURL.isEmpty())
-				//	if (partnerKeyURL.isEmpty() || ekycPartnerKeyURL.isEmpty())
-					LOGGER.error("partnerKeyURL is null");
-				else
-					startTestRunner();
-			} else {
-				startTestRunner();
-			}
+			startTestRunner();
 		} catch (Exception e) {
 			LOGGER.error("Exception " + e.getMessage());
 		}

apitest/src/main/resources/config/idaCertDataDeleteQueries.txt

@@ -0,0 +1,8 @@
+#####  DB queries to be executed to tear down the data used and generated during the test rig run
+
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_ekyc_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_device_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_ftm_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=partnernameforautomationesi%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=partnernameforesignet%'

apitest/src/main/resources/config/keyManagerDataDeleteQueriesForEsignet.txt → apitest/src/main/resources/config/keyManagerCertDataDeleteQueries.txt

@@ -1,14 +1,14 @@
 #####  DB queries to be executed to tear down the data used and generated during the test rig run
 
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mosip_partnerorg%'
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mosip_ekyc_partner%'
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mosip_deviceorg%'
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mosip_ftmorg%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_ekyc_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_device_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_ftm_pid%'
 delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=partnernameforautomationesi%'
 delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=partnernameforesignet%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mosip_partnerorg%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mosip_ekyc_partner%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mosip_deviceorg%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mosip_ftmorg%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mimoto_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mimoto_ekyc_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mimoto_device_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=mimoto_ftm_pid%'
 delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=partnernameforautomationesi%'
 delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=partnernameforesignet%'

apitest/src/main/resources/config/masterDataCertDataDeleteQueries.txt

@@ -0,0 +1,8 @@
+#####  DB queries to be executed to tear down the data used and generated during the test rig run
+
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_ekyc_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_device_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=mimoto_ftm_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=partnernameforautomationesi%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=partnernameforesignet%'

apitest/src/main/resources/mimoto/GetAllIssuers/GetAllIssuers.yml

@@ -12,7 +12,7 @@ GetAllIssuers:
 }'
 
    Mimoto_GetAllIssuers_Specific_Issuer_All_Valid_Smoke:
-      endPoint: /v1/mimoto/issuers/Mosip
+      endPoint: /residentmobileapp/issuers/Mosip
       role: resident
       restMethod: get
       checkErrorsOnlyInResponse: true