MOSIP-35628: Check and report CAPTCHA status only once during test execution. (mosip#370)

* MOSIP-40258

Signed-off-by: SradhaMohanty5899 <[email protected]>

* MOSIP-28246 Removed unused variables from injicertify module

Signed-off-by: SradhaMohanty5899 <[email protected]>

* MOSIP-28246 Removed commented unused variables

Signed-off-by: SradhaMohanty5899 <[email protected]>

* MOSIP-35628 API - Capture info in the report whether Captcha is enabled on the target env or not

Signed-off-by: SradhaMohanty5899 <[email protected]>

* MOSIP-35628

Signed-off-by: SradhaMohanty5899 <[email protected]>

* MOSIP-35628 Changed SNAPSHOT version

Signed-off-by: SradhaMohanty5899 <[email protected]>

* DSD-8335

Signed-off-by: SradhaMohanty5899 <[email protected]>

* Removed previously added dependancy

Signed-off-by: SradhaMohanty5899 <[email protected]>

* Removed danubtech repository from Pom

Signed-off-by: SradhaMohanty5899 <[email protected]>

* Check and report CAPTCHA status only once during test execution.

Signed-off-by: SradhaMohanty5899 <[email protected]>

* Removed getValueFromEsignetActuator() method

Signed-off-by: SradhaMohanty5899 <[email protected]>

---------

Signed-off-by: SradhaMohanty5899 <[email protected]>

Author: SradhaMohanty5899

api-test/pom.xml

@@ -68,7 +68,7 @@
 		<dependency>
 			<groupId>io.mosip.testrig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
-			<version>1.3.3-SNAPSHOT</version>
+			<version>1.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.openjson</groupId>

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

@@ -80,6 +80,7 @@ public static void main(String[] arg) {
 			suiteSetup(getRunType());
 			SkipTestCaseHandler.loadTestcaseToBeSkippedList("testCaseSkippedList.txt");
 			GlobalMethods.setModuleNameAndReCompilePattern(InjiCertifyConfigManager.getproperty("moduleNamePattern"));
+			GlobalMethods.reportCaptchaStatus(GlobalConstants.CAPTCHA_ENABLED, false);
 			setLogLevels();
 
 			useCaseToExecute = InjiCertifyConfigManager.getproperty("useCaseToExecute");

api-test/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyUtil.java

@@ -513,44 +513,6 @@ public static String replaceKeywordValue(String jsonString, String keyword, Stri
 		}
 	}
 
-	public static JSONArray esignetActuatorResponseArray = null;
-
-	public static String getValueFromEsignetActuator(String section, String key) {
-		String url = InjiCertifyConfigManager.getEsignetBaseUrl() + InjiCertifyConfigManager.getproperty("actuatorEsignetEndpoint");
-		String actuatorCacheKey = url + section + key;
-		String value = actuatorValueCache.get(actuatorCacheKey);
-		if (value != null && !value.isEmpty())
-			return value;
-
-		try {
-			if (esignetActuatorResponseArray == null) {
-				Response response = null;
-				JSONObject responseJson = null;
-				response = RestClient.getRequest(url, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON);
-				responseJson = new JSONObject(response.getBody().asString());
-				esignetActuatorResponseArray = responseJson.getJSONArray("propertySources");
-			}
-
-			for (int i = 0, size = esignetActuatorResponseArray.length(); i < size; i++) {
-				JSONObject eachJson = esignetActuatorResponseArray.getJSONObject(i);
-				if (eachJson.get("name").toString().contains(section)) {
-					value = eachJson.getJSONObject(GlobalConstants.PROPERTIES).getJSONObject(key)
-							.get(GlobalConstants.VALUE).toString();
-					if (InjiCertifyConfigManager.IsDebugEnabled())
-						logger.info("Actuator: " + url + " key: " + key + " value: " + value);
-					break;
-				}
-			}
-			actuatorValueCache.put(actuatorCacheKey, value);
-
-			return value;
-		} catch (Exception e) {
-			logger.error(GlobalConstants.EXCEPTION_STRING_2 + e);
-			return value;
-		}
-
-	}
-	
 	public static Map<String, List<String>> proofSigningAlgorithmsMap = new HashMap<>();
 
 	public static String getJsonFromInjiCertifyWellKnownEndPoint() {
@@ -875,8 +837,6 @@ public static TestCaseDTO isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
 		if (isCaptchaEnabled() == true) {
 			GlobalMethods.reportCaptchaStatus(GlobalConstants.CAPTCHA_ENABLED, true);
 			throw new SkipException(GlobalConstants.CAPTCHA_ENABLED_MESSAGE);
-		}else {
-			GlobalMethods.reportCaptchaStatus(GlobalConstants.CAPTCHA_ENABLED, false);
 		}
 
 		if (MosipTestRunner.skipAll == true) {