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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Apr 25 14:17:25 2014
New Revision: 205

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

Added:
    trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java   (with props)
    trunk/src/test/java/idp/saml2/SAML2POSTSSOFlowTest.java   (with props)
Modified:
    trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java
    trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2UnsolicitedSSOFlowTest.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=205&r1=204&r2=205&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/AbstractSAML1FlowTest.java Fri Apr 25 14:17:25 2014
@@ -257,7 +257,8 @@
     }
 
     /**
-     * Assert that the assertion version is {@link SAMLVersion#VERSION_11}.
+     * Assert that the assertion version is {@link SAMLVersion#VERSION_11} and that the issuer is
+     * {@link AbstractFlowTest#IDP_ENTITY_ID}.
      * 
      * @param assertion the assertion
      */
@@ -413,8 +414,7 @@
     }
 
     /**
-     * Assert the confirmation method, probably {@link ConfirmationMethod#METHOD_BEARER} or
-     * {@link ConfirmationMethod#METHOD_ARTIFACT}.
+     * Assert the confirmation method.
      * 
      * @param confirmationMethod the confirmation method
      */

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=205&r1=204&r2=205&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java Fri Apr 25 14:17:25 2014
@@ -32,9 +32,11 @@
 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.NameID;
 import org.opensaml.saml.saml2.core.Response;
 import org.opensaml.saml.saml2.core.Status;
 import org.opensaml.saml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.Subject;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
@@ -65,6 +67,7 @@
      * <li>{@link #assertStatus(Status)}</li>
      * <li>{@link #assertAssertions(List)}</li>
      * <li>{@link #assertAssertion(Assertion)}</li>
+     * <li>{@link #assertSubject(Subject)}</li>
      * </ul>
      * 
      * @param result the flow execution result
@@ -92,6 +95,8 @@
 
         final Assertion assertion = assertions.get(0);
         assertAssertion(assertion);
+
+        assertSubject(assertion.getSubject());
 
         validateConditions(assertion);
 
@@ -207,7 +212,8 @@
     }
 
     /**
-     * Assert that the assertion version is {@link SAMLVersion#VERSION_20}.
+     * Assert that the assertion version is {@link SAMLVersion#VERSION_20} and that the issuer is
+     * {@link AbstractFlowTest#IDP_ENTITY_ID}.
      * 
      * @param assertion the assertion
      */
@@ -220,6 +226,23 @@
         // TODO assertion.getIssueInstant()
     }
 
+    /**
+     * Assert that the subject has a nameID and subject confirmations.
+     * 
+     * @param subject the subject
+     */
+    public void assertSubject(@Nullable final Subject subject) {
+        Assert.assertNotNull(subject);
+        Assert.assertNotNull(subject.getNameID());
+        Assert.assertNotNull(subject.getSubjectConfirmations());
+    }
+
+    public void assertNameID(@Nullable final NameID nameID) {
+        Assert.assertNotNull(nameID);
+        // TODO nameID.getNameQualifier();
+        // TODO nameID.getValue()
+    }
+
     public void assertConditions(@Nullable final Conditions conditions) {
         Assert.assertNotNull(conditions);
         // TODO implement

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=205&r1=204&r2=205&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java Fri Apr 25 14:17:25 2014
@@ -17,75 +17,46 @@
 
 package idp.saml2;
 
-import idp.AbstractFlowTest;
-
-import java.net.MalformedURLException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
 
 import javax.annotation.Nonnull;

[... 280 lines stripped ...]