[java-identity-provider COMMIT] in /trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows: saml1/AbstractSAML1Fl...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun  9 22:18:28 2014
New Revision: 6070

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6070&view=rev
Log:
Checkpoint integration test work. Refactor flow tests to reuse the SAML response validator in the integration tests.

Added:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java   (with props)
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java   (with props)
Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2FlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java?rev=6070&r1=6069&r2=6070&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java Mon Jun  9 22:18:28 2014
@@ -17,33 +17,13 @@
 
 package net.shibboleth.idp.test.flows.saml1;
 
-import java.util.List;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.xml.namespace.QName;
 
-import net.shibboleth.idp.saml.xml.SAMLConstants;
 import net.shibboleth.idp.test.flows.AbstractFlowTest;
 
-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;
-import org.opensaml.saml.saml1.core.Attribute;
-import org.opensaml.saml.saml1.core.AttributeStatement;
-import org.opensaml.saml.saml1.core.Audience;
-import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
-import org.opensaml.saml.saml1.core.AuthenticationStatement;
-import org.opensaml.saml.saml1.core.Conditions;
-import org.opensaml.saml.saml1.core.ConfirmationMethod;
-import org.opensaml.saml.saml1.core.NameIdentifier;
 import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.core.Status;
-import org.opensaml.saml.saml1.core.StatusCode;
-import org.opensaml.saml.saml1.core.Subject;
-import org.opensaml.saml.saml1.core.SubjectConfirmation;
 import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
 import org.testng.Assert;
@@ -53,447 +33,43 @@
  */
 public abstract class AbstractSAML1FlowTest extends AbstractFlowTest {
 
-    /** The expected status code.*/
-    protected QName statusCode = StatusCode.SUCCESS;
-    
-    /** The expected status message when an error occurs. */
-    protected String statusMessage = "An error occurred.";
-    
     /**
-     * Top level validation of the {@link FlowExecutionResult}.
-     * <p>
-     * Calls validate methods :
-     * <ul>
-     * <li>{@link #validateConditions(Assertion)}</li>
-     * <li>{@link #validateAuthenticationStatements(Assertion)}</li>
-     * <li>{@link #validateAttributeStatements(Assertion)}</li>
-     * </ul>
-     * Calls assert methods :
-     * <ul>
-     * <li>{@link AbstractFlowTest#assertFlowExecutionResult(FlowExecutionResult, String)}</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 #assertStatus(Status)}</li>
-     * <li>{@link #assertAssertions(List)}</li>
-     * <li>{@link #assertAssertion(Assertion)}</li>
-     * </ul>
+     * Validate the {@link FlowExecutionResult} using a default {@link SAML1TestResponseValidator}.
      * 
      * @param result the flow execution result
      * @param flowId the flow ID
      */
     public void validateResult(@Nullable final FlowExecutionResult result, @Nonnull final String flowId) {
+        validateResult(result, flowId, new SAML1TestResponseValidator());
+    }
 
+    /**
+     * Validate the {@link FlowExecutionResult} using the given {@link SAML1TestResponseValidator}.
+     * 

[... 1392 lines stripped ...]