MOSIP-36275 - Fixed automation issue for Upload certificate api and g…

…et MISP License api (#951) * MOSIP-36555 - Removed the OTPListener initializing and cleaned up Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-36275 - Fixed automation failures Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-36275 - Added output validation for get misp api Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]>
mosip · Oct 24, 2024 · c2cbcef · c2cbcef
1 parent d52b689
commit c2cbcef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
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
@@ -108,22 +108,19 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
 		}
 
 		else {
-				response = getWithPathParamAndCookie(ApplnURI + testCaseDTO.getEndPoint(),
-						getJsonFromTemplate(testCaseDTO.getInput(), testCaseDTO.getInputTemplate()), auditLogCheck,
-						COOKIENAME, testCaseDTO.getRole(), testCaseDTO.getTestCaseName());
-			}
-			Map<String, List<OutputValidationDto>> ouputValid = null;
-			if (testCaseName.contains("_StatusCode")) {
+			response = getWithPathParamAndCookie(ApplnURI + testCaseDTO.getEndPoint(),
+					getJsonFromTemplate(testCaseDTO.getInput(), testCaseDTO.getInputTemplate()), auditLogCheck,
+					COOKIENAME, testCaseDTO.getRole(), testCaseDTO.getTestCaseName());
+		}
+		Map<String, List<OutputValidationDto>> ouputValid = null;
 
-				ouputValid = OutputValidationUtil.doJsonOutputValidation(response.asString(),
-						getJsonFromTemplate(testCaseDTO.getOutput(), testCaseDTO.getOutputTemplate()), testCaseDTO,
-						response.getStatusCode());
-
+		ouputValid = OutputValidationUtil.doJsonOutputValidation(response.asString(),
+				getJsonFromTemplate(testCaseDTO.getOutput(), testCaseDTO.getOutputTemplate()), testCaseDTO,
+				response.getStatusCode());
 
-			Reporter.log(ReportUtil.getOutputValidationReport(ouputValid));
-			if (!OutputValidationUtil.publishOutputResult(ouputValid))
-				throw new AdminTestException("Failed at output validation");
-		}
+		Reporter.log(ReportUtil.getOutputValidationReport(ouputValid));
+		if (!OutputValidationUtil.publishOutputResult(ouputValid))
+			throw new AdminTestException("Failed at output validation");
 	}
 
 	/**

diff --git a/.../src/main/resources/partner/MispLicense/GetMISPLicenseByMispID/GetMISPLicenseByMispID.yml b/.../src/main/resources/partner/MispLicense/GetMISPLicenseByMispID/GetMISPLicenseByMispID.yml
@@ -6,17 +6,15 @@ GetMISPLicenseByMispID:
       role: partner
       restMethod: get
       inputTemplate: partner/MispLicense/GetMISPLicenseByMispID/getMISPLicenseByMispID
-      outputTemplate: partner/error
+      outputTemplate: partner/MispLicense/GetMISPLicenseByMispID/getMISPLicenseByMispIDResult
       input: '{
     "mispId": "MISP-AUTOMATION"
 }'
       output: '{
-    "errors": [
-    {
-      "errorCode": "PMS_MSP_413"
-    }
-  ]
+    "providerId": "MISP-AUTOMATION",
+    "licenseKeyStatus": "De-active"
     }'
+
    Partner_GetMISPLicenseByMispID__Active_allValid_smoke:
       endPoint: /v1/partnermanager/misps/{mispId}/licenseKey
       uniqueIdentifier: TC_PMS_GetMISPLicenseByMispID_02
@@ -29,8 +27,10 @@ GetMISPLicenseByMispID:
     "mispId": "MISP2-AUTOMATION"
 }'
       output: '{
-    "providerId": "MISP2-AUTOMATION"
+    "providerId": "MISP2-AUTOMATION",
+    "licenseKeyStatus": "Active"
     }'
+
    Partner_GetMISPLicenseByMispID_inValid_smoke:
       endPoint: /v1/partnermanager/misps/{mispId}/licenseKey
       uniqueIdentifier: TC_PMS_GetMISPLicenseByMispID_03

diff --git a/...ain/resources/partner/MispLicense/GetMISPLicenseByMispID/getMISPLicenseByMispIDResult.hbs b/...ain/resources/partner/MispLicense/GetMISPLicenseByMispID/getMISPLicenseByMispIDResult.hbs
@@ -1,5 +1,6 @@
 {
   "response": {
-    "providerId": "{{providerId}}"
+    "providerId": "{{providerId}}",
+    "licenseKeyStatus": "{{licenseKeyStatus}}"
   }
 }
diff --git a/api-test/src/main/resources/partner/authPartner/UploadCertificate/UploadCertificate.yml b/api-test/src/main/resources/partner/authPartner/UploadCertificate/UploadCertificate.yml
@@ -20,7 +20,7 @@ uploadCACert:
       role: partner
       checkErrorsOnlyInResponse: true
       restMethod: post
-      inputTemplate: partner/authPartner/UploadCertificate/uploadCertificate
+      inputTemplate: partner/authPartner/UploadCertificate/uploadCertificateFTM
       outputTemplate: partner/authPartner/UploadCertificate/uploadCertificateResult
       input: '{
     "requesttime": "$TIMESTAMP$"