From 6915eb5b1c7aca8f16b0b8a1f2d054c356fd86b8 Mon Sep 17 00:00:00 2001
From: Rushmin Fernando <rushmin@wso2.com>
Date: Fri, 11 Aug 2017 15:53:55 +0530
Subject: [PATCH 1/3] Commenting out test cases to isolate the issue.

---
 .../src/test/resources/testng.xml             | 135 +-----------------
 1 file changed, 1 insertion(+), 134 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 ac40c2a651..f59988e474 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
@@ -28,147 +28,14 @@
             <class name="org.wso2.identity.integration.test.identity.governance.AdminForcedPasswordResetTestCase"/>
         </classes>
     </test>
-    <!--<test name="is-tests-notification-mgt" preserve-order="true" parallel="false" group-by-instances="true">-->
-    <!--<classes>-->
-    <!--<class name="org.wso2.identity.integration.test.user.profile.mgt.NotificationOnUserOperationTestCase"/>-->
-    <!--<class name="org.wso2.identity.integration.test.entitlement.EntitlementNotificationTestCase"/>-->
-    <!--</classes>-->
-    <!--</test>-->
-
-    <test name="is-tests-usr-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.identity.integration.test.user.mgt.UserMgtTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.ReadWriteLdapBasedUserMgtTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.ReadWriteLDAPUserStoreManagerTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.ReadOnlyLDAPUserStoreManagerTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.JDBCBasedUserMgtTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.JDBCUserStoreManagerTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.CARBON15051EmailLoginTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.mgt.UserMgtUISecurityTestCase"/>
-            <!--<class name="org.wso2.identity.integration.test.user.mgt.CARBON15502ReadWriteLDAPUserStoreManagerTestCase"/>-->
-            <!--<class name="org.wso2.identity.integration.test.user.mgt.remote.RemoteUserStoreManagerServiceTestCase" />-->
-        </classes>
-    </test>
-
-    <test name="is-analytics-tests" preserve-order="true" parallel="false" group-by-instances="true">
-        <classes>
-            <class name="org.wso2.identity.integration.test.analytics.oauth.OAuth2TokenIssuance"/>
-            <class name="org.wso2.identity.integration.test.analytics.authentication.AnalyticsLoginTestCase"/>
-        </classes>
-    </test>
-
-    <test name="is-tests-all" preserve-order="true" parallel="false">
-        <packages>
-            <!--Entitlement Test Cases-->
-            <!--<package name="org.wso2.identity.integration.test.entitlement"/>-->
-            <!--Application Management Test Cases-->
-            <!--<package name="org.wso2.identity.integration.test.application.mgt"/>-->
-        </packages>
-        <classes>
-            <class name="org.wso2.identity.integration.test.user.account.connector.UserAccountConnectorTestCase"/>
-            <class name="org.wso2.identity.integration.test.AuthenticationAdminTestCase"/>
-            <!--<class name="org.wso2.identity.integration.test.um.ws.api.RemoteAuthorizationManagerServiceTestCase" />-->
-            <class name="org.wso2.identity.integration.test.claim.metadata.mgt.ClaimMetadataManagementServiceTestCase"/>
-            <!--<class name="org.wso2.identity.integration.test.mgt.ClaimManagementServiceTestCase" />-->
-            <!--<class name="org.wso2.identity.integration.test.identity.mgt.AccountLockingWhileSCIMEnabledTestCase"/>-->
-            <!--Identity Management Test Cases-->
-            <!--<class name="org.wso2.identity.integration.test.identity.mgt.AccountCredentialMgtConfigServiceTestCase" />-->
-            <!--<class name="org.wso2.identity.integration.test.identity.mgt.UserIdentityManagementServiceTestCase"/>-->
-            <class name="org.wso2.identity.integration.test.identity.mgt.UserInformationRecoveryServiceTenantEmailUserTestCase"/>
-            <class name="org.wso2.identity.integration.test.identity.mgt.AccountLockEnabledTestCase"/>
-            <class name="org.wso2.identity.integration.test.identity.mgt.IdentityGovernanceTestCase"/>
-            <!--<class name="org.wso2.identity.integration.test.identity.mgt.PasswordHistoryValidationTestCase"/>-->
-
-            <class name="org.wso2.identity.integration.test.challenge.questions.mgt.ChallengeQuestionManagementAdminServiceTestCase"/>
 
 
-            <!--User Store Test Cases-->
-            <class name="org.wso2.identity.integration.test.user.store.config.UserStoreConfigAdminTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.store.config.UserStoreConfigTestForIDENTITY5573"/>
-            <class name="org.wso2.identity.integration.test.user.store.config.UserStoreDeployerTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.store.JDBCUserStoreAddingTestCase"/>
-            <!--Provisioning Test Cases-->
-            <class name="org.wso2.identity.integration.test.provisioning.ProvisioningTestCase"/>
-            <class name="org.wso2.identity.integration.test.provisioning.DBSeperationTestCase"/>
-            <!--OAuth Test Cases-->
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantOpenIdTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceClientCredentialTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceImplicitGrantTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceRegexCallbackUrlTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceResourceOwnerTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantTestCase"/>
-            <!--<class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantCacheDisabledTestCase"/>-->
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2TokenRevokeAfterCacheTimeOutTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2TokenRevokeWithInvalidClientCredentialsTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceErrorResponseTest"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuthAdminServiceTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceIntrospectionTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.Oauth2PersistenceProcessorTestCase"/>
-            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceSAML2BearerGrantTestCase"/>
 
