[java-idp-testbed COMMIT] in /trunk/src/test/java/idp: AbstractFlowTest.java AbstractSAML1FlowTest.java AbstractSAML2...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Apr 24 14:13:00 2014
New Revision: 198

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=198&view=rev
Log:
Checkpoint flow test cleanup. Add AbstractSAML2FlowTest.

Added:
    trunk/src/test/java/idp/AbstractSAML2FlowTest.java   (with props)
Modified:
    trunk/src/test/java/idp/AbstractFlowTest.java
    trunk/src/test/java/idp/AbstractSAML1FlowTest.java
    trunk/src/test/java/idp/saml1/SAML1AttributeQueryTest.java
    trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2UnsolicitedFlowTest.java

Modified: trunk/src/test/java/idp/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/AbstractFlowTest.java?rev=198&r1=197&r2=198&view=diff
==============================================================================
--- trunk/src/test/java/idp/AbstractFlowTest.java (original)
+++ trunk/src/test/java/idp/AbstractFlowTest.java Thu Apr 24 14:13:00 2014
@@ -54,7 +54,6 @@
 import org.testng.annotations.BeforeTest;
 
 import com.unboundid.ldap.sdk.LDAPException;
-
 import common.InMemoryDirectory;
 import common.PathPropertySupport;
 
@@ -210,6 +209,18 @@
     }
 
     /**
+     * Assert that the profile request context has an outbound message context and that the outbound message context has
+     * a message.
+     * 
+     * @param profileRequestContext the profile request context
+     */
+    public void assertProfileRequestContext(@Nullable final ProfileRequestContext profileRequestContext) {
+        Assert.assertNotNull(profileRequestContext);
+        Assert.assertNotNull(profileRequestContext.getOutboundMessageContext());
+        Assert.assertNotNull(profileRequestContext.getOutboundMessageContext().getMessage());
+    }
+
+    /**
      * Build a SOAP11 {@link Envelope} with the given payload.
      * 
      * @param payload the payload

Modified: trunk/src/test/java/idp/AbstractSAML1FlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/AbstractSAML1FlowTest.java?rev=198&r1=197&r2=198&view=diff
==============================================================================
--- trunk/src/test/java/idp/AbstractSAML1FlowTest.java (original)
+++ trunk/src/test/java/idp/AbstractSAML1FlowTest.java Thu Apr 24 14:13:00 2014
@@ -25,6 +25,7 @@
 import net.shibboleth.idp.saml.xml.SAMLConstants;
 
 import org.opensaml.core.xml.schema.XSString;
+import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.SAMLVersion;
 import org.opensaml.saml.saml1.core.Assertion;
@@ -64,7 +65,9 @@
      * Calls assert methods :
      * <ul>
      * <li>{@link AbstractFlowTest#assertFlowExecutionResult(FlowExecutionResult, String)}</li>
-     * <li>{@link #assertProfileRequestContext(ProfileRequestContext)}</li>
+     * <li>{@link AbstractFlowTest#assertFlowExecutionOutcome(FlowExecutionOutcome)}</li>
+     * <li>{@link AbstractFlowTest#assertProfileRequestContext(ProfileRequestContext)}</li>
+     * <li>{@link #assertOutboundMessageContextMessage(MessageContext)}</li>
      * <li>{@link #assertResponse(Response)}</li>
      * <li>{@link #assertAssertions(List)}</li>
      * <li>{@link #assertAssertion(Assertion)}</li>
@@ -82,7 +85,9 @@
 
         final ProfileRequestContext prc = (ProfileRequestContext) outcome.getOutput().get(OUTPUT_ATTR_NAME);
         assertProfileRequestContext(prc);
-
+        
+        assertOutboundMessageContextMessage(prc.getOutboundMessageContext());
+        
         final Response response = (Response) prc.getOutboundMessageContext().getMessage();
         assertResponse(response);
 
@@ -195,17 +200,14 @@
         final List<Attribute> attributes = attributeStatement.getAttributes();
         assertAttributes(attributes);
     }
-
-    /**
-     * Assert that the profile request context has an outbound message context whose message is a SAML 1 response.
-     * 
-     * @param profileRequestContext the profile request context
-     */
-    public void assertProfileRequestContext(@Nullable final ProfileRequestContext profileRequestContext) {
-        Assert.assertNotNull(profileRequestContext);
-        Assert.assertNotNull(profileRequestContext.getOutboundMessageContext());
-        Assert.assertNotNull(profileRequestContext.getOutboundMessageContext().getMessage());
-        Assert.assertTrue(profileRequestContext.getOutboundMessageContext().getMessage() instanceof Response);
+    
+    /**
+     * Assert that the outbound message context message is a SAML 1 response.
+     * 
+     * @param outboundMessageContext the outbound message context
+     */
+    public void assertOutboundMessageContextMessage(@Nonnull final MessageContext outboundMessageContext) {
+        Assert.assertTrue(outboundMessageContext.getMessage() instanceof Response);
     }
 
     /**
@@ -239,7 +241,7 @@
     }
 
     /**
-     * Assert that the assertion has the correct major and minor version and the issuer is correct.

[... 214 lines stripped ...]