[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/pom.xml idp-attribute-resolver-impl/src/test/j...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jan 16 05:50:33 2014
New Revision: 5205

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5205&view=rev
Log:
IDP-359 First attempt at writing a name canonicalizer implementation

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameCanonicalization.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameCanonicalizationException.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameCanonicalizer.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AbstractNameCanonicalizer.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AbstractTransientCanonicalizer.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDTransientCanonicalizer.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/package-info.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=5205&r1=5204&r2=5205&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Thu Jan 16 05:50:33 2014
@@ -95,6 +95,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java?rev=5205&r1=5204&r2=5205&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java Thu Jan 16 05:50:33 2014
@@ -21,14 +21,20 @@
 import java.util.Collections;
 import java.util.Set;
 
+import net.shibboleth.idp.attribute.AttributeEncodingException;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.impl.TestSources;
+import net.shibboleth.idp.saml.impl.attribute.encoding.SAML2StringNameIDEncoder;
+import net.shibboleth.idp.saml.impl.nameid.NameIDTransientCanonicalizer;
+import net.shibboleth.idp.saml.nameid.NameCanonicalizationException;
 import net.shibboleth.idp.saml.nameid.TransientIdParameters;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.saml.saml2.core.NameID;
 import org.opensaml.storage.StorageRecord;
 import org.opensaml.storage.StorageService;
 import org.opensaml.storage.impl.MemoryStorageService;
@@ -36,7 +42,7 @@
 import org.testng.annotations.Test;
 
 /** test for {@link net.shibboleth.idp.attribute.resolver.impl.TransientIdAttributeDefinition}. */
-public class TransientIdAttributeDefinitionTest {
+public class TransientIdAttributeDefinitionTest extends OpenSAMLInitBaseTestCase {
 
     /** The name. */
     private static final String TEST_ATTRIBUTE_NAME = "simple";
@@ -174,4 +180,33 @@
         store.destroy();
     }
     
+    @Test public void decode() throws ComponentInitializationException, ResolutionException, AttributeEncodingException, NameCanonicalizationException {
+        final TransientIdAttributeDefinition defn = new TransientIdAttributeDefinition();
+        defn.setId(TEST_ATTRIBUTE_NAME);
+        defn.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+        final StorageService store = new MemoryStorageService();
+        store.initialize();
+        defn.setIdStore(store);
+        defn.initialize();
+    
+        final IdPAttribute result =
+                defn.resolve(TestSources.createResolutionContext(TestSources.PRINCIPAL_ID,

[... 20 lines stripped ...]