-            <!--OIDC Test Cases-->
-            <class name="org.wso2.identity.integration.test.oidc.OIDCAuthCodeGrantSSOTestCase"/>
-            <class name="org.wso2.identity.integration.test.oidc.OIDCAuthCodeGrantSSODifferentSubjectIDTestCase"/>
-
-            <!--OpenId Test Cases-->
-            <class name="org.wso2.identity.integration.test.openid.OpenIDAuthenticationTestCase" />
-            <class name="org.wso2.identity.integration.test.openid.OpenIDProviderServerConfigTestCase" />
-            <!--<class name="org.wso2.identity.integration.test.openid.OpenIDUserProfileTestCase"/>-->
-            <class name="org.wso2.identity.integration.test.openid.OpenIDRPManagementTestCase"/>
-            <class name="org.wso2.identity.integration.test.openid.OpenIDSSOTestCase" />
-            <!--PassiveSTS Test Cases-->
-            <class name="org.wso2.identity.integration.test.sts.TestPassiveSTS"/>
-            <class name="org.wso2.identity.integration.test.sts.TestPassiveSTSFederation"/>
-            <!--User Profile Management Test Cases-->
-            <class name="org.wso2.identity.integration.test.user.profile.mgt.UserProfileMgtTestCase"/>
-            <!--SCIM Test Cases-->
-            <!--<class name="org.wso2.identity.integration.test.scim.SCIMUserProviderTestCase" />-->
-            <class name="org.wso2.identity.integration.test.scim.SCIMServiceProviderUserTestCase" />
-            <class name="org.wso2.identity.integration.test.scim.SCIMServiceProviderGroupTestCase" />
-            <class name="org.wso2.identity.integration.test.scim.IDENTITY4776SCIMServiceWithOAuthTestCase" />
-            <!--<class name="org.wso2.identity.integration.test.scim.SCIMGlobalProviderTestCase" />-->
-            <!--SAML Test Cases-->
-            <!--<class name="org.wso2.identity.integration.test.saml.SAMLIdentityFederationTestCase"/>-->
-            <class name="org.wso2.identity.integration.test.saml.SAMLInvalidIssuerTestCase"/>
-            <class name="org.wso2.identity.integration.test.saml.RegistryMountTestCase"/>
-            <class name="org.wso2.identity.integration.test.saml.SPMetadataTestCase"/>
-           <!-- <class name="org.wso2.identity.integration.test.saml.SPMetaDataTenantTestCase"/>-->
-            <class name="org.wso2.identity.integration.test.saml.IDPMetadataTestCase"/>
-
-            <class name="org.wso2.identity.integration.test.provisioning.JustInTimeProvisioningTestCase"/>
-
-            <!--Workflow Management test case-->
-            <class name="org.wso2.identity.integration.test.workflow.mgt.WorkflowManagementTestCase"/>
-
-            <!--Identity Provider Management Test Cases-->
-            <class name="org.wso2.identity.integration.test.idp.mgt.IdentityProviderManagementTestCase" />
-            <class name="org.wso2.identity.integration.test.requestPathAuthenticator.RequestPathAuthenticatorBaseTestCase" />
-            <!--Entitlement Test Cases-->
-            <!--<class name="org.wso2.identity.integration.test.entitlement.EntitlementPIPAttributeCacheTestCase"/>-->
-            <class name="org.wso2.identity.integration.test.entitlement.EntitlementSecurityTestCase"/>
-
-            <!-- Request path authenticator test cases-->
-            <class name="org.wso2.identity.integration.test.requestPathAuthenticator.RequestPathAuthenticatorInvalidUserTestCase" />
-            <class name="org.wso2.identity.integration.test.requestPathAuthenticator.IDENTITY4604RequestPathAuthWithSAMLSSO" />
-            <class name="org.wso2.identity.integration.test.idp.mgt.IdentityProviderMgtServiceTestCase" />
-            <class name="org.wso2.identity.integration.test.dashboard.IDENTITY5811TestCase" />
-        </classes>
-    </test>
 
     <test name="is-tests-sequential" preserve-order="true" parallel="false" group-by-instances="true">
         <classes>
