From 1056fad540c9f49e8643e1f23c7e429ea559b659 Mon Sep 17 00:00:00 2001
From: Chamila Adhikarinayake <cka.adhi@gmail.com>
Date: Wed, 15 Nov 2023 14:08:52 +0530
Subject: [PATCH 1/3] change order

---
 .../tests-backend/src/test/resources/testng.xml   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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
index c53331bb8a..e5ad422c14 100644
--- 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>

From f5b0964ce1d2b9552a98948f2398e30c4ea51a7b Mon Sep 17 00:00:00 2001
From: Chamila Adhikarinayake <cka.adhi@gmail.com>
Date: Wed, 15 Nov 2023 14:09:08 +0530
Subject: [PATCH 2/3] Add scopes for admin api

---
 .../org/wso2/am/integration/test/impl/RestAPIAdminImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java b/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java
index 9d4ff98d93..26c1dc2cde 100644
--- a/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java
+++ b/modules/integration/tests-common/integration-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

From b763a34ecab9edceb0e1d3891ee2ff10ed151962 Mon Sep 17 00:00:00 2001
From: Chamila Adhikarinayake <cka.adhi@gmail.com>
Date: Wed, 15 Nov 2023 15:36:38 +0530
Subject: [PATCH 3/3] Remove km call

---
 .../CrossTenantSubscriptionUpdateTestCase.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionUpdateTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionUpdateTestCase.java
index 7c9ac76534..42c5893686 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionUpdateTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/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,