Merge pull request #13294 from chamilaadhi/test-imp

Improve tests
wso2 · Nov 15, 2023 · a7029f1 · a7029f1
2 parents b460966 + b763a34
commit a7029f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/...egration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java b/...egration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java
@@ -105,6 +105,10 @@ public RestAPIAdminImpl(String username, String password, String tenantDomain, S
                 "apim:api_workflow_approve " +
                 "apim:admin_operation " +
                 "apim:policies_import_export" +
+                "apim:keymanagers_manage" +
+                "apim:api_category" +
+                "apim:admin_tier_view" +
+                "apim:admin_tier_manage" +
                 "apim:scope_manage";
 
         String accessToken = ClientAuthenticator

diff --git a/...rg/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionUpdateTestCase.java b/...rg/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionUpdateTestCase.java
@@ -110,7 +110,7 @@ public void testCreateNewApplicationAndGenerateTokenSubscribedApplication() thro
         ArrayList<String> grantTypes = new ArrayList<>();
         grantTypes.add(APIMIntegrationConstants.GRANT_TYPE.PASSWORD);
         grantTypes.add(APIMIntegrationConstants.GRANT_TYPE.CLIENT_CREDENTIAL);
-        restAPIAdmin.getKeyManagers();  // Due to the issue: https://github.com/wso2/product-apim/issues/12634
+        //restAPIAdmin.getKeyManagers();  // Due to the issue: https://github.com/wso2/product-apim/issues/12634
         tenant3AppTenant3Store = restAPIStore.generateKeys(tenant3Application.getApplicationId(),
                 APIMIntegrationConstants.DEFAULT_TOKEN_VALIDITY_TIME,
                 StringUtils.EMPTY,

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml
@@ -423,6 +423,13 @@
             <class name="org.wso2.am.integration.tests.workflow.WorkflowApprovalExecutorTest"/>
         </classes>
     </test>
+    <test name="apim-logging-tests" preserve-order="true" parallel="false" group-by-instances="true">
+        <parameter name="group" value="group1"/>
+        <classes>
+            <class name="org.wso2.am.integration.tests.logging.APILoggingTest"/>
+<!--            <class name="org.wso2.am.integration.tests.logging.CorrelationLoggingTest"/>-->
+        </classes>
+    </test>
 
     <test name="apim-cross-tenant-scenario" preserve-order="true" parallel="false" group-by-instances="true">
         <parameter name="group" value="group2"/>
@@ -440,13 +447,7 @@
         </classes>
     </test>
 
-    <test name="apim-logging-tests" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group1"/>
-        <classes>
-            <class name="org.wso2.am.integration.tests.logging.APILoggingTest"/>
-<!--            <class name="org.wso2.am.integration.tests.logging.CorrelationLoggingTest"/>-->
-        </classes>
-    </test>
+
     <test name="apim-revoke-one-time-token-flow-tests" preserve-order="true" parallel="false" group-by-instances="true">
         <parameter name="group" value="group1"/>
         <classes>