-            <!--<class name="org.wso2.identity.integration.test.saml.SAMLQueryProfileTestCase"/>-->
             <class name="org.wso2.identity.integration.test.saml.SAMLSSOTestCase"/>
-            <class name="org.wso2.identity.integration.test.application.authz.ApplicationAuthzTestCase"/>
-            <class name="org.wso2.identity.integration.test.application.authz.ApplicationAuthzTenantTestCase"/>
-            <!--<class name="org.wso2.identity.integration.test.saml.SAMLLocalAndOutboundAuthenticatorsTestCase"/>-->
-        </classes>
-    </test>
-    <test name="is-tests-saml-sequential" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.identity.integration.test.saml.ChangeACSUrlTestCase"/>
-            <class name="org.wso2.identity.integration.test.saml.SAMLFederationWithFileBasedSPAndIDPTestCase"/>
-            <class name="org.wso2.identity.integration.test.user.profile.mgt.UserProfileAdminTestCase"/>
         </classes>
     </test>
+  
 </suite>

From 95cae76c3d1d13db479cc658ea04d53f4e3e8f38 Mon Sep 17 00:00:00 2001
From: Rushmin Fernando <rushmin@wso2.com>
Date: Fri, 11 Aug 2017 19:59:01 +0530
Subject: [PATCH 2/3] Adding a temp fix to get the release build working.

---
 .../travelocity-app-build.xml                 | 20 ++++++++++++++-----
 .../artifacts/IS/passivests/sts-app-build.xml |  9 +++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml
index 1aede23a08..874a66208c 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml
@@ -30,11 +30,21 @@
     <property name="properties" location="${basedir}/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent"/>
 
     <target name="clear-slf4j-libs">
