[java-idp-testbed COMMIT] in /trunk/src: main/webapp/index.html test/java/idp/AbstractFlowTest.java test/resources/c1...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Apr 24 16:59:41 2014
New Revision: 203

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=203&view=rev
Log:
Alter contract such that successful events return no event, and refactor flows to take advantage.

Modified:
    trunk/src/main/webapp/index.html
    trunk/src/test/java/idp/AbstractFlowTest.java
    trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
    trunk/src/test/resources/c14n/webflows/directNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml
    trunk/src/test/resources/c14n/webflows/transientNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/transientNameIdentifier-flow.xml

Modified: trunk/src/main/webapp/index.html
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/index.html?rev=203&r1=202&r2=203&view=diff
==============================================================================
--- trunk/src/main/webapp/index.html (original)
+++ trunk/src/main/webapp/index.html Thu Apr 24 16:59:41 2014
@@ -13,7 +13,8 @@
 <li><a href="sp/SAML2/InitSSO/POST">Init SAML 2 SSO, POST Binding</a></li>
 <li><a href="sp/SAML2/InitSSO/Passive">Init SAML 2 SSO, Redirect Binding, Passive Request</a></li>
 <li><a href="sp/SAML2/InitSSO/ForceAuthn">Init SAML 2 SSO, Redirect Binding, ForceAuthn Request</a></li>
-<li><a href="idp/SAML2/Unsolicited/SSO?providerId=https://sp.example.org&shire=http://localhost:8080/sp/SAML2/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 2 SSO</a></li>
+<li><a href="idp/SAML2/Unsolicited/SSO?providerId=https://sp.example.org&shire=https://localhost:8443/sp/SAML2/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 2 SSO</a></li>
+<li><a href="idp/Shibboleth/SSO?providerId=https://sp.example.org&shire=https://localhost:8443/sp/SAML1/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 1 SSO</a></li>
 </ul>
 
 </body>

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=203&r1=202&r2=203&view=diff
==============================================================================
--- trunk/src/test/java/idp/AbstractFlowTest.java (original)
+++ trunk/src/test/java/idp/AbstractFlowTest.java Thu Apr 24 16:59:41 2014
@@ -82,7 +82,7 @@
     @Nonnull public final static String SP_ENTITY_ID = "https://sp.example.org";
 
     /** The SP ACS URL. */
-    @Nonnull public final static String SP_ACS_URL = "https://sp.example.org/SAML1/POST/ACS";
+    @Nonnull public final static String SP_ACS_URL = "https://localhost:8443/sp/SAML1/POST/ACS";
 
     /** The SP relay state. */
     @Nonnull public final static String SP_RELAY_STATE = "myRelayState";

Modified: trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml?rev=203&r1=202&r2=203&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml Thu Apr 24 16:59:41 2014
@@ -8,26 +8,22 @@
     
     <action-state id="PopulateResolution">
         <evaluate expression="PopulateResolution" />
-        <transition on="proceed" to="ResolveAttributes" />
+        <evaluate expression="ResolveAttributes" />
+        <evaluate expression="PopulateSAML2C14NCrypto" />
+        <evaluate expression="'proceed'" />
+        
+        <transition on="proceed" to="C14N" />
     </action-state>
 
-    <action-state id="ResolveAttributes">
-        <evaluate expression="ResolveAttributes" />
-        <transition on="proceed" to="PopulateSAML2C14NCrypto" />
-    </action-state>
-    
-    <action-state id="PopulateSAML2C14NCrypto">
-        <evaluate expression="PopulateSAML2C14NCrypto" />
-        <transition on="proceed" to="C14N" />
-    </action-state>    
-    
     <subflow-state id="C14N" subflow="SubjectC14N/SAML">
-            <transition on="proceed" to="TestAfterC14N" />
-            <transition on="InvalidSubjectCanonicalizationContext" to="end" />
+        <transition on="proceed" to="TestAfterC14N" />
+        <transition on="InvalidSubjectCanonicalizationContext" to="end" />
     </subflow-state>
 
     <action-state id="TestAfterC14N">
         <evaluate expression="TestAfterC14N" />
+        <evaluate expression="'proceed'" />
+        
         <transition on="proceed" to="end" />
     </action-state>    
     
@@ -38,6 +34,5 @@
     </end-state>
     
     <bean-import resource="beans.xml" />
-
     
-    </flow>
+</flow>

Modified: trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml?rev=203&r1=202&r2=203&view=diff

[... 236 lines stripped ...]