[java-idp-testbed COMMIT] in /trunk/src/test/java/idp: saml1/AbstractSAML1FlowTest.java saml2/AbstractSAML2FlowTest.j...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Apr 24 20:22:38 2014
New Revision: 204

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=204&view=rev
Log:
Checkpoint some flow test work. Initial SAML2AttributeQueryFlowTest.

Added:
    trunk/src/test/java/idp/saml2/SAML2AttributeQueryFlowTest.java   (with props)
Modified:
    trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java
    trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java

Modified: trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java?rev=204&r1=203&r2=204&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java Thu Apr 24 20:22:38 2014
@@ -40,6 +40,7 @@
 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;
@@ -71,6 +72,7 @@
      * <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>
@@ -92,6 +94,8 @@
         
         final Response response = (Response) prc.getOutboundMessageContext().getMessage();
         assertResponse(response);
+        
+        assertStatus(response.getStatus());
 
         final List<Assertion> assertions = response.getAssertions();
         assertAssertions(assertions);
@@ -221,13 +225,23 @@
     public void assertResponse(@Nullable final Response response) {
         Assert.assertNotNull(response);
         Assert.assertEquals(response.getVersion(), SAMLVersion.VERSION_11);
-        Assert.assertEquals(response.getStatus().getStatusCode().getValue(), StatusCode.SUCCESS);
         Assert.assertNotNull(response.getAssertions());
         Assert.assertFalse(response.getAssertions().isEmpty());
         Assert.assertEquals(response.getAssertions().size(), 1);
         Assert.assertNotNull(response.getAssertions().get(0));
         // TODO response.getIssueInstant()
         // TODO response.getRecipient()
+    }
+    
+    /**
+     * Assert that the status has a status code of {@link StatusCode#SUCCESS}.
+     *  
+     * @param status the status
+     */
+    public void assertStatus(@Nullable final Status status) {
+        Assert.assertNotNull(status);
+        Assert.assertNotNull(status.getStatusCode());
+        Assert.assertEquals(status.getStatusCode().getValue(), StatusCode.SUCCESS);
     }
 
     /**

Modified: trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java?rev=204&r1=203&r2=204&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java Thu Apr 24 20:22:38 2014
@@ -28,11 +28,13 @@
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.SAMLVersion;
-import org.opensaml.saml.saml2.core.StatusCode;
 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.Conditions;
 import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.saml.saml2.core.Status;
+import org.opensaml.saml.saml2.core.StatusCode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
@@ -49,6 +51,8 @@
      * <p>
      * Calls validate methods :
      * <ul>
+     * <li>{@link #validateConditions(Assertion)}</li>
+     * <li>{@link #validateAuthenticationStatements(Assertion)}</li>
      * <li>{@link #validateAttributeStatements(Assertion)}</li>
      * </ul>
      * Calls assert methods :
@@ -57,7 +61,8 @@
      * <li>{@link AbstractFlowTest#assertFlowExecutionOutcome(FlowExecutionOutcome)}</li>
      * <li>{@link AbstractFlowTest#assertProfileRequestContext(ProfileRequestContext)}</li>
      * <li>{@link #assertOutboundMessageContextMessage(MessageContext)}</li>
-     * <li>
+     * <li>{@link #assertResponse(Response)}</li>
+     * <li>{@link #assertStatus(Status)}</li>
      * <li>{@link #assertAssertions(List)}</li>
      * <li>{@link #assertAssertion(Assertion)}</li>
      * </ul>
@@ -75,8 +80,12 @@

[... 97 lines stripped ...]