[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: Sat Mar 28 09:59:56 2015
New Revision: 7454

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7454&view=rev
Log:
IDP-644 test for broken dependency behavior.  A precursor to detecting it

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java?rev=7454&r1=7453&r2=7454&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java Sat Mar 28 09:59:56 2015
@@ -146,7 +146,7 @@
         Map<String, IdPAttribute> resolvedAttributes = resolutionContext.getResolvedIdPAttributes();
         log.debug("resolved attributes '{}'", resolvedAttributes);
 
-        Assert.assertEquals(resolvedAttributes.size(), 13);
+        Assert.assertEquals(resolvedAttributes.size(), 14);
 
         // Static
         IdPAttribute attribute = resolvedAttributes.get("eduPersonAffiliation");
@@ -154,6 +154,11 @@
         List<IdPAttributeValue<?>> values = attribute.getValues();
         Assert.assertEquals(values.size(), 1);
         Assert.assertTrue(values.contains(new StringAttributeValue("member")));
+        
+        // Broken (case 665)
+        attribute =  resolvedAttributes.get("broken");
+        Assert.assertEquals(attribute.getValues().size(), 3);
+        
 
         // LDAP
         attribute = resolvedAttributes.get("uid");

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml?rev=7454&r1=7453&r2=7454&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml Sat Mar 28 09:59:56 2015
@@ -24,6 +24,15 @@
         <resolver:Dependency ref="staticAttributes" />
     </resolver:AttributeDefinition>
     
+    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="simpleEPE" sourceAttributeID="eduPersonEntitlement" dependencyOnly="true">
+        <resolver:Dependency ref="staticAttributes" />
+    </resolver:AttributeDefinition>
+    
+    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="broken">
+        <resolver:Dependency ref="simpleEPE" />
+        <resolver:Dependency ref="eduPersonAffiliation" />
+    </resolver:AttributeDefinition>
+    
     <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
         <dc:Attribute id="staticEpA">
             <dc:Value>member</dc:Value>