[java-identity-provider COMMIT] in /trunk/idp-saml-api/src: main/java/net/shibboleth/idp/saml/relyingparty/AbstractSA...

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Sep 16 13:00:16 2011
New Revision: 4064

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4064&view=rev
Log:
Add security configuration tracking to abstract SAML profile config

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/idwsf/SsosProfileConfigurationTest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java?rev=4064&r1=4063&r2=4064&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java Fri Sep 16 13:00:16 2011
@@ -23,6 +23,9 @@
 import org.opensaml.util.Assert;
 import org.opensaml.util.criteria.EvaluableCriterion;
 import org.opensaml.util.criteria.StaticResponseEvaluableCriterion;
+
+//TODO fix name so that 'SAML' is 'Saml'
+//TODO should we allow for additional audiences?  probably
 
 /** Base class for SAML profile configurations. */
 public abstract class AbstractSAMLProfileConfiguration extends AbstractProfileConfiguration {

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/idwsf/SsosProfileConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/idwsf/SsosProfileConfigurationTest.java?rev=4064&r1=4063&r2=4064&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/idwsf/SsosProfileConfigurationTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/idwsf/SsosProfileConfigurationTest.java Fri Sep 16 13:00:16 2011
@@ -16,10 +16,6 @@
  */
 
 package net.shibboleth.idp.saml.relyingparty.idwsf;
-
-import java.util.ArrayList;
-
-import net.shibboleth.idp.saml.relyingparty.idwsf.SsosProfileConfiguration;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -43,36 +39,4 @@
         config.setMaximumTokenDelegationChainLength(10);
         Assert.assertEquals(config.getMaximumTokenDelegationChainLength(), 10);
     }
-    
-    @Test
-    public void testAllowedDelegates(){
-        SsosProfileConfiguration config = new SsosProfileConfiguration();
-        Assert.assertNotNull(config.getAllowedDelegates());
-        Assert.assertTrue(config.getAllowedDelegates().isEmpty());
-
-        config.setAllowedDelegates(null);
-        Assert.assertNotNull(config.getAllowedDelegates());
-        Assert.assertTrue(config.getAllowedDelegates().isEmpty());
-
-        ArrayList<String> delegates = new ArrayList<String>();
-        delegates.add("foo");
-        delegates.add(null);
-        delegates.add("");
-        delegates.add("foo");
-        delegates.add("bar");
-
-        config.setAllowedDelegates(delegates);
-        Assert.assertNotSame(config.getAllowedDelegates(), delegates);
-        Assert.assertNotNull(config.getAllowedDelegates());
-        Assert.assertEquals(config.getAllowedDelegates().size(), 2);
-        Assert.assertTrue(config.getAllowedDelegates().contains("foo"));
-        Assert.assertTrue(config.getAllowedDelegates().contains("bar"));
-
-        try {
-            config.getAllowedDelegates().add("baz");
-            Assert.fail();
-        } catch (UnsupportedOperationException e) {
-            // expected this
-        }
-    }
 }