[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: Tue Aug 30 15:10:19 2011
New Revision: 4040

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4040&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-10 Port IdPv2 Attribute Resolver Principal Name Attribute Definition to new APIs
https://issues.shibboleth.net/jira/browse/IDP-9 Port IdPv2 Attribute Resolver Prcinpal Authentication Method Attribute Definition to new APIs
Plus tests and supporting abstract class (and test supporting classO

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AbstractPrincipalAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/PrincipalAuthenticationMethodAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/PrincipalNameAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/PrincipalAuthnMethodAttributeTest.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/PrincipalNameAttributeTest.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestContextContainer.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeTest.java?rev=4040&r1=4039&r2=4040&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeTest.java Tue Aug 30 15:10:19 2011
@@ -28,7 +28,6 @@
 import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
 
-import org.opensaml.messaging.context.AbstractSubcontextContainer;
 import org.opensaml.util.collections.LazySet;
 import org.opensaml.util.component.ComponentInitializationException;
 import org.testng.Assert;
@@ -224,12 +223,4 @@
         Assert.assertTrue(values.contains(context), "looking for context");
     }
 
-    /** trivial context container to test the get something from a container. */
-    class TestContextContainer extends AbstractSubcontextContainer {
-        /** constructor. */
-        public TestContextContainer() {
-            super();
-            setAutoCreateSubcontexts(false);
-        }
-    }
 }

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java?rev=4040&r1=4039&r2=4040&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java Tue Aug 30 15:10:19 2011
@@ -60,6 +60,15 @@
     /** Regexp result. for CONNECTOR_ATTRIBUTE_VALUE (for regexp testing). */
     protected static final String CONNECTOR_ATTRIBUTE_VALUE_REGEXP_RESULT = "Connect";
     
+    /** Principal name for Principal method tests */
+    protected static final String TEST_PRINCIPAL = "PrincipalName";
+
+    /** Relying party name for Principal method tests */
+    protected static final String TEST_RELYING_PARTY = "RP1";
+
+    /** Authenitcation method for Principal method tests */
+    protected static final String TEST_AUTHN_METHOD = "AuthNmEthod";
+
 
     /** Constructor. */
     private TestSources() {