[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May  7 08:52:23 2014
New Revision: 5868

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5868&view=rev
Log:
IDP-280 Missed checkin

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java?rev=5868&r1=5867&r2=5868&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java Wed May  7 08:52:23 2014
@@ -338,8 +338,6 @@
         
         private final Function<ProfileRequestContext, String> navigate; 
 
-        private final Logger log = LoggerFactory.getLogger(TestPredicate.class);
-        
         public TestPredicate(Function<ProfileRequestContext, String> profileFinder, String compare) {
             value = Constraint.isNotNull(compare, "provided compare name must not be null");
             navigate = Constraint.isNotNull(profileFinder, "provided prinicpal locator must not be null");
@@ -347,7 +345,6 @@
 
         /** {@inheritDoc} */
         @Override public boolean apply(@Nullable ProfileRequestContext input) {
-            log.debug("Predicate, comparing '{}' with '{}' returns '{}'", value, navigate.apply(input),  value.equals(navigate.apply(input)));
             return value.equals(navigate.apply(input));
         }
     }

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java?rev=5868&r1=5867&r2=5868&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java Wed May  7 08:52:23 2014
@@ -46,6 +46,8 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
+import org.opensaml.profile.context.ProfileRequestContext;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 
@@ -199,7 +201,8 @@
 
     public static AttributeResolutionContext createResolutionContext(String principal, String issuerID,
             String recipientId) {
-        AttributeResolutionContext retVal = new AttributeResolutionContext();
+        ProfileRequestContext parent = new ProfileRequestContext<>();
+        AttributeResolutionContext retVal = parent.getSubcontext(AttributeResolutionContext.class, true);
 
         retVal.setAttributeIssuerID(issuerID);
         retVal.setAttributeRecipientID(recipientId);