Remove super.cleanUp

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java

@@ -169,6 +169,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiID);
         userManagementClient.deleteUser(newUser);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java

@@ -239,7 +239,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
 
-        super.cleanUp();
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java

@@ -118,6 +118,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java

@@ -131,7 +131,6 @@ public void testAPIPublishing() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java

@@ -486,7 +486,6 @@ public void cleanUpArtifacts() throws Exception {
         deleteAPI(apiVisibilityByRoleId, apiPublisherClientCarbonSuperAdmin);
         userManagementClient1.deleteUser(CARBON_SUPER_SUBSCRIBER_USERNAME);
         userManagementClient2.deleteUser(TENANT_SUBSCRIBER_USERNAME);
-        super.cleanUp();
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfBlockAPITestCase.java

@@ -155,7 +155,6 @@ public void testInvokeAPIAfterChangeAPILifecycleToBlock() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithOutReSubscriptionTestCase.java

@@ -174,7 +174,5 @@ public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(newApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
-
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithReSubscriptionTestCase.java

@@ -232,8 +232,6 @@ public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(newApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
-
-        super.cleanUp();
     }
 
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfRetireAPITestCase.java

@@ -172,7 +172,6 @@ public void testInvokeAPIAfterChangeAPILifecycleToRetired() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java

@@ -606,7 +606,6 @@ public void cleanUpArtifacts() throws Exception {
             undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
             restAPIPublisher.deleteAPI(apiId);
         }
-        super.cleanUp();
     }
 
     private void validateIntrospectionResponse(User user, String accessToken, String clientId) throws Exception {

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AudienceValidationTestCase.java

@@ -357,7 +357,6 @@ public void testInvokeApiWithAudienceValidationPass() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         undeployAndDeleteAPIProductRevisionsUsingRest(apiProductDTO.getId(), restAPIPublisher);
-        super.cleanUp();
         userManagementClient.deleteUser(STANDARD_SUBSCRIBER);
     }
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAPITagsTestCase.java

@@ -138,7 +138,6 @@ public void testUpdateTagsAndFilterByTags() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeApplicationTierAndTestInvokingTestCase.java

@@ -212,7 +212,6 @@ public void cleanUpArtifacts() throws Exception {
         apiStoreClientUser1.removeAPISubscriptionByApplicationName (API_NAME, API_VERSION_1_0_0, providerName, applicationNameSilver);
         apiStoreClientUser1.removeApplication(applicationNameSilver);
         deleteAPI(apiIdentifier, apiPublisherClientUser1);
-        super.cleanUp();
     }
 
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAuthTypeOfResourceTestCase.java

@@ -280,7 +280,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityOfAPITestCase.java

@@ -227,6 +227,5 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.removeApplicationById(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiID, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java

@@ -514,7 +514,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.removeApplicationById(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiID, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 
     private void validateIntrospectionResponse(User user, String accessToken, String clientId) throws UnsupportedEncodingException {

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/CustomLifeCycleTestCase.java

@@ -118,6 +118,5 @@ public void testCustomLifeCycle() throws Exception {
     public void cleanupArtifacts() throws Exception {
         //Remove test api and revert to original lifecycle config
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/DynamicAPIContextTestCase.java

@@ -173,7 +173,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIAndCheckUpdatedInformationTestCase.java

@@ -134,8 +134,6 @@ public void testUpdatedAPIInformationFromAPIPublisher() throws APIManagerIntegra
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
-
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIContextAndCheckAccessibilityTestCase.java

@@ -212,7 +212,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/RegistryLifeCycleInclusionTest.java

@@ -215,6 +215,5 @@ public void testLCStateChangeVisibility() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/UpdateAPINullPointerTestCase.java

@@ -98,7 +98,6 @@ public void testBadRequestWithEndpointConfigAsNull() throws APIManagerIntegratio
     @AfterClass(alwaysRun = true)
     public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java

@@ -18,7 +18,6 @@
 
 package org.wso2.am.integration.tests.api.revision;
 
-import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
@@ -28,7 +27,6 @@
 import org.testng.annotations.Test;
 import org.wso2.am.integration.clients.publisher.api.v1.dto.APIDTO;
 import org.wso2.am.integration.clients.publisher.api.v1.dto.APIProductDTO;
-import org.wso2.am.integration.clients.publisher.api.v1.dto.APIRevisionListDTO;
 import org.wso2.am.integration.test.Constants;
 import org.wso2.am.integration.test.impl.ApiProductTestHelper;
 import org.wso2.am.integration.test.impl.ApiTestHelper;
@@ -55,6 +53,7 @@ public class APIProductRevisionTestCase extends APIMIntegrationBaseTest {
     private ApiProductTestHelper apiProductTestHelper;
     protected static final String TIER_UNLIMITED = "Unlimited";
     protected static final String TIER_GOLD = "Gold";
+    List<APIDTO> apisToBeUsed = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
     public void setEnvironment() throws Exception {
@@ -68,7 +67,6 @@ public void setEnvironment() throws Exception {
     @Test(groups = {"wso2.am"}, description = "API Product Revision create test case")
     public void testAddingAPIProductRevision() throws Exception {
         // Pre-Conditions : Create APIs
-        List<APIDTO> apisToBeUsed = new ArrayList<>();
 
         apisToBeUsed.add(apiTestHelper.
                 createApiOne(getBackendEndServiceEndPointHttp("wildcard/resources")));
@@ -105,7 +103,7 @@ public void testAddingAPIProductRevision() throws Exception {
     @Test(groups = {"wso2.am"}, description = "Check the availability of API Product Revision in publisher before deploying.",
             dependsOnMethods = "testAddingAPIProductRevision")
     public void testGetAPIProductRevisions() throws Exception {
-        HttpResponse apiRevisionsGetResponse = restAPIPublisher.getAPIProductRevisions(apiId,null);
+        HttpResponse apiRevisionsGetResponse = restAPIPublisher.getAPIProductRevisions(apiId, null);
         assertEquals(apiRevisionsGetResponse.getResponseCode(), HTTP_RESPONSE_CODE_OK,
                 "Unable to retrieve revisions" + apiRevisionsGetResponse.getData());
         List<JSONObject> revisionList = new ArrayList<>();
@@ -115,7 +113,7 @@ public void testGetAPIProductRevisions() throws Exception {
         for (int i = 0, l = arrayList.length(); i < l; i++) {
             revisionList.add(arrayList.getJSONObject(i));
         }
-        for (JSONObject revision :revisionList) {
+        for (JSONObject revision : revisionList) {
             revisionUUID = revision.getString("id");
         }
         assertNotNull(revisionUUID, "Unable to retrieve revision UUID");
@@ -131,7 +129,7 @@ public void testDeployAPIProductRevisions() throws Exception {
         apiRevisionDeployRequest.setDisplayOnDevportal(true);
         apiRevisionDeployRequestList.add(apiRevisionDeployRequest);
         HttpResponse apiRevisionsDeployResponse = restAPIPublisher.deployAPIProductRevision(apiId, revisionUUID,
-                apiRevisionDeployRequestList,"APIProduct");
+                apiRevisionDeployRequestList, "APIProduct");
         assertEquals(apiRevisionsDeployResponse.getResponseCode(), HTTP_RESPONSE_CODE_CREATED,
                 "Unable to deploy API Product Revisions:" + apiRevisionsDeployResponse.getData());
     }
@@ -174,6 +172,9 @@ public void testDeleteAPIProductRevision() throws Exception {
 
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
-        super.cleanUp();
+        restAPIPublisher.deleteAPI(apiId);
+        for (APIDTO api : apisToBeUsed) {
+            restAPIPublisher.deleteAPI(api.getId());
+        }
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/apiproduct/APIProductCreationTestCase.java

@@ -815,7 +815,6 @@ public void cleanUpArtifacts() throws Exception {
 
         restAPIPublisher.deleteAPI(apiID1);
         restAPIPublisher.deleteAPI(apiID2);
-        super.cleanUp();
         userManagementClient.deleteUser(RESTRICTED_SUBSCRIBER);
         userManagementClient.deleteUser(STANDARD_SUBSCRIBER);
         userManagementClient.deleteRole(RESTRICTED_ROLE);

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java

@@ -163,7 +163,6 @@ public void testApplicationUpdateValidIpAsCallBackURL() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         apiStore.removeApplication(appName);
-        super.cleanUp();
     }
 
     @DataProvider

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java

@@ -98,7 +98,6 @@ public void testRegenerateConsumerSecret() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
-        super.cleanUp();
     }
 
     @DataProvider

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java

@@ -144,12 +144,6 @@ public void testAPIKeyRevocationBySharedUser()
         restAPIStoreClientUser2.revokeAPIKey(userOneSharedApplicationId, key.getApikey());
     }
 
-    @AfterClass(alwaysRun = true)
-    public void destroy() throws Exception {
-        restAPIStoreClientUser2.removeApplicationById(userTwoApplicationId);
-        super.cleanUp();
-    }
-
     private void createUsersAndApplications() throws Exception {
         //signup of user one
         UserManagementUtils.signupUser(USER_ONE, PASSWORD, FIRST_NAME, ORGANIZATION);
@@ -176,4 +170,9 @@ private void createUsersAndApplications() throws Exception {
                 ApplicationDTO.TokenTypeEnum.JWT, groups);
         userOneSharedApplicationId = appCreationResponse3.getData();
     }
+
+    @AfterClass(alwaysRun = true)
+    public void destroy() throws Exception {
+        restAPIStoreClientUser2.removeApplicationById(userTwoApplicationId);
+    }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java

@@ -659,6 +659,5 @@ public void testVerifyPublisherAdminDeleteCommentTest() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/PublisherCommentTest.java

@@ -630,6 +630,5 @@ public void testVerifyDevPortalAdminDeleteCommentTest() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionTestCase.java

@@ -880,6 +880,5 @@ public void destroyAPIs() throws Exception {
         tenant2UserStoreManager.deleteRole("role1");
         tenantManagementServiceClient.deleteTenant(tenant1Name);
         tenantManagementServiceClient.deleteTenant(tenant2Name);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlSubscriptionTestCase.java

@@ -1074,6 +1074,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(depthAppId);
         restAPIStore.deleteApplication(throttleAppId);
         undeployAndDeleteAPIRevisionsUsingRest(graphqlApiId, restAPIPublisher);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlTestCase.java

@@ -493,6 +493,5 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(testAppId4);
         undeployAndDeleteAPIRevisionsUsingRest(graphqlAPIId, restAPIPublisher);
         restAPIPublisher.deleteAPI(graphqlAPIId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphqlqueryanalysis/GraphQLQueryAnalysisTest.java

@@ -301,6 +301,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(tokenTestApiAppId);
         undeployAndDeleteAPIRevisionsUsingRest(graphqlApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(graphqlApiId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSAccessControlAllowCredentialsHeaderTestCase.java

@@ -192,7 +192,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
     @DataProvider

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSHeadersTestCase.java

@@ -316,8 +316,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-
-        super.cleanUp();
     }
 
     @DataProvider

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/FederatedUserJWTTestCase.java

@@ -498,7 +498,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(jwtApplicationId);
         restAPIPublisher.deleteAPI(apiId);
         identityProviderMgtClient.deleteIdp("federated-idp");
-        super.cleanUp();
 
     }
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTGrantTestCase.java

@@ -390,6 +390,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(jwtApplicationId);
         identityProviderMgtServiceClient.deleteIdP(jwtIssuer);
         restAPIPublisher.removeSharedScope(scopeId);
-        super.cleanUp();
     }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTTestCase.java

@@ -489,7 +489,6 @@ public void destroy() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(api2Id, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(api2Id);
-        super.cleanUp();
 
     }
 

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/idp/ExternalIDPJWTTestCase.java

@@ -762,7 +762,6 @@ public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         undeployAndDeleteAPIRevisionsUsingRest(apiIdOnlyKm1, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiIdOnlyKm1);
-        super.cleanUp();
     }
 
     @DataProvider

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/jwtdecoding/JWTDecodingTestCase.java

@@ -164,8 +164,6 @@ public void testJWTDecodingforCustomApplication() throws Exception {
         restAPIStore.deleteApplication(decodingApplicationId);
         undeployAndDeleteAPIRevisionsUsingRest(decodingApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(decodingApiId);
-        super.cleanUp();
-
     }
 
     private void createUser()