[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jan  7 05:58:49 2013
New Revision: 4254

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4254&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-12

Port IdPv2 Attribute Resolver SAML1 NameIdentifier Attribute Definition to new APIs

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/IdPEntityIdStrategy.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RpEntityIdStrategy.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinitionTest.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.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/SAML2NameIDAttributeDefinitionTest.java?rev=4254&r1=4253&r2=4254&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java Mon Jan  7 05:58:49 2013
@@ -22,7 +22,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.annotation.Nullable;
 
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.idp.attribute.AttributeValue;
@@ -36,12 +35,10 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
 import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.saml.saml2.core.NameID;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
 
 /**
@@ -53,10 +50,6 @@
     private static final String TEST_ATTRIBUTE_NAME = "simple";
     private static final String SECOND_ATTRIBUTE_NAME = "second";
     
-    private static final String IDP_ENTITY_ID = "https://idp.example.org/idp";
-
-    private static final String SP_ENTITY_ID = "https://sp.example.org/idp";
-
     private static final String ALTERNATIVE_FORMAT = "ALTERNATE_FORMAT";
 
     private static final String ALTERNATE_QUALIFIER = "ALTERNATE_QUALIFIER";
@@ -124,8 +117,8 @@
             NameID id = (NameID) val.getValue();
             Assert.assertNull(id.getFormat());
             Assert.assertNull(id.getSPProvidedID());
-            Assert.assertEquals(id.getSPNameQualifier(), SP_ENTITY_ID);
-            Assert.assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
+            Assert.assertEquals(id.getSPNameQualifier(), RpEntityIdStrategy.SP_ENTITY_ID);
+            Assert.assertEquals(id.getNameQualifier(), IdPEntityIdStrategy.IDP_ENTITY_ID);
             nameValues.add(id.getValue());
         }
         Assert.assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
@@ -233,28 +226,4 @@
         Assert.assertTrue(defn.getIdPEntityIdStrategy() instanceof IdPEntityIdStrategy);
     }
 
-    
-    static private class IdPEntityIdStrategy implements Function<AttributeResolutionContext, String> {
-
-        private BasicMessageMetadataContext context;
-        
-        public IdPEntityIdStrategy() {
-            context = new BasicMessageMetadataContext();
-            context.setMessageId(IDP_ENTITY_ID);
-        }
-        
-        /** {@inheritDoc} */
-        @Nullable public String  apply(@Nullable AttributeResolutionContext arg0) {
-            return IDP_ENTITY_ID;
-        }
-    }
-
-    static private class RpEntityIdStrategy implements Function<AttributeResolutionContext, String> {
-
-        /** {@inheritDoc} */
-        @Nullable public String apply(@Nullable AttributeResolutionContext arg0) {
-            return SP_ENTITY_ID;
-        }
-    }
-
 }