Fix integration test failures due to api change
Fix
package org.wso2.micro.integrator.api;
import org.json.JSONObject;
+import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
@@ -27,19 +28,23 @@ import java.io.IOException;
public class CarbonAppResourceTestCase extends ManagementAPITest {
private static String resourcePath = "applications";
+ private final static String ACTIVE_LIST = "activeList";
+ private final static String FAULTY_LIST = "faultyList";
+ private final static String TOTAL_COUNT = "totalCount";
@Test(groups = { "wso2.esb" }, description = "Test get carbon applications resource")
public void retrieveCApps() throws IOException {
JSONObject jsonResponse = sendHttpRequestAndGetPayload(resourcePath);
- verifyResourceCount(jsonResponse, 4);
- verifyResourceInfo(jsonResponse, new String[]{"FaultyCAppCompositeExporter", "hello-worldCompositeExporter"});
+ verifyTotalResourceCount(jsonResponse, 4);
+ verifyFaultyResourceInfo(jsonResponse, new String[]{"FaultyCAppCompositeExporter"});
+ verifyActiveResourceInfo(jsonResponse, new String[]{"hello-worldCompositeExporter"});
}
@Test(groups = { "wso2.esb" }, description = "Test get carbon applications resource for search key")
public void retrieveSearchedCApps() throws IOException {
JSONObject jsonResponse = sendHttpRequestAndGetPayload(resourcePath.concat("?searchKey=FaultyCApp"));
- verifyResourceCount(jsonResponse, 1);
- verifyResourceInfo(jsonResponse, new String[]{"FaultyCAppCompositeExporter"});
+ verifyTotalResourceCount(jsonResponse, 1);
+ verifyFaultyResourceInfo(jsonResponse, new String[]{"FaultyCAppCompositeExporter"});
}
@AfterClass(alwaysRun = true)
@@ -47,4 +52,22 @@ public class CarbonAppResourceTestCase extends ManagementAPITest {
super.cleanup();
}
+ protected void verifyTotalResourceCount(JSONObject jsonResponse, int expectedCount) {
+ Assert.assertEquals(jsonResponse.get(TOTAL_COUNT), expectedCount, "Assert Failed due to the mismatch of " +
+ "actual vs expected resource count");
+ }
+
+ protected void verifyActiveResourceInfo(JSONObject jsonResponse, String[] expectedResourceNames) {
+ for (String expectedResourceName : expectedResourceNames) {
+ Assert.assertTrue(jsonResponse.get(ACTIVE_LIST).toString().contains(expectedResourceName),
+ "Assert failed since expected resource name not found in the list");
+ }
+ }
+
+ protected void verifyFaultyResourceInfo(JSONObject jsonResponse, String[] expectedResourceNames) {
+ for (String expectedResourceName : expectedResourceNames) {
+ Assert.assertTrue(jsonResponse.get(FAULTY_LIST).toString().contains(expectedResourceName),
+ "Assert failed since expected resource name not found in the list");
+ }
+ }
}
