[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: Wed Jan  9 04:24:59 2013
New Revision: 4262

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4262&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-6 Port Computed Id over to new APIs; includes tests and some restructuring of the test framework.

Critically the test contains values computed against 2.0.

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ConstantStringStrategy.java
      - copied, changed from r4260, trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ConstantStringStrategy.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnectorTest.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ConstantStringStrategy.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java

Copied: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ConstantStringStrategy.java (from r4260, trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ConstantStringStrategy.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ConstantStringStrategy.java?p2=trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ConstantStringStrategy.java&p1=trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ConstantStringStrategy.java&r1=4260&r2=4262&rev=4262&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ConstantStringStrategy.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ConstantStringStrategy.java Wed Jan  9 04:24:59 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.attribute.resolver.impl.ad;
+package net.shibboleth.idp.attribute.resolver.impl;
 
 import javax.annotation.Nullable;
 
@@ -23,15 +23,15 @@
 
 import com.google.common.base.Function;
 
-class ConstantStringStrategy implements Function<AttributeResolutionContext, String> {
+public class ConstantStringStrategy implements Function<AttributeResolutionContext, String> {
 
-    static final String IDP_ENTITY_ID = "https://idp.example.org/idp";
+    public static final String IDP_ENTITY_ID = "https://idp.example.org/idp";
     
-    static final String PRINCIPAL_ID = "PETER_THE_PRINCIPAL";
+    public static final String PRINCIPAL_ID = "PETER_THE_PRINCIPAL";
 
-    static final String SP_ENTITY_ID = "https://sp.example.org/idp";
+    public static final String SP_ENTITY_ID = "https://sp.example.org/sp";
     
-    final String returnValue;
+    private final String returnValue;
 
     @SuppressWarnings("unused")
     private ConstantStringStrategy() {

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=4262&r1=4261&r2=4262&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 Wed Jan  9 04:24:59 2013
@@ -25,8 +25,10 @@
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.resolver.BaseAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
+import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
 import net.shibboleth.idp.attribute.resolver.StaticAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.StaticDataConnector;
+import net.shibboleth.idp.attribute.resolver.impl.ad.SAML2NameIDAttributeDefinition;
 import net.shibboleth.utilities.java.support.collection.LazySet;

[... 265 lines stripped ...]