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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar 12 23:19:51 2014
New Revision: 5563

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5563&view=rev
Log:
IDP-6 - refactored stored/computed ID connectors to allow reuse for new generators

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/AbstractPersistentIdDataConnector.java
      - copied, changed from r5561, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/AbstractComputedIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/ComputedPersistentIdGenerationStrategy.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentIdGenerationStrategy.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/StoredPersistentIdGenerationStrategy.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/resolver/StoredIDStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/AbstractComputedIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/DatabaseBackedIDStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.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/ComputedIDDataConnectorTest.java?rev=5563&r1=5562&r2=5563&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java Wed Mar 12 23:19:51 2014
@@ -30,7 +30,7 @@
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
 import net.shibboleth.idp.saml.impl.TestSources;
-import net.shibboleth.idp.saml.impl.attribute.resolver.AbstractComputedIDDataConnector;
+import net.shibboleth.idp.saml.impl.attribute.resolver.AbstractPersistentIdDataConnector;
 import net.shibboleth.idp.saml.impl.attribute.resolver.ComputedIDDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -41,7 +41,7 @@
 import org.testng.annotations.Test;
 
 /**
- * Test for {@link AbstractComputedIDDataConnector}
+ * Test for {@link AbstractPersistentIdDataConnector}
  */
 public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
 
@@ -61,7 +61,7 @@
 
     protected static final byte smallSalt[] = {0, 1, 2};
 
-    private static void testInit(AbstractComputedIDDataConnector connector, String failMessage) {
+    private static void testInit(AbstractPersistentIdDataConnector connector, String failMessage) {
         try {
             connector.initialize();
             Assert.fail(failMessage);
@@ -100,8 +100,8 @@
         resolver.initialize();
         connector.initialize();
 
-        final AttributeResolutionContext context =
-                TestSources.createResolutionContext(null, null, TestSources.SP_ENTITY_ID);
+        final AttributeResolutionContext context = TestSources.createResolutionContext(TestSources.PRINCIPAL_ID,
+                TestSources.IDP_ENTITY_ID, TestSources.SP_ENTITY_ID);
         resolver.resolveAttributes(context);
 
         // Now test that we got exactly what we expected - two scoped attributes
@@ -139,7 +139,7 @@
         return constructResolver(connector, values);
     }
 
-    protected static AttributeResolver constructResolver(AbstractComputedIDDataConnector connector, int values)
+    protected static AttributeResolver constructResolver(ComputedIDDataConnector connector, int values)
             throws ComponentInitializationException {
         connector.setId(TEST_CONNECTOR_NAME);
         connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
@@ -167,7 +167,7 @@
         return constructResolverWithNonString(new ComputedIDDataConnector(), dependantOn);
     }
 
-    protected static AttributeResolver constructResolverWithNonString(AbstractComputedIDDataConnector connector,

[... 954 lines stripped ...]