[java-identity-provider COMMIT] in /trunk/idp-profile-spring: pom.xml src/test/java/net/shibboleth/idp/profile/spring...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Mar  8 11:57:46 2014
New Revision: 5543

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5543&view=rev
Log:
IDP-277 SAML2SSOProfileConfiguration extend tests

Modified:
    trunk/idp-profile-spring/pom.xml
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java

Modified: trunk/idp-profile-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/pom.xml?rev=5543&r1=5542&r2=5543&view=diff
==============================================================================
--- trunk/idp-profile-spring/pom.xml (original)
+++ trunk/idp-profile-spring/pom.xml Sat Mar  8 11:57:46 2014
@@ -48,6 +48,19 @@
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-core</artifactId>
+            <version>${opensaml.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-impl</artifactId>
+            <version>${opensaml.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Managed Dependencies -->
     </dependencies>

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java?rev=5543&r1=5542&r2=5543&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java Sat Mar  8 11:57:46 2014
@@ -22,6 +22,7 @@
 import net.shibboleth.idp.saml.profile.config.AbstractSAMLProfileConfiguration;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.ConversionServiceFactoryBean;
@@ -33,7 +34,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.Sets;
 
-public class BaseSAMLProfileTest {
+public class BaseSAMLProfileTest  extends OpenSAMLInitBaseTestCase {
     
     private static final String PATH = "/net/shibboleth/idp/profile/spring/relyingparty/saml/";
     

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java?rev=5543&r1=5542&r2=5543&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java Sat Mar  8 11:57:46 2014
@@ -17,6 +17,9 @@
 
 package net.shibboleth.idp.profile.spring.relyingparty.saml;
 
+import java.util.List;
+
+import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
 import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
 import net.shibboleth.idp.saml.profile.config.saml2.BrowserSSOProfileConfiguration;
 
@@ -27,13 +30,12 @@
 
     @Test public void defaults() {
 
-        BrowserSSOProfileConfiguration profile =
-                getBean(BrowserSSOProfileConfiguration.class, true, "saml2SSO.xml");
-        
+        BrowserSSOProfileConfiguration profile = getBean(BrowserSSOProfileConfiguration.class, true, "saml2SSO.xml");
+
         Assert.assertTrue(profile.includeAttributeStatement());
         Assert.assertFalse(profile.skipEndpointValidationWhenSigned());
         Assert.assertEquals(profile.getMaximumSPSessionLifetime(), 0);
-        
+
         // defaults for AbstractSAML2ProfileConfiguration
 
         assertConditionalPredicate(profile.getEncryptAssertionsPredicate());
@@ -55,11 +57,10 @@
     @Test public void values() {
         BrowserSSOProfileConfiguration profile =
                 getBean(BrowserSSOProfileConfiguration.class, true, "beans.xml", "saml2SSOValues.xml");
-        
+
         Assert.assertFalse(profile.includeAttributeStatement());

[... 26 lines stripped ...]