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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Apr 17 07:23:59 2015
New Revision: 7484

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7484&view=rev
Log:
IdP 703 example test

Modified:
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java?rev=7484&r1=7483&r2=7484&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java Fri Apr 17 07:23:59 2015
@@ -40,7 +40,7 @@
     private int initializeCount;
 
     /** Static collection of values returned by this connector. */
-    private Map<String, IdPAttribute> values;
+    private final Map<String, IdPAttribute> values;
 
     /** Exception thrown by resolution. */
     private ResolutionException resolutionException;
@@ -55,18 +55,6 @@
     public MockDataConnector(String id, Map<String, IdPAttribute> connectorValues) throws ComponentInitializationException {
         setId(id);
         values = connectorValues;
-        initialize();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param id id of the data connector
-     * @param exception exception thrown by resolution
-     */
-    public MockDataConnector(final String id, final ResolutionException exception) {
-        setId(id);
-        resolutionException = exception;
     }
 
     /**
@@ -82,6 +70,15 @@
         setId(id);
         values = connectorValues;
         initialize();
+    }
+
+    /** Fail resolutions */
+    public void setFailure(boolean fail) {
+        if (fail) {
+            resolutionException = new ResolutionException();
+        } else {
+            resolutionException = null;
+        }
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java?rev=7484&r1=7483&r2=7484&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java Fri Apr 17 07:23:59 2015
@@ -27,6 +27,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.resolver.AbstractAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
@@ -37,6 +38,7 @@
 import net.shibboleth.idp.attribute.resolver.MockDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
+import net.shibboleth.idp.attribute.resolver.ad.impl.SimpleAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.utilities.java.support.collection.LazySet;
@@ -56,6 +58,7 @@
     @Test public void initDestroy() throws Exception {
         MockAttributeDefinition attrDef = new MockAttributeDefinition("foo", new IdPAttribute("test"));
         MockDataConnector dataCon = new MockDataConnector("bar", (Map) null);
+        dataCon.initialize();
         AttributeResolverImpl resolver =
                 new AttributeResolverImpl("toto", Collections.singleton((AttributeDefinition) attrDef),
                         Collections.singleton((DataConnector) dataCon), null);
@@ -235,6 +238,7 @@
     /** Test that resolve w/ dependencies returns the expected results. */
     @Test public void resolveWithDependencies() throws Exception {
         MockDataConnector dc1 = new MockDataConnector("dc1", (Map) null);
+        dc1.initialize();
 
         final IdPAttribute attr = new IdPAttribute("test");
         attr.setValues(Arrays.asList(new StringAttributeValue("a"), new StringAttributeValue("b")));
@@ -279,8 +283,10 @@
      */
     @Test public void resolveWithDependencyFail1() throws ComponentInitializationException, ResolutionException
     /* throws Exception */{

[... 117 lines stripped ...]