[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: Tue Oct 21 05:27:05 2014
New Revision: 6753

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6753&view=rev
Log:
IDP-203 fill in missing tests.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java?rev=6753&r1=6752&r2=6753&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java Tue Oct 21 05:27:05 2014
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.ad;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -25,6 +27,8 @@
 import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
 import net.shibboleth.idp.attribute.resolver.ad.impl.SimpleAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1StringAttributeEncoder;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringAttributeEncoder;
 import net.shibboleth.idp.saml.impl.TestSources;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
@@ -73,10 +77,10 @@
         Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep2", "flibble")));
         Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep3", "flibble")));
 
-        //
-        // TODO
-        //
-        Assert.assertTrue(attrDef.getAttributeEncoders().isEmpty(),"getgetAttributeEncoders().isEmpty()");
+        Assert.assertEquals(attrDef.getAttributeEncoders().size(), 1);
+        final SAML2StringAttributeEncoder e1 = (SAML2StringAttributeEncoder) attrDef.getAttributeEncoders().iterator().next();
+        Assert.assertEquals(e1.getName(), "urn:oid:0.9.2342.19200300.100.1.3");
+        Assert.assertEquals(e1.getFriendlyName(), "mail");
         
     }
 
@@ -99,10 +103,22 @@
         Assert.assertEquals(dependencies.size(), 1, "getDisplayDescriptions");
         Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep3", "simplePopulated2")));
 
-        //
-        // TODO
-        //
-        Assert.assertTrue(attrDef.getAttributeEncoders().isEmpty(),"getgetAttributeEncoders().isEmpty()");
+        Assert.assertEquals(attrDef.getAttributeEncoders().size(), 2);
+        List a = new ArrayList(attrDef.getAttributeEncoders());
+        
+        final SAML2StringAttributeEncoder saml2; 
+        final SAML1StringAttributeEncoder saml1; 
+        if (a.get(0) instanceof SAML2StringAttributeEncoder) { 
+            saml2 = (SAML2StringAttributeEncoder) a.get(0);
+            saml1 = (SAML1StringAttributeEncoder) a.get(1);
+        } else {
+            saml2 = (SAML2StringAttributeEncoder) a.get(1);
+            saml1 = (SAML1StringAttributeEncoder) a.get(0);
+        }
+        Assert.assertEquals(saml2.getName(), "urn:oid:0.9.2342.19200300.100.1.3");
+        Assert.assertEquals(saml2.getFriendlyName(), "mail");
+        
+        Assert.assertEquals(saml1.getName(), "urn:mace:dir:attribute-def:mail");
     }
 
     @Test public void bad() throws ComponentInitializationException {

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml?rev=6753&r1=6752&r2=6753&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml Tue Oct 21 05:27:05 2014
@@ -23,7 +23,6 @@
     <DisplayDescription xml:lang="ca">DescInCanadian</DisplayDescription>
     

[... 22 lines stripped ...]