Merge pull request #446 from nandhu-kumar/develop

MOSIP-37942 | Updated delete query file name

api-test/src/main/java/io/mosip/testrig/apirig/signup/testrunner/MosipTestRunner.java

@@ -148,13 +148,13 @@ public static void suiteSetup(String runType) {
 		BaseTestCase.certsForModule = GlobalConstants.SIGNUP;
 		DBManager.executeDBQueries(SignupConfigManager.getKMDbUrl(), SignupConfigManager.getKMDbUser(),
 				SignupConfigManager.getKMDbPass(), SignupConfigManager.getKMDbSchema(),
-				getGlobalResourcePath() + "/" + "config/keyManagerDataDeleteQueriesForEsignet.txt");
+				getGlobalResourcePath() + "/" + "config/keyManagerCertDataDeleteQueries.txt");
 		DBManager.executeDBQueries(SignupConfigManager.getIdaDbUrl(), SignupConfigManager.getIdaDbUser(),
 				SignupConfigManager.getPMSDbPass(), SignupConfigManager.getIdaDbSchema(),
-				getGlobalResourcePath() + "/" + "config/idaDeleteQueriesForEsignet.txt");
+				getGlobalResourcePath() + "/" + "config/idaCertDataDeleteQueries.txt");
 		DBManager.executeDBQueries(SignupConfigManager.getMASTERDbUrl(), SignupConfigManager.getMasterDbUser(),
 				SignupConfigManager.getMasterDbPass(), SignupConfigManager.getMasterDbSchema(),
-				getGlobalResourcePath() + "/" + "config/masterDataDeleteQueriesForEsignet.txt");
+				getGlobalResourcePath() + "/" + "config/masterDataCertDataDeleteQueries.txt");
 		AdminTestUtil.initiateSignupTest();
 		BaseTestCase.otpListener = new OTPListener();
 		BaseTestCase.otpListener.run();

api-test/src/main/resources/config/idaCertDataDeleteQueries.txt

@@ -1,8 +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=esignet_pid%'
-delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=esignet_ekyc_pid%'
-delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=esignet_device_pid%'
-delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=esignet_ftm_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=signup_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=signup_ekyc_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=signup_device_pid%'
+delete from ida.ca_cert_store WHERE cert_subject LIKE '%O=signup_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%'

api-test/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=esignet_pid%'
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=esignet_ekyc_pid%'
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=esignet_device_pid%'
-delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=esignet_ftm_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=signup_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=signup_ekyc_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=signup_device_pid%'
+delete from mosip_keymgr.keymgr.ca_cert_store WHERE cert_subject LIKE '%O=signup_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=esignet_pid%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=esignet_ekyc_pid%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=esignet_device_pid%'
-delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=esignet_ftm_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=signup_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=signup_ekyc_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=signup_device_pid%'
+delete from mosip_keymgr.keymgr.partner_cert_store WHERE cert_subject LIKE '%O=signup_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%'

api-test/src/main/resources/config/masterDataCertDataDeleteQueries.txt

@@ -1,8 +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=esignet_pid%'
-delete from master.ca_cert_store WHERE cert_subject LIKE '%O=esignet_ekyc_pid%'
-delete from master.ca_cert_store WHERE cert_subject LIKE '%O=esignet_device_pid%'
-delete from master.ca_cert_store WHERE cert_subject LIKE '%O=esignet_ftm_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=signup_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=signup_ekyc_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=signup_device_pid%'
+delete from master.ca_cert_store WHERE cert_subject LIKE '%O=signup_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%'