[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-api/src: main/java/net/shibboleth/idp/attribute/filter...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 20 15:08:32 2012
New Revision: 4125

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4125&view=rev
Log:
clone now throws CloneNotSupportedException.

Clean up tests

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicyTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java?rev=4125&r1=4124&r2=4125&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java Tue Mar 20 15:08:32 2012
@@ -148,7 +148,11 @@
         for (String attributeId : filterContext.getPermittedAttributeValues().keySet()) {
             filteredAttributeValues = getFilteredValues(attributeId, filterContext);
             if (filteredAttributeValues.isPresent() && !filteredAttributeValues.get().isEmpty()) {
-                filteredAttribute = prefilteredAttributes.get(attributeId).clone();
+                try {
+                    filteredAttribute = prefilteredAttributes.get(attributeId).clone();
+                } catch (CloneNotSupportedException e) {
+                    throw new AttributeFilteringException(e);
+                }
                 filteredAttribute.setValues(filteredAttributeValues.get());
                 filterContext.getFilteredAttributes().put(filteredAttribute.getId(), filteredAttribute);
             }

Modified: trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java?rev=4125&r1=4124&r2=4125&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java (original)
+++ trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java Tue Mar 20 15:08:32 2012
@@ -31,11 +31,13 @@
 
 /** Unit test for {@link AttributeFilterContext}. */
 public class AttributeFilterContextTest {
-    
+
     private final StringAttributeValue aStringAttributeValue = new StringAttributeValue("a");
+
     private final StringAttributeValue bStringAttributeValue = new StringAttributeValue("b");
+
     private final StringAttributeValue cStringAttributeValue = new StringAttributeValue("c");
-    
+
     /** Test that post-construction state is what is expected. */
     @Test public void testPostConstructionState() {
         AttributeFilterContext context = new AttributeFilterContext();
@@ -88,19 +90,17 @@
         Assert.assertTrue(context.getPrefilteredAttributes().containsKey("attribute3"));
         Assert.assertEquals(context.getPrefilteredAttributes().get("attribute3"), attribute3);
 
-        context.getPrefilteredAttributes().put(null, new Attribute("foo"));
-        Assert.assertEquals(context.getPrefilteredAttributes().size(), 2);
-        Assert.assertTrue(context.getPrefilteredAttributes().containsKey("attribute1"));
-        Assert.assertEquals(context.getPrefilteredAttributes().get("attribute1"), attribute1);
-        Assert.assertTrue(context.getPrefilteredAttributes().containsKey("attribute3"));
-        Assert.assertEquals(context.getPrefilteredAttributes().get("attribute3"), attribute3);
-
-        context.getPrefilteredAttributes().put("foo", null);
-        Assert.assertEquals(context.getPrefilteredAttributes().size(), 2);
-        Assert.assertTrue(context.getPrefilteredAttributes().containsKey("attribute1"));
-        Assert.assertEquals(context.getPrefilteredAttributes().get("attribute1"), attribute1);
-        Assert.assertTrue(context.getPrefilteredAttributes().containsKey("attribute3"));
-        Assert.assertEquals(context.getPrefilteredAttributes().get("attribute3"), attribute3);
+        try {
+            context.getPrefilteredAttributes().put(null, new Attribute("foo"));
+            Assert.fail("null attribute id not allowed");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            context.getPrefilteredAttributes().put("foo", null);
+            Assert.fail("null attribute not allowed");
+        } catch (NullPointerException e) {
+        }
 
         context.getPrefilteredAttributes().remove(null);

[... 63 lines stripped ...]