[java-idp-testbed COMMIT] in /trunk/src/test/java/idp: saml1/SAML1UnsolicitedSSOFlowTest.java saml2/SAML2RedirectSSOF...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Apr 24 14:36:36 2014
New Revision: 202

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=202&view=rev
Log:
Flow test cleanup.

Modified:
    trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2UnsolicitedSSOFlowTest.java

Modified: trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java?rev=202&r1=201&r2=202&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java Thu Apr 24 14:36:36 2014
@@ -53,8 +53,6 @@
 
     /**
      * Build the {@link MockHttpServletRequest}.
-     * 
-     * @throws Exception if an error occurs
      */
     public void buildRequest() {
         // TODO time request parameter ?

Modified: trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java?rev=202&r1=201&r2=202&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java Thu Apr 24 14:36:36 2014
@@ -17,6 +17,8 @@
 
 package idp.saml2;
 
+import idp.AbstractFlowTest;
+
 import java.net.MalformedURLException;
 
 import javax.annotation.Nonnull;
@@ -31,23 +33,16 @@
 
 import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObjectBuilderFactory;
-import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.encoder.MessageEncodingException;
-import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
 import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.binding.encoding.impl.HTTPRedirectDeflateEncoder;
-import org.opensaml.saml.saml2.core.Assertion;
-import org.opensaml.saml.saml2.core.Attribute;
-import org.opensaml.saml.saml2.core.AttributeStatement;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.core.Issuer;
 import org.opensaml.saml.saml2.core.NameIDPolicy;
-import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.core.StatusCode;
 import org.opensaml.saml.saml2.metadata.SingleSignOnService;
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.SignatureSigningParameters;
@@ -56,10 +51,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
@@ -80,8 +74,27 @@
 
     @Qualifier("sp.Credential") @Autowired private Credential spCredential;
 
-    @Test public void testFlow() throws Exception {
-
+    /**
+     * Test the SAML 2 redirect SSO flow.
+     * 
+     * @throws Exception
+     */
+    @Test public void testSAML2RedirectFlow() throws Exception {
+    
+        buildRequest();
+    
+        // execute the flow
+        final FlowExecutionResult result = flowExecutor.launchExecution(FLOW_ID, null, externalContext);
+    
+        validateResult(result, FLOW_ID);
+    }
+
+    /**
+     * Build the {@link MockHttpServletRequest}.
+     * 
+     * @throws Exception if an error occurs
+     */
+    public void buildRequest() throws Exception {
         // setup, mostly wrong
         AuthnRequest authnRequest = buildAuthnRequest(request);
 
@@ -100,68 +113,6 @@
                 request.addParameter("SAMLRequest", param.getSecond());
             }
         }
-
-        // execute the flow
-        FlowExecutionResult result = flowExecutor.launchExecution(FLOW_ID, null, externalContext);
-
-        // asserts
-        Assert.assertEquals(result.getFlowId(), FLOW_ID);
-
-        FlowExecutionOutcome outcome = result.getOutcome();
-        log.debug("flow outcome {}", outcome);
-
-        Assert.assertNotNull(outcome);
-        Assert.assertEquals(outcome.getId(), "end");
-        Assert.assertTrue(result.isEnded());
-
-        // Get the response
-        Assert.assertTrue(outcome.getOutput().contains(OUTPUT_ATTR_NAME));
-        Assert.assertTrue(outcome.getOutput().get(OUTPUT_ATTR_NAME) instanceof ProfileRequestContext);

[... 141 lines stripped ...]