-        <delete file="${travelocity.webapp.lib}/jul-to-slf4j-1.6.1.jar"/>
-        <delete file="${travelocity.webapp.lib}/log4j-over-slf4j-1.6.1.jar"/>
-        <delete file="${travelocity.webapp.lib}/jcl-over-slf4j-1.6.1.jar"/>
-        <delete file="${travelocity.webapp.lib}/slf4j-api-1.6.1.jar"/>
-        <delete file="${travelocity.webapp.classes}/travelocity.properties"/>
+          <delete file="${travelocity.webapp.lib}/jul-to-slf4j-1.6.1.jar"/>
+          <delete file="${travelocity.webapp.lib}/log4j-over-slf4j-1.6.1.jar"/>
+          <delete file="${travelocity.webapp.lib}/jcl-over-slf4j-1.6.1.jar"/>
+          <delete file="${travelocity.webapp.lib}/slf4j-api-1.6.1.jar"/>
+
+          <!--
+          The release build env make the web apps have a SLF4J jar file with a different version.
+          This is a temp fix to make the release build work
+          -->
+          <delete file="${travelocity.webapp.lib}/jul-to-slf4j-1.7.5.jar"/>
+          <delete file="${travelocity.webapp.lib}/log4j-over-slf4j-1.7.5.jar"/>
+          <delete file="${travelocity.webapp.lib}/jcl-over-slf4j-1.7.5.jar"/>
+          <delete file="${travelocity.webapp.lib}/slf4j-api-1.7.5.jar"/>
+
+          <delete file="${travelocity.webapp.classes}/travelocity.properties"/>
         <copy file="${properties}/travelocity.properties"
               tofile="${travelocity.webapp.classes}/travelocity.properties"/>
         <war destfile="${build}/travelocity.com.war" webxml="${travelocity.webapp}/WEB-INF/web.xml">
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/passivests/sts-app-build.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/passivests/sts-app-build.xml
index 1e0d04016b..2fbae565df 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/passivests/sts-app-build.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/passivests/sts-app-build.xml
@@ -48,5 +48,14 @@
         <delete file="${sts.webapp.lib}/log4j-over-slf4j-1.6.1.jar"/>
         <delete file="${sts.webapp.lib}/jcl-over-slf4j-1.6.1.jar"/>
         <delete file="${sts.webapp.lib}/slf4j-api-1.6.1.jar"/>
+
+        <!--
+        The release build env make the web apps have a SLF4J jar file with a different version.
+        This is a temp fix to make the release build work
+        -->
+        <delete file="${sts.webapp.lib}/jul-to-slf4j-1.7.5.jar"/>
+        <delete file="${sts.webapp.lib}/log4j-over-slf4j-1.7.5.jar"/>
+        <delete file="${sts.webapp.lib}/jcl-over-slf4j-1.7.5.jar"/>
+        <delete file="${sts.webapp.lib}/slf4j-api-1.7.5.jar"/>
     </target>
 </project>
\ No newline at end of file

From 9eee25c5eeed986ccbc420a42adb690067f07dcf Mon Sep 17 00:00:00 2001
From: Rushmin Fernando <rushmin@wso2.com>
Date: Fri, 11 Aug 2017 20:09:03 +0530
Subject: [PATCH 3/3] Revert "Commenting out test cases to isolate the issue."

This reverts commit 6915eb5b1c7aca8f16b0b8a1f2d054c356fd86b8.
---
 .../src/test/resources/testng.xml             | 135 +++++++++++++++++-
 1 file changed, 134 insertions(+), 1 deletion(-)

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 f59988e474..ac40c2a651 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
@@ -28,14 +28,147 @@
             <class name="org.wso2.identity.integration.test.identity.governance.AdminForcedPasswordResetTestCase"/>
         </classes>
     </test>
