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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Mar 24 16:38:40 2012
New Revision: 4132

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4132&view=rev
Log:
Enhanced Tests.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValuePredicateMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/OrMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AndMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValuePredicateMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/OrMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcherTest.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcher.java?rev=4132&r1=4131&r2=4132&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcher.java Sat Mar 24 16:38:40 2012
@@ -55,7 +55,8 @@
      * 
      * @param composedMatchers matchers being composed
      */
-    public AbstractComposedMatcher(@Nullable @NullableElements final Collection<AttributeValueMatcher> composedMatchers) {
+    public AbstractComposedMatcher(@Nullable @NullableElements final 
+            Collection<AttributeValueMatcher> composedMatchers) {
         ArrayList<AttributeValueMatcher> checkedMatchers = new ArrayList<AttributeValueMatcher>();
 
         if (composedMatchers != null) {

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValuePredicateMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValuePredicateMatcher.java?rev=4132&r1=4131&r2=4132&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValuePredicateMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValuePredicateMatcher.java Sat Mar 24 16:38:40 2012
@@ -67,6 +67,7 @@
                     matchedValues.add(value);
                 }
             } catch (Exception e) {
+                // TODO RDW Work out how to provoke this path when nothing inside throws an exception, just errors
                 log.debug("Attribute value '{}' of type '{}' caused an error while being evaluated '{}':\n{}",
                         new Object[] {value, value.getClass().getName(), valuePredicate.getClass().getName(), e});
                 throw new AttributeFilteringException("Unable to apply predicate to attribute value", e);

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcher.java?rev=4132&r1=4131&r2=4132&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcher.java Sat Mar 24 16:38:40 2012
@@ -69,7 +69,8 @@
     }
 
     /** {@inheritDoc} */
-    public Set<AttributeValue> getMatchingValues(final Attribute attribute, final AttributeFilterContext filterContext)
+    public Set<AttributeValue> getMatchingValues(@Nonnull final Attribute attribute,

[... 679 lines stripped ...]