[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test: java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 30 05:22:09 2014
New Revision: 6189

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6189&view=rev
Log:
IDP-269 end to end testing of StoredId PrincipalConnector

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java?rev=6189&r1=6188&r2=6189&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java Mon Jun 30 05:22:09 2014
@@ -23,6 +23,8 @@
 
 import javax.sql.DataSource;
 
+import net.shibboleth.idp.attribute.AttributeEncoder;
+import net.shibboleth.idp.attribute.AttributeEncodingException;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.DataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
@@ -31,10 +33,13 @@
 import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
 import net.shibboleth.idp.attribute.resolver.spring.pc.StoredIdConnectorParser.NotImplementedNameIdentifierDecoder;
+import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
+import net.shibboleth.idp.saml.nameid.NameDecoderException;
 import net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdDecoder;
 import net.shibboleth.idp.testing.DatabaseTestingSupport;
 
+import org.opensaml.saml.saml2.core.NameID;
 import org.springframework.context.support.GenericApplicationContext;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -108,20 +113,31 @@
     }
 
     
-    @Test(enabled=true) public void directStore() throws ResolutionException {
+    @Test public void directStore() throws ResolutionException, AttributeEncodingException, NameDecoderException {
         setupConnectors("stored-direct.xml");
         
-        final AttributeResolutionContext context = new AttributeResolutionContext();
-        context.setPrincipal("PRINCIPAL");
-        context.setAttributeIssuerID("ISSUER");
-        context.setAttributeRecipientID("Recipient");
-        context.getSubcontext(AttributeResolverWorkContext.class, true);
+        final AttributeResolutionContext arc = new AttributeResolutionContext();
+        arc.setPrincipal("PRINCIPAL");
+        arc.setAttributeIssuerID("ISSUER");
+        arc.setAttributeRecipientID("Recipient");
+        arc.getSubcontext(AttributeResolverWorkContext.class, true);
        
-        ar.resolveAttributes(context);
+        ar.resolveAttributes(arc);
         
-        final Map<String, IdPAttribute> result = context.getResolvedIdPAttributes();
-
-        Assert.assertNotNull(result.get("result"));
+        final IdPAttribute result = arc.getResolvedIdPAttributes().get("result");
+        
+        final AttributeEncoder<NameID> encoder = (AttributeEncoder<NameID>) ar.getAttributeDefinitions().get("result").getAttributeEncoders().iterator().next();
+        
+        NameID nameID = encoder.encode(result);
+        
+        Assert.assertEquals(result.getValues().size(), 1);
+        
+        final SubjectCanonicalizationContext scc = new SubjectCanonicalizationContext();
+        scc.setPrincipalName(arc.getPrincipal());
+        scc.setRequesterId(arc.getAttributeRecipientID());
+        scc.setResponderId(arc.getAttributeIssuerID());
+        
+        Assert.assertEquals(principalConnector.getNameIDDecoder().decode(scc, nameID), arc.getPrincipal());
     }
     
 }

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml?rev=6189&r1=6188&r2=6189&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml Mon Jun 30 05:22:09 2014
@@ -30,5 +30,6 @@
 	<resolver:AttributeDefinition id="result"

[... 6 lines stripped ...]