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

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Mar 16 13:10:18 2012
New Revision: 4121

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4121&view=rev
Log:
Fix more compilation errors

Modified:
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java?rev=4121&r1=4120&r2=4121&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java Fri Mar 16 13:10:18 2012
@@ -17,7 +17,6 @@
 
 package net.shibboleth.idp.attribute.resolver;
 
-import java.util.Collections;
 import java.util.Map;
 
 import net.shibboleth.idp.attribute.Attribute;
@@ -37,8 +36,7 @@
 
     /** Test post-instantiation state. */
     @Test public void testInstantiation() throws Exception {
-        AttributeResolver resolver = new AttributeResolver();
-        resolver.setId(" foo ");
+        AttributeResolver resolver = new AttributeResolver("foo", null, null);
         resolver.initialize();
 
         Assert.assertEquals(resolver.getId(), "foo");
@@ -50,79 +48,41 @@
 
     /** Test getting, setting, overwriting, defensive collection copy. */
     @Test public void testSetAttributeDefinitions() throws Exception {
-        AttributeResolver resolver = new AttributeResolver();
-        resolver.setId(" foo ");
-
-        LazySet<BaseAttributeDefinition> definitions = null;
-        resolver.setAttributeDefinition(definitions);
-        Assert.assertNotNull(resolver.getAttributeDefinitions());
-        Assert.assertTrue(resolver.getAttributeDefinitions().isEmpty());
-
-        definitions = new LazySet<BaseAttributeDefinition>();
-        resolver.setAttributeDefinition(definitions);
-        Assert.assertNotNull(resolver.getAttributeDefinitions());
-        Assert.assertTrue(resolver.getAttributeDefinitions().isEmpty());
-
+        LazySet<BaseAttributeDefinition> definitions = new LazySet<BaseAttributeDefinition>();
         definitions.add(new MockAttributeDefinition("foo", new Attribute("test")));
         definitions.add(null);
         definitions.add(new MockAttributeDefinition("bar", new Attribute("test")));
         definitions.add(new MockAttributeDefinition("foo", new Attribute("test")));
-        resolver.setAttributeDefinition(definitions);
+
+        AttributeResolver resolver = new AttributeResolver(" foo ", definitions, null);
+        resolver.initialize();
         Assert.assertNotNull(resolver.getAttributeDefinitions());
         Assert.assertEquals(resolver.getAttributeDefinitions().size(), 2);
-
-        definitions.clear();
-        Assert.assertNotNull(resolver.getAttributeDefinitions());
-        Assert.assertEquals(resolver.getAttributeDefinitions().size(), 2);
-
-        resolver.setAttributeDefinition(definitions);
-        Assert.assertNotNull(resolver.getAttributeDefinitions());
-        Assert.assertTrue(resolver.getAttributeDefinitions().isEmpty());
     }
 
     /** Test getting, setting, overwriting, defensive collection copy. */
     @Test public void testSetDataConnectors() throws Exception {
-        AttributeResolver resolver = new AttributeResolver();
-        resolver.setId(" foo ");
-
-        LazySet<BaseDataConnector> connectors = null;
-        resolver.setDataConnectors(connectors);
-        Assert.assertNotNull(resolver.getDataConnectors());
-        Assert.assertTrue(resolver.getDataConnectors().isEmpty());
-
-        connectors = new LazySet<BaseDataConnector>();
-        resolver.setDataConnectors(connectors);
-        Assert.assertNotNull(resolver.getDataConnectors());
-        Assert.assertTrue(resolver.getDataConnectors().isEmpty());
-
+        LazySet<BaseDataConnector> connectors = new LazySet<BaseDataConnector>();
         connectors.add(new MockDataConnector("foo", (Map) null));
         connectors.add(null);
         connectors.add(new MockDataConnector("bar", (Map) null));
         connectors.add(new MockDataConnector("foo", (Map) null));
-        resolver.setDataConnectors(connectors);
+
+        AttributeResolver resolver = new AttributeResolver("foo", null, connectors);
         Assert.assertNotNull(resolver.getDataConnectors());
         Assert.assertEquals(resolver.getDataConnectors().size(), 2);
-
-        connectors.clear();
-        Assert.assertNotNull(resolver.getDataConnectors());
-        Assert.assertEquals(resolver.getDataConnectors().size(), 2);
-
-        resolver.setDataConnectors(connectors);
-        Assert.assertNotNull(resolver.getDataConnectors());
-        Assert.assertTrue(resolver.getDataConnectors().isEmpty());
     }
 

[... 265 lines stripped ...]