diff --git a/modules/distribution/product/src/main/conf/log4j2.properties b/modules/distribution/product/src/main/conf/log4j2.properties index a422846323..34d3755589 100644 --- a/modules/distribution/product/src/main/conf/log4j2.properties +++ b/modules/distribution/product/src/main/conf/log4j2.properties @@ -493,5 +493,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org. logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false - -category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER diff --git a/modules/distribution/product/src/main/conf/synapse-configs/default/api/_OpenService_.xml b/modules/distribution/product/src/main/conf/synapse-configs/default/api/_OpenService_.xml deleted file mode 100644 index 191e86bb73..0000000000 --- a/modules/distribution/product/src/main/conf/synapse-configs/default/api/_OpenService_.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/integration/tests-common/framework-extensions/src/main/java/org/wso2/am/framework/extensions/APIMCarbonServerExtension.java b/modules/integration/tests-common/framework-extensions/src/main/java/org/wso2/am/framework/extensions/APIMCarbonServerExtension.java index d00bf890fc..ae7f7fdac1 100644 --- a/modules/integration/tests-common/framework-extensions/src/main/java/org/wso2/am/framework/extensions/APIMCarbonServerExtension.java +++ b/modules/integration/tests-common/framework-extensions/src/main/java/org/wso2/am/framework/extensions/APIMCarbonServerExtension.java @@ -35,6 +35,7 @@ import org.wso2.carbon.integration.common.utils.FileManager; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import javax.xml.xpath.XPathExpressionException; @@ -116,6 +117,12 @@ public void configureServer() throws AutomationFrameworkException { + "deployment" + File.separator + "server" + File.separator + "synapse-configs" + File.separator + "default" + File.separator + "api"; + try { + FileManager.readFile(synapseApiPath); + } catch (FileNotFoundException e) { + new File(synapseApiPath).mkdirs(); + } + FileManager.copyFile(new File( resourcePath + File.separator + "synapseconfigs" + File.separator + "rest" + File.separator + "BackEndSecurity.xml"), synapseApiPath + File.separator + "BackEndSecurity.xml"); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java index e227b3dc22..7266ee9399 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java +++ b/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(); } } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java index 45ce1e7a25..f75dc6eb30 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java +++ b/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(); } } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java index fe35d326c0..c8823f1bd5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java +++ b/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(); } } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java index 86f060ce69..9f0a08b42a 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java +++ b/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(); } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java index 6fb5b27c44..18e08c4add 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java +++ b/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(); } } \ No newline at end of file diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java index d24e36c41f..5650cdddbc 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java +++ b/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 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 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 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()); + } } } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java index a6fbb5d782..de743884e0 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java +++ b/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 diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java index 123c8c675e..2fab7751c3 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java +++ b/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 diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java index cf3c85c829..b0f651a741 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java +++ b/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); + } } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java index 7d5037a4e5..d79387e6e3 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java +++ b/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(); } } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java index ecfc066b3e..1471749ad2 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java @@ -166,6 +166,5 @@ private String apiContextResolver(String context, String version) { public void destroy() throws Exception { restAPIAdmin.deleteDenyThrottlingPolicy(blockingCondition1ID); restAPIAdmin.deleteDenyThrottlingPolicy(blockingCondition2ID); - super.cleanUp(); } } \ No newline at end of file diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/ElkAnalytics/log4j2.properties b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/ElkAnalytics/log4j2.properties index eca63e4b12..ea92e5caf9 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/ElkAnalytics/log4j2.properties +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/ElkAnalytics/log4j2.properties @@ -493,5 +493,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org. logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false - -category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties index 9bd521b739..981efc5b7b 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties @@ -497,5 +497,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org. logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false - -category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties.old b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties.old index 6a6c686e03..45e7000ed2 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties.old +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties.old @@ -452,5 +452,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org. logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false - -category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties index 8eae22170b..e0b2f3c8e3 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties @@ -476,5 +476,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org. logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false - -category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties b/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties index 8eae22170b..e0b2f3c8e3 100644 --- a/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties +++ b/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties @@ -476,5 +476,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org. logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false - -category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER