[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile: SamlActio...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Dec  5 15:05:36 2011
New Revision: 4080

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4080&view=rev
Log:
some more unit tet work and demonstration of an OpenSAML issue for Brent to look at

Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/SamlActionTestingSupport.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddDoNotCacheConditionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotBeforeConditionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/Saml1ActionTestingSupport.java

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/SamlActionTestingSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/SamlActionTestingSupport.java?rev=4080&r1=4079&r2=4080&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/SamlActionTestingSupport.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/SamlActionTestingSupport.java Mon Dec  5 15:05:36 2011
@@ -20,18 +20,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import net.shibboleth.idp.profile.ProfileRequestContext;
-import net.shibboleth.idp.relyingparty.ProfileConfiguration;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
-import net.shibboleth.idp.relyingparty.RelyingPartySubcontext;
 
 import org.opensaml.messaging.context.BasicMessageContext;
 import org.opensaml.messaging.context.BasicMessageMetadataSubcontext;
-import org.opensaml.messaging.context.SubcontextContainer;
-import org.opensaml.util.collections.CollectionSupport;
-import org.opensaml.util.constraint.documented.NotEmpty;
-import org.opensaml.util.constraint.documented.NotNull;
-import org.opensaml.util.constraint.documented.Null;
-import org.opensaml.util.criteria.StaticResponseEvaluableCriterion;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.webflow.context.servlet.ServletExternalContext;
@@ -138,32 +129,4 @@
 
         return context;
     }
-
-    /**
-     * Builds a {@link RelyingPartySubcontext} that is a child of the given parent context. The build subcontext
-     * contains:
-     * <ul>
-     * <li>a {@link RelyingPartyConfiguration} whose ID is the given relying party ID and contains the given active
-     * profile configuration</li>
-     * <li>a {@link ProfileConfiguration} set to the given profile configuration</li>
-     * </ul>
-     * 
-     * @param parent the parent of the created subcontext
-     * @param relyingPartyId the ID of the relying party
-     * @param activeProfileConfig the active profile configuration
-     * 
-     * @return the constructed subcontext
-     */
-    public static RelyingPartySubcontext buildRelyingPartySubcontext(@NotNull SubcontextContainer parent,
-            @NotNull @NotEmpty String relyingPartyId, @Null ProfileConfiguration activeProfileConfig) {
-        RelyingPartyConfiguration rpConfig =
-                new RelyingPartyConfiguration(relyingPartyId, OUTBOUND_MSG_ISSUER,
-                        StaticResponseEvaluableCriterion.TRUE_RESPONSE, CollectionSupport.toList(activeProfileConfig));
-
-        RelyingPartySubcontext subcontext = new RelyingPartySubcontext(parent, relyingPartyId);
-        subcontext.setProfileConfiguration(activeProfileConfig);
-        subcontext.setRelyingPartyConfiguration(rpConfig);
-
-        return subcontext;
-    }
 }

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertionsTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertionsTest.java?rev=4080&r1=4079&r2=4080&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertionsTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertionsTest.java Mon Dec  5 15:05:36 2011
@@ -42,7 +42,7 @@
         ProfileRequestContext<Object, Response> profileRequestContext =
                 SamlActionTestingSupport.buildProfileRequestContext();
 

[... 392 lines stripped ...]