+    <!--<test name="is-tests-notification-mgt" preserve-order="true" parallel="false" group-by-instances="true">-->
+    <!--<classes>-->
+    <!--<class name="org.wso2.identity.integration.test.user.profile.mgt.NotificationOnUserOperationTestCase"/>-->
+    <!--<class name="org.wso2.identity.integration.test.entitlement.EntitlementNotificationTestCase"/>-->
+    <!--</classes>-->
+    <!--</test>-->
+
+    <test name="is-tests-usr-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.identity.integration.test.user.mgt.UserMgtTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.ReadWriteLdapBasedUserMgtTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.ReadWriteLDAPUserStoreManagerTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.ReadOnlyLDAPUserStoreManagerTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.JDBCBasedUserMgtTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.JDBCUserStoreManagerTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.CARBON15051EmailLoginTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.mgt.UserMgtUISecurityTestCase"/>
+            <!--<class name="org.wso2.identity.integration.test.user.mgt.CARBON15502ReadWriteLDAPUserStoreManagerTestCase"/>-->
+            <!--<class name="org.wso2.identity.integration.test.user.mgt.remote.RemoteUserStoreManagerServiceTestCase" />-->
+        </classes>
+    </test>
+
+    <test name="is-analytics-tests" preserve-order="true" parallel="false" group-by-instances="true">
+        <classes>
+            <class name="org.wso2.identity.integration.test.analytics.oauth.OAuth2TokenIssuance"/>
+            <class name="org.wso2.identity.integration.test.analytics.authentication.AnalyticsLoginTestCase"/>
+        </classes>
+    </test>
+
+    <test name="is-tests-all" preserve-order="true" parallel="false">
+        <packages>
+            <!--Entitlement Test Cases-->
+            <!--<package name="org.wso2.identity.integration.test.entitlement"/>-->
+            <!--Application Management Test Cases-->
+            <!--<package name="org.wso2.identity.integration.test.application.mgt"/>-->
+        </packages>
+        <classes>
+            <class name="org.wso2.identity.integration.test.user.account.connector.UserAccountConnectorTestCase"/>
+            <class name="org.wso2.identity.integration.test.AuthenticationAdminTestCase"/>
+            <!--<class name="org.wso2.identity.integration.test.um.ws.api.RemoteAuthorizationManagerServiceTestCase" />-->
+            <class name="org.wso2.identity.integration.test.claim.metadata.mgt.ClaimMetadataManagementServiceTestCase"/>
+            <!--<class name="org.wso2.identity.integration.test.mgt.ClaimManagementServiceTestCase" />-->
+            <!--<class name="org.wso2.identity.integration.test.identity.mgt.AccountLockingWhileSCIMEnabledTestCase"/>-->
+            <!--Identity Management Test Cases-->
+            <!--<class name="org.wso2.identity.integration.test.identity.mgt.AccountCredentialMgtConfigServiceTestCase" />-->
+            <!--<class name="org.wso2.identity.integration.test.identity.mgt.UserIdentityManagementServiceTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.identity.mgt.UserInformationRecoveryServiceTenantEmailUserTestCase"/>
+            <class name="org.wso2.identity.integration.test.identity.mgt.AccountLockEnabledTestCase"/>
+            <class name="org.wso2.identity.integration.test.identity.mgt.IdentityGovernanceTestCase"/>
+            <!--<class name="org.wso2.identity.integration.test.identity.mgt.PasswordHistoryValidationTestCase"/>-->
+
+            <class name="org.wso2.identity.integration.test.challenge.questions.mgt.ChallengeQuestionManagementAdminServiceTestCase"/>
 
 
+            <!--User Store Test Cases-->
+            <class name="org.wso2.identity.integration.test.user.store.config.UserStoreConfigAdminTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.store.config.UserStoreConfigTestForIDENTITY5573"/>
+            <class name="org.wso2.identity.integration.test.user.store.config.UserStoreDeployerTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.store.JDBCUserStoreAddingTestCase"/>
+            <!--Provisioning Test Cases-->
+            <class name="org.wso2.identity.integration.test.provisioning.ProvisioningTestCase"/>
+            <class name="org.wso2.identity.integration.test.provisioning.DBSeperationTestCase"/>
+            <!--OAuth Test Cases-->
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantOpenIdTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceClientCredentialTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceImplicitGrantTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceRegexCallbackUrlTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceResourceOwnerTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantTestCase"/>
+            <!--<class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantCacheDisabledTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2TokenRevokeAfterCacheTimeOutTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2TokenRevokeWithInvalidClientCredentialsTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceErrorResponseTest"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuthAdminServiceTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceIntrospectionTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.Oauth2PersistenceProcessorTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceSAML2BearerGrantTestCase"/>
 
