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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Aug  1 11:04:12 2015
New Revision: 7662

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7662&view=rev
Log:
IDP-782 Allow single element And/Or

https://issues.shibboleth.net/jira/browse/IDP-782

It turns out that the "fix" consists of no more than removing the
artificial schema constraint.  Tests added to both -impl and -spring
to ensure nothing regresses.

Added:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andSingleton.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/orSingleton.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
Modified:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-basic.xsd

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java?rev=7662&r1=7661&r2=7662&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java	(original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java	Sat Aug  1 11:04:12 2015
@@ -28,7 +28,6 @@
 import net.shibboleth.idp.attribute.filter.Matcher;
 import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
 import net.shibboleth.idp.attribute.filter.matcher.impl.MockValuePredicateMatcher;
-import net.shibboleth.idp.attribute.filter.matcher.logic.impl.AndMatcher;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
 import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
@@ -73,9 +72,24 @@
         }
     }
 
+    @Test public void testSingleton() throws Exception {
+        final AndMatcher matcher =
+                new AndMatcher(Collections.singletonList((Matcher) new MockValuePredicateMatcher(or(equalTo(value1),
+                        equalTo(value2)))));
+
+        matcher.setId("test");
+        matcher.initialize();
+
+        Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
+        Assert.assertEquals(result.size(), 2);
+        Assert.assertTrue(result.contains(value2));
+        Assert.assertTrue(result.contains(value1));
+
+    }
+
     @Test public void testGetMatchingValues() throws Exception {
-        AndMatcher matcher =
-                new AndMatcher(Arrays.<Matcher>asList(
+        final AndMatcher matcher =
+                new AndMatcher(Arrays.<Matcher> asList(
                         new MockValuePredicateMatcher(or(equalTo(value1), equalTo(value2))),
                         new MockValuePredicateMatcher(or(equalTo(value2), equalTo(value3)))));
 
@@ -104,14 +118,14 @@
     }
 
     @Test public void testFails() throws Exception {
-        AndMatcher matcher = new AndMatcher(Arrays.<Matcher>asList(Matcher.MATCHES_ALL, Matcher.MATCHER_FAILS));
+        AndMatcher matcher = new AndMatcher(Arrays.<Matcher> asList(Matcher.MATCHES_ALL, Matcher.MATCHER_FAILS));
         matcher.setId("test");
         matcher.initialize();
 
         Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
         Assert.assertNull(result);
 
-        matcher = new AndMatcher(Arrays.<Matcher>asList(Matcher.MATCHER_FAILS, Matcher.MATCHES_ALL));
+        matcher = new AndMatcher(Arrays.<Matcher> asList(Matcher.MATCHER_FAILS, Matcher.MATCHES_ALL));
         matcher.setId("test");
         matcher.initialize();
 
@@ -128,7 +142,7 @@
 
     @Test public void emptyResults() throws ComponentInitializationException {
         AndMatcher matcher =
-                new AndMatcher(Arrays.<Matcher>asList(
+                new AndMatcher(Arrays.<Matcher> asList(

[... 205 lines stripped ...]