[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttribute...

[noreply at shibboleth.net]

Author: rdw
Date: Sat May 18 07:02:44 2013
New Revision: 4476

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4476&view=rev
Log:
More refactporing provoked regressions.

Modified:
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java

Modified: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java?rev=4476&r1=4475&r2=4476&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java (original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java Sat May 18 07:02:44 2013
@@ -30,20 +30,19 @@
 import net.shibboleth.idp.attribute.filtering.AttributeFilterPolicy;
 import net.shibboleth.idp.attribute.filtering.AttributeFilteringEngine;
 import net.shibboleth.idp.attribute.filtering.AttributeValueFilterPolicy;
-import net.shibboleth.idp.attribute.filtering.MockAttributeValueMatcher;
+import net.shibboleth.idp.attribute.filtering.MatchFunctor;
+import net.shibboleth.idp.attribute.filtering.MockMatchFunctor;
 import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.RequestContextBuilder;
+import net.shibboleth.idp.relyingparty.RelyingPartyContext;
 
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.idp.profile.RequestContextBuilder;
-import net.shibboleth.idp.relyingparty.RelyingPartyContext;
-
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.test.MockRequestContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 
 /** {@link FilterAttributes} unit test. */
@@ -109,7 +108,7 @@
 
         List<Attribute> attributes = Arrays.asList(attribute1, attribute2);
 
-        MockAttributeValueMatcher attribute1Matcher = new MockAttributeValueMatcher();
+        MockMatchFunctor attribute1Matcher = new MockMatchFunctor();
         attribute1Matcher.setMatchingAttribute("attribute1");
         attribute1Matcher.setMatchingValues(null);
 
@@ -118,7 +117,7 @@
         attribute1Policy.setValueMatcher(attribute1Matcher);
 
         AttributeFilterPolicy policy =
-                new AttributeFilterPolicy("attribute1Policy", Predicates.alwaysTrue(),
+                new AttributeFilterPolicy("attribute1Policy", MatchFunctor.MATCHES_ALL,
                         Lists.newArrayList(attribute1Policy));
 
         AttributeFilteringEngine engine = new AttributeFilteringEngine("engine", Lists.newArrayList(policy));
@@ -167,7 +166,7 @@
 
         List<Attribute> attributes = Arrays.asList(attribute1, attribute2);
 
-        MockAttributeValueMatcher attribute1Matcher = new MockAttributeValueMatcher();
+        MockMatchFunctor attribute1Matcher = new MockMatchFunctor();
         attribute1Matcher.setMatchingAttribute("attribute1");
         attribute1Matcher.setMatchingValues(null);
 
@@ -176,7 +175,7 @@
         attribute1Policy.setValueMatcher(attribute1Matcher);
 
         AttributeFilterPolicy policy =
-                new AttributeFilterPolicy("attribute1Policy", Predicates.alwaysTrue(),
+                new AttributeFilterPolicy("attribute1Policy", MatchFunctor.MATCHES_ALL,
                         Lists.newArrayList(attribute1Policy));
 
         AttributeFilteringEngine engine = new AttributeFilteringEngine("engine", Lists.newArrayList(policy));
@@ -224,7 +223,7 @@
 
         List<Attribute> attributes = Arrays.asList(attribute1);
 
-        MockAttributeValueMatcher attribute1Matcher = new MockAttributeValueMatcher();
+        MockMatchFunctor attribute1Matcher = new MockMatchFunctor();
         attribute1Matcher.setMatchingAttribute("attribute1");
         attribute1Matcher.setMatchingValues(null);
 
@@ -233,7 +232,7 @@
         attribute1Policy.setValueMatcher(attribute1Matcher);
 
         AttributeFilterPolicy policy =
-                new AttributeFilterPolicy("attribute1Policy", Predicates.alwaysTrue(),
+                new AttributeFilterPolicy("attribute1Policy", MatchFunctor.MATCHES_ALL,
                         Lists.newArrayList(attribute1Policy));
 
         AttributeFilteringEngine engine = new AttributeFilteringEngine("engine", Lists.newArrayList(policy));