Merge pull request mosip#1584 from mohanachandran-s/develop_temp

MOSIP-35082 - Fixing non English failure test cases
jayesh12234 · Aug 23, 2024 · 614f4c6 · 614f4c6
2 parents f52dc23 + 216c9b0
commit 614f4c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java
@@ -740,4 +740,10 @@ public static String generateRandomNumberString(int length) {
 		}
 		return numericString.toString();
 	}
+
+	public static int getRecommendedHierarchyLevel() {
+		String recommendedHierarchLevel = getValueFromActuators(propsKernel.getProperty("actuatorMasterDataEndpoint"),
+				"/mosip-config/application-default.properties", "mosip.recommended.centers.locCode");
+		return Integer.parseInt(recommendedHierarchLevel);
+	}
 }
diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java
@@ -185,6 +185,7 @@ public class AdminTestUtil extends BaseTestCase {
 	public static final String AUTH_HEADER_VALUE = "Some String";
 	public static final String SIGNATURE_HEADERNAME = GlobalConstants.SIGNATURE;
 	public static String updatedPolicyId = "";
+	public static String currentLanguage;
 //	public static BioDataUtility bioDataUtil = new BioDataUtility();
 //
 //	public static BioDataUtility getBioDataUtil() {
@@ -6965,6 +6966,7 @@ public static void getLocationData() {
 		JSONObject responseJson = null;
 		String url = ApplnURI + props.getProperty("fetchLocationData");
 		String token = kernelAuthLib.getTokenByRole(GlobalConstants.ADMIN);
+		int recommendedHierarchyLevel = getRecommendedHierarchyLevel();
 		try {
 			response = RestClient.getRequestWithCookie(url, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON,
 					GlobalConstants.AUTHORIZATION, token);
@@ -6975,15 +6977,21 @@ public static void getLocationData() {
 				JSONObject responseObject = responseJson.getJSONObject("response");
 				JSONArray data = responseObject.getJSONArray("data");
 
+				if (!(languageList.size() > 1)) {
+					currentLanguage = BaseTestCase.languageList.get(0);
+				}
+
 				for (int i = 0; i < data.length(); i++) {
 					JSONObject entry = data.getJSONObject(i);
 					String langCode = entry.getString("langCode");
-
-					if (BaseTestCase.languageList.get(0).equals(langCode)) {
-						hierarchyName = entry.getString("hierarchyName");
-						hierarchyLevel = entry.getInt("hierarchyLevel");
-						parentLocCode = entry.optString("parentLocCode", "");
-						break;
+					hierarchyLevel = entry.getInt("hierarchyLevel");
+
+					if (hierarchyLevel == recommendedHierarchyLevel) {
+						if (currentLanguage.equals(langCode)) {
+							hierarchyName = entry.getString("hierarchyName");
+							parentLocCode = entry.optString("parentLocCode", "");
+							break;
+						}
 					}
 				}