[java-identity-provider COMMIT] /trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering...

[noreply at shibboleth.net]

Author: rdw
Date: Sat May 18 05:54:14 2013
New Revision: 4475

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4475&view=rev
Log:
Fix build - some test code got comitted by accident.

Modified:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java?rev=4475&r1=4474&r2=4475&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java Sat May 18 05:54:14 2013
@@ -17,8 +17,6 @@
 
 package net.shibboleth.idp.attribute.filtering.impl.complex;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -28,12 +26,9 @@
 import net.shibboleth.idp.attribute.filtering.AttributeFilteringEngine;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.impl.dc.attribute.BaseMappedAttribute;
-import net.shibboleth.idp.attribute.resolver.impl.dc.attribute.SAML2AttributeDataConnector;
-import net.shibboleth.idp.attribute.resolver.impl.dc.attribute.StringMappedAttribute;
+import net.shibboleth.idp.attribute.resolver.impl.dc.SAMLAttributeDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
-import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
 
@@ -48,7 +43,7 @@
 
     /**
      * Helper function to return attributes pulled from a file (on the classpath). The file is expected to contain a
-     * single <mdattr:EntityAttributes/> statement (for ease).
+     * single <mdattr:EntityAttributes/> statement.
      * 
      * @param xmlFileName the file within the test directory.
      * @return the att
@@ -60,23 +55,15 @@
 
         final EntityAttributes obj = (EntityAttributes) unmarshallElement(PATH + xmlFileName);
 
-        SAML2AttributeDataConnector connector = new SAML2AttributeDataConnector();
+        SAMLAttributeDataConnector connector = new SAMLAttributeDataConnector();
         connector.setId(xmlFileName);
-        final List<BaseMappedAttribute> attributeMap = new ArrayList<BaseMappedAttribute>(2);
-        StringMappedAttribute map = new StringMappedAttribute();
-        map.setSamlName("eduPersonAffiliation");
-        map.setIds(Collections.singletonList("eduPersonAffiliation"));
-        attributeMap.add(map);
-        map = new StringMappedAttribute();
-        map.setSamlName("uid");
-        map.setIds(Collections.singletonList("uid"));
-        attributeMap.add(map);
-        connector.setMap(attributeMap);
-        connector.setAttributesStrategy(new Function<AttributeResolutionContext, List<XMLObject>>() {
-            @Nullable public List<XMLObject> apply(@Nullable AttributeResolutionContext input) {
-                return (List) obj.getAttributes();
-            }
-        });
+        connector.setAttributesStrategy(new Function<AttributeResolutionContext, 
+                List<org.opensaml.saml.saml2.core.Attribute>>() {
+                    @Nullable public List<org.opensaml.saml.saml2.core.Attribute> apply(
+                            @Nullable AttributeResolutionContext input) {
+                        return (List) obj.getAttributes();
+                    }
+                });
 
         connector.initialize();