+            <!--OIDC Test Cases-->
+            <class name="org.wso2.identity.integration.test.oidc.OIDCAuthCodeGrantSSOTestCase"/>
+            <class name="org.wso2.identity.integration.test.oidc.OIDCAuthCodeGrantSSODifferentSubjectIDTestCase"/>
+
+            <!--OpenId Test Cases-->
+            <class name="org.wso2.identity.integration.test.openid.OpenIDAuthenticationTestCase" />
+            <class name="org.wso2.identity.integration.test.openid.OpenIDProviderServerConfigTestCase" />
+            <!--<class name="org.wso2.identity.integration.test.openid.OpenIDUserProfileTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.openid.OpenIDRPManagementTestCase"/>
+            <class name="org.wso2.identity.integration.test.openid.OpenIDSSOTestCase" />
+            <!--PassiveSTS Test Cases-->
+            <class name="org.wso2.identity.integration.test.sts.TestPassiveSTS"/>
+            <class name="org.wso2.identity.integration.test.sts.TestPassiveSTSFederation"/>
+            <!--User Profile Management Test Cases-->
+            <class name="org.wso2.identity.integration.test.user.profile.mgt.UserProfileMgtTestCase"/>
+            <!--SCIM Test Cases-->
+            <!--<class name="org.wso2.identity.integration.test.scim.SCIMUserProviderTestCase" />-->
+            <class name="org.wso2.identity.integration.test.scim.SCIMServiceProviderUserTestCase" />
+            <class name="org.wso2.identity.integration.test.scim.SCIMServiceProviderGroupTestCase" />
+            <class name="org.wso2.identity.integration.test.scim.IDENTITY4776SCIMServiceWithOAuthTestCase" />
+            <!--<class name="org.wso2.identity.integration.test.scim.SCIMGlobalProviderTestCase" />-->
+            <!--SAML Test Cases-->
+            <!--<class name="org.wso2.identity.integration.test.saml.SAMLIdentityFederationTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.saml.SAMLInvalidIssuerTestCase"/>
+            <class name="org.wso2.identity.integration.test.saml.RegistryMountTestCase"/>
+            <class name="org.wso2.identity.integration.test.saml.SPMetadataTestCase"/>
+           <!-- <class name="org.wso2.identity.integration.test.saml.SPMetaDataTenantTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.saml.IDPMetadataTestCase"/>
+
+            <class name="org.wso2.identity.integration.test.provisioning.JustInTimeProvisioningTestCase"/>
+
+            <!--Workflow Management test case-->
+            <class name="org.wso2.identity.integration.test.workflow.mgt.WorkflowManagementTestCase"/>
+
+            <!--Identity Provider Management Test Cases-->
+            <class name="org.wso2.identity.integration.test.idp.mgt.IdentityProviderManagementTestCase" />
+            <class name="org.wso2.identity.integration.test.requestPathAuthenticator.RequestPathAuthenticatorBaseTestCase" />
+            <!--Entitlement Test Cases-->
+            <!--<class name="org.wso2.identity.integration.test.entitlement.EntitlementPIPAttributeCacheTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.entitlement.EntitlementSecurityTestCase"/>
+
+            <!-- Request path authenticator test cases-->
+            <class name="org.wso2.identity.integration.test.requestPathAuthenticator.RequestPathAuthenticatorInvalidUserTestCase" />
+            <class name="org.wso2.identity.integration.test.requestPathAuthenticator.IDENTITY4604RequestPathAuthWithSAMLSSO" />
+            <class name="org.wso2.identity.integration.test.idp.mgt.IdentityProviderMgtServiceTestCase" />
+            <class name="org.wso2.identity.integration.test.dashboard.IDENTITY5811TestCase" />
+        </classes>
+    </test>
 
     <test name="is-tests-sequential" preserve-order="true" parallel="false" group-by-instances="true">
         <classes>
+            <!--<class name="org.wso2.identity.integration.test.saml.SAMLQueryProfileTestCase"/>-->
             <class name="org.wso2.identity.integration.test.saml.SAMLSSOTestCase"/>
+            <class name="org.wso2.identity.integration.test.application.authz.ApplicationAuthzTestCase"/>
+            <class name="org.wso2.identity.integration.test.application.authz.ApplicationAuthzTenantTestCase"/>
+            <!--<class name="org.wso2.identity.integration.test.saml.SAMLLocalAndOutboundAuthenticatorsTestCase"/>-->
+        </classes>
+    </test>
+    <test name="is-tests-saml-sequential" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.identity.integration.test.saml.ChangeACSUrlTestCase"/>
+            <class name="org.wso2.identity.integration.test.saml.SAMLFederationWithFileBasedSPAndIDPTestCase"/>
+            <class name="org.wso2.identity.integration.test.user.profile.mgt.UserProfileAdminTestCase"/>
         </classes>
     </test>
-  
 </suite>