Merge pull request #75 from malithie/master

fixing integration tests
wso2 · Apr 30, 2015 · 5b8fff7 · 5b8fff7
2 parents 296cce2 + 371423c
commit 5b8fff7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/...src/test/java/org/wso2/identity/integration/test/saml/SAMLIdentityFederationTestCase.java b/...src/test/java/org/wso2/identity/integration/test/saml/SAMLIdentityFederationTestCase.java
@@ -323,6 +323,7 @@ private SAMLSSOServiceProviderDTO getSAMLSSOServiceProviderDTO(String issuerName
         samlssoServiceProviderDTO.setDoSignAssertions(true);
         samlssoServiceProviderDTO.setDoSignResponse(true);
         samlssoServiceProviderDTO.setDoSingleLogout(true);
+        samlssoServiceProviderDTO.setEnableAttributeProfile(true);
         samlssoServiceProviderDTO.setEnableAttributesByDefault(true);
         return samlssoServiceProviderDTO;
     }

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml
@@ -223,9 +223,9 @@
                     <!--<parameter name="-DportOffset" value="0" />-->
                     <!--<parameter name="cmdArg" value="debug 5005" />-->
                 </class>
-                <!--class>
+                <class>
                     <name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name>
-                </class-->
+                </class>
             </extentionClasses>
         </platformExecutionManager>
 

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
@@ -25,12 +25,12 @@
     <test name="is-tests-all" preserve-order="true" parallel="false">
         <packages>
             <!--Entitlement Test Cases-->
-            <!--<package name="org.wso2.identity.integration.test.entitlement"/>-->
+            <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.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.mgt.ClaimManagementServiceTestCase" />
@@ -43,12 +43,12 @@
             <!--Provisioning Test Cases-->
             <class name="org.wso2.identity.integration.test.provisioning.ProvisioningTestCase"/>
             <!--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.OAuth2ServiceResourceOwnerTestCase"/>-->
-            <!--<class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantTestCase"/>-->
-            <!--<class name="org.wso2.identity.integration.test.oauth2.OAuth2TokenRevokeAfterCacheTimeOutTestCase"/>-->
+            <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.OAuth2ServiceResourceOwnerTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2ServiceAuthCodeGrantTestCase"/>
+            <class name="org.wso2.identity.integration.test.oauth2.OAuth2TokenRevokeAfterCacheTimeOutTestCase"/>
             <!--OpenId Test Cases-->
             <class name="org.wso2.identity.integration.test.openid.OpenIDAuthenticationTestCase" />
             <class name="org.wso2.identity.integration.test.openid.OpenIDProviderServerConfigTestCase" />
@@ -60,14 +60,14 @@
             <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"/>
-            <!--<class name="org.wso2.identity.integration.test.user.profile.mgt.UserProfileAdminTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.user.profile.mgt.UserProfileAdminTestCase"/>
             <!--SCIM Test Cases-->
-            <!--<class name="org.wso2.identity.integration.test.scim.SCIMUserProviderTestCase" />-->
+            <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.SCIMGlobalProviderTestCase" />-->
             <!--SAML Test Cases-->
-            <!--<class name="org.wso2.identity.integration.test.saml.SAMLIdentityFederationTestCase"/>-->
+            <class name="org.wso2.identity.integration.test.saml.SAMLIdentityFederationTestCase"/>
             <!--Notification mgt UserOperation test case-->
             <!--<class name="org.wso2.identity.integration.test.user.profile.mgt.NotificationOnUserOperationTestCase"/>-->
         </classes>