Merge pull request #1195 from stormpath/Issue-1194

1194 Rename abstract methods. Use correct app.

Author: Jose Luis Barrueta

extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/saml/AbstractSamlIT.groovy

@@ -86,8 +86,8 @@ xu/vQr6stjuzJIsDNAtW1FlG8WALOMjV
         return client.getResource(samlPolicy.getIdentityProvider().href, SamlIdentityProvider)
     }
 
-    protected SamlIdentityProvider getSamlIdentityProviderForDefaultApplication() {
-        def app = client.currentTenant.getApplications(Applications.where(Applications.name().eqIgnoreCase("Stormpath"))).asList().get(0)
+    protected SamlIdentityProvider getSamlIdentityProviderForAdministratorsApplication() {
+        def app = client.currentTenant.getApplications(Applications.where(Applications.name().eqIgnoreCase("Stormpath"))).single()
         return getSamlIdentityProviderForApplication(app)
     }
 

extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/saml/RegisteredSamlServiceProviderIT.groovy

@@ -377,7 +377,8 @@ class RegisteredSamlServiceProviderIT extends AbstractSamlIT {
 
     @Test
     void testSearchIdentityProviderCollectionOfRegisteredSamlServiceProvidersByDifferentProperties(){
-        def identityProvider = getSamlIdentityProviderForDefaultApplication()
+        def application = createTempApp()
+        def identityProvider = getSamlIdentityProviderForApplication(application)
 
         def serviceProvider = client.instantiate(RegisteredSamlServiceProvider)
         serviceProvider
@@ -425,7 +426,8 @@ class RegisteredSamlServiceProviderIT extends AbstractSamlIT {
 
     @Test
     void testDeletion() {
-        def identityProvider = getSamlIdentityProviderForDefaultApplication()
+        def application = createTempApp()
+        def identityProvider = getSamlIdentityProviderForApplication(application)
 
         def serviceProvider = client.instantiate(RegisteredSamlServiceProvider)
         serviceProvider

extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/saml/SamlIdentityProviderIT.groovy

@@ -18,15 +18,27 @@ package com.stormpath.sdk.impl.saml
 import com.stormpath.sdk.account.Account
 import com.stormpath.sdk.application.Application
 import com.stormpath.sdk.application.webconfig.ApplicationWebConfig
-import com.stormpath.sdk.http.HttpMethod
-import com.stormpath.sdk.http.HttpRequest
-import com.stormpath.sdk.http.HttpRequestBuilder
-import com.stormpath.sdk.http.HttpRequests
 import com.stormpath.sdk.impl.ds.InternalDataStore
-import com.stormpath.sdk.impl.util.Base64
 import com.stormpath.sdk.query.Options
 import com.stormpath.sdk.resource.ResourceException
-import com.stormpath.sdk.saml.*
+import com.stormpath.sdk.saml.AttributeStatementMappingRule
+import com.stormpath.sdk.saml.AttributeStatementMappingRules
+import com.stormpath.sdk.saml.AuthnVerification
+import com.stormpath.sdk.saml.AuthnVerificationRequest
+import com.stormpath.sdk.saml.CreateSamlResponseRequest
+import com.stormpath.sdk.saml.RegisteredSamlServiceProvider
+import com.stormpath.sdk.saml.RegisteredSamlServiceProviderList
+import com.stormpath.sdk.saml.RegisteredSamlServiceProviders
+import com.stormpath.sdk.saml.SamlIdentityProvider
+import com.stormpath.sdk.saml.SamlIdentityProviderMetadata
+import com.stormpath.sdk.saml.SamlIdentityProviderStatus
+import com.stormpath.sdk.saml.SamlIdentityProviders
+import com.stormpath.sdk.saml.SamlPolicy
+import com.stormpath.sdk.saml.SamlResponse
+import com.stormpath.sdk.saml.SamlServiceProviderRegistration
+import com.stormpath.sdk.saml.SamlServiceProviderRegistrationList
+import com.stormpath.sdk.saml.SamlServiceProviderRegistrationStatus
+import com.stormpath.sdk.saml.SamlServiceProviderRegistrations
 import org.joda.time.format.DateTimeFormatter
 import org.joda.time.format.ISODateTimeFormat
 import org.testng.annotations.AfterMethod
@@ -62,8 +74,8 @@ class SamlIdentityProviderIT extends AbstractSamlIT {
     }
 
     @Test
-    public void samlPolicyForTheDefaulApplicationShouldHaveAnIdentityProvider() {
-        getSamlIdentityProviderForDefaultApplication()
+    public void samlPolicyForTheAdministrorsShouldHaveAnIdentityProvider() {
+        getSamlIdentityProviderForAdministratorsApplication()
     }
 
     @Test
@@ -130,7 +142,7 @@ class SamlIdentityProviderIT extends AbstractSamlIT {
 
     @Test
     public void identityProviderForStormpathApplicationShouldBeDisabled() {
-        def identityProvider = getSamlIdentityProviderForDefaultApplication()
+        def identityProvider = getSamlIdentityProviderForAdministratorsApplication()
         assertNotNull(identityProvider.status)
         assertEquals(identityProvider.status, SamlIdentityProviderStatus.DISABLED)
     }
@@ -149,8 +161,8 @@ class SamlIdentityProviderIT extends AbstractSamlIT {
     }
 
     @Test
-    public void identityProviderForTheDefaultApplicationShouldHaveNullSsoLoginEndpoint() {
-        def identityProvider = getSamlIdentityProviderForDefaultApplication()
+    public void identityProviderForAdministratorApplicationShouldHaveNullSsoLoginEndpoint() {
+        def identityProvider = getSamlIdentityProviderForAdministratorsApplication()
         assertNull(identityProvider.ssoLoginEndpoint)
     }