Merge pull request #13519 from tharikaGitHub/test-fix

Fix test failure of ELKAnalyticsWithRespondMediatorTestCase
wso2 · Aug 7, 2024 · db283b3 · db283b3
2 parents 5ed84d8 + bd0ccc1
commit db283b3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/...tion-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIPublisherImpl.java b/...tion-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIPublisherImpl.java
@@ -2418,6 +2418,35 @@ public Map<String, String> getAllCommonOperationPolicies() throws ApiException {
  return null;
  }
 
+ /**
+ * Method to get all common operation policies passing limit, offset and query as parameters
+ *
+ * @param limit limit
+ * @param offset offset
+ * @param query query
+ * @return A map of policy name and policy UUID
+ * @throws ApiException - Throws if policy information cannot be retrieved.
+ */
+ public Map<String, String> getAllCommonOperationPolicies(Integer limit, Integer offset, String query)
+ throws ApiException {
+
+ setActivityID();
+ if (limit == null) {
+ limit = 50;
+ }
+ if (offset == null) {
+ offset = 0;
+ }
+ ApiResponse<OperationPolicyDataListDTO> apiResponse = operationPoliciesApi.getAllCommonOperationPoliciesWithHttpInfo(
+ limit, offset, query);
+ Assert.assertEquals(apiResponse.getStatusCode(), HttpStatus.SC_OK,
+ "Unable to retrieve common policies " + apiResponse.getData());
+ if (apiResponse != null && apiResponse.getData().getCount() >= 0) {
+ return mapPolicyNameToId(apiResponse.getData());
+ }
+ return null;
+ }
+
  public Map<String, String> getAllCommonOperationPolicies(int limit) throws ApiException {
 
  setActivityID();

diff --git a/...java/org/wso2/am/integration/tests/analytics/ELKAnalyticsWithRespondMediatorTestCase.java b/...java/org/wso2/am/integration/tests/analytics/ELKAnalyticsWithRespondMediatorTestCase.java
@@ -115,7 +115,7 @@ public void testELKAnalyticsWithRespondMediator() throws Exception {
 
  // Add common operation policy with respond mediator
  addNewOperationPolicy();
- Map<String, String> updatedCommonPolicyMap = restAPIPublisher.getAllCommonOperationPolicies();
+ Map<String, String> updatedCommonPolicyMap = restAPIPublisher.getAllCommonOperationPolicies(60, 0, null);
  Assert.assertNotNull(updatedCommonPolicyMap.get("respondMediatorPolicy"),
  "Unable to find the newly added common policy");