From c002c6a64a110ca3607c99c73a58f4fd6e8732e5 Mon Sep 17 00:00:00 2001
From: AnuGayan <anushaj@wso2.com>
Date: Mon, 9 Oct 2023 15:58:48 +0530
Subject: [PATCH] Change test groups and shuffle tests between 4 groups

---
 .../src/test/resources/testng-pattern9.xml    | 35 -------------------
 .../src/test/resources/testng.xml             | 12 +++----
 .../test/resources/testng-server-restart.xml  |  1 +
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/testng-pattern9.xml

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng-pattern9.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng-pattern9.xml
deleted file mode 100644
index d002dfeb81..0000000000
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/testng-pattern9.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="apim-pattern9-test-suite">
-    <parameter name="useDefaultListeners" value="false"/>
-
-    <test name="apim-integration-tests-config-changes" preserve-order="true" parallel="false">
-
-        <classes>
-            <class name="org.wso2.am.integration.tests.api.lifecycle.APIManagerConfigurationChangeTest"/>
-            <class name="org.wso2.am.integration.tests.token.RefreshTokenTestCase"/>
-            <class name="org.wso2.am.integration.tests.token.TokenAPITestCase"/>
-            <class name="org.wso2.am.integration.tests.token.APIManager3152RefreshTokenTestCase"/>
-             <!--<class name="org.wso2.am.integration.tests.token.OpenIDTokenAPITestCase"/>-->
-        </classes>
-    </test>
-
-</suite>
\ No newline at end of file
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 03901f9726..725ba72c12 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
@@ -64,7 +64,7 @@
     </test>-->
 
     <test name="apim-integration-tests-api-lifecycle" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group1"/>
+        <parameter name="group" value="group3"/>
         <classes>
             <class name="org.wso2.am.integration.tests.api.lifecycle.APISecurityTestCase" />
             <class name="org.wso2.am.integration.tests.api.lifecycle.AccessibilityOfBlockAPITestCase"/>
@@ -99,7 +99,7 @@
     </test>
 
     <test name="apim-integration-tests-api-lifecycle-2" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group1"/>
+        <parameter name="group" value="group4"/>
         <classes>
             <class name="org.wso2.am.integration.tests.rest.MalformedRequestTest"/>
             <class name="org.wso2.am.integration.tests.other.ScriptMediatorTestCase"/>
@@ -146,7 +146,7 @@
     </test>
 
     <test name="apim-CORS-tests" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group1"/>
+        <parameter name="group" value="group4"/>
         <classes>
             <class name="org.wso2.am.integration.tests.header.CORSAccessControlAllowCredentialsHeaderSetup"/>
             <class name="org.wso2.am.integration.tests.jwt.FederatedUserJWTTestCase"/>
@@ -155,7 +155,7 @@
     </test>
 
     <test name="apim-integration-tests-samples" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group1"/>
+        <parameter name="group" value="group4"/>
         <classes>
             <class name="org.wso2.am.integration.tests.rest.UriTemplateReservedCharacterEncodingTest"/>
             <class name="org.wso2.am.integration.tests.other.APIInvocationFailureTestCase"/>
@@ -238,7 +238,7 @@
     </test>
 
     <test name="apim-store-tests" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group1"/>
+        <parameter name="group" value="group3"/>
         <classes>
             <class name="org.wso2.am.integration.tests.other.APIM710AllSubscriptionsByApplicationTestCase"/>
             <!--<class name="org.wso2.am.integration.tests.other.CopyNewVersionTestCase"/>-->
@@ -363,7 +363,7 @@
 
 
     <test name="apim-integration-tests-application-sharing" preserve-order="true" parallel="false" group-by-instances="true">
-        <parameter name="group" value="group2"/>
+        <parameter name="group" value="group1"/>
         <classes>
             <class name="org.wso2.am.integration.tests.application.groupSharing.ApplicationSharingConfig"/>
             <class name="org.wso2.am.integration.tests.application.groupSharing.ApplicationSharingTestCase"/>
diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/testng-server-restart.xml b/modules/integration/tests-integration/tests-restart/src/test/resources/testng-server-restart.xml
index 2c938da9d3..d46f3b7502 100644
--- a/modules/integration/tests-integration/tests-restart/src/test/resources/testng-server-restart.xml
+++ b/modules/integration/tests-integration/tests-restart/src/test/resources/testng-server-restart.xml
@@ -4,6 +4,7 @@
     <parameter name="useDefaultListeners" value="false"/>
 
     <test name="apim-restart-tests" preserve-order="true" parallel="false">
+        <parameter name="group" value="group4"/>
         <classes>
             <class name="org.wso2.am.integration.tests.server.restart.ServerRestartTestCase"/>
             <class name="org.wso2.am.integration.tests.server.restart.APIThrottlingServerRestartTestCase"/>