[java-idp-testbed COMMIT] in /trunk/src/test: java/idp/c14n/TestC14N.java resources/c14n/webflows/cryptoTransientName...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 26 14:53:06 2014
New Revision: 162

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=162&view=rev
Log:
Improve c14n config layout, splitting into authn and saml flow sets.

Modified:
    trunk/src/test/java/idp/c14n/TestC14N.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/test/java/idp/c14n/TestC14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/TestC14N.java?rev=162&r1=161&r2=162&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestC14N.java Wed Feb 26 14:53:06 2014
@@ -41,12 +41,12 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(TestC14N.class);
 
     @BeforeClass public void setPerClassProperties() {
-        System.setProperty("idp.c14n.flows", "SAML2.*|Simple|Legacy.*|SAML1.*");
+        //System.setProperty("idp.c14n.flows", "SAML2.*|Legacy.*|SAML1.*");
     }
     
     @AfterClass public void resetPerClassProperties() {
         // Taken from idp.properties
-        System.setProperty("idp.c14n.flows", "Simple");
+        //System.setProperty("idp.c14n.flows", "Simple");
     }
 
     @Test public void testTransientNameID() {

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=162&r1=161&r2=162&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml Wed Feb 26 14:53:06 2014
@@ -21,7 +21,7 @@
         <transition on="proceed" to="C14N" />
     </action-state>    
     
-    <subflow-state id="C14N" subflow="SubjectC14N">
+    <subflow-state id="C14N" subflow="SubjectC14N/SAML">
             <transition on="proceed" to="TestAfterC14N" />
             <transition on="InvalidSubjectCanonicalizationContext" to="end" />
     </subflow-state>

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=162&r1=161&r2=162&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml Wed Feb 26 14:53:06 2014
@@ -21,7 +21,7 @@
         <transition on="proceed" to="C14N" />
     </action-state>    
     
-    <subflow-state id="C14N" subflow="SubjectC14N">
+    <subflow-state id="C14N" subflow="SubjectC14N/SAML">
             <transition on="proceed" to="TestAfterC14N" />
             <transition on="InvalidSubjectCanonicalizationContext" to="end" />
     </subflow-state>

Modified: trunk/src/test/resources/c14n/webflows/directNameID-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/directNameID-flow.xml?rev=162&r1=161&r2=162&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/directNameID-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/directNameID-flow.xml Wed Feb 26 14:53:06 2014
@@ -21,7 +21,7 @@
         <transition on="proceed" to="C14N" />
     </action-state>    
     
-    <subflow-state id="C14N" subflow="SubjectC14N">
+    <subflow-state id="C14N" subflow="SubjectC14N/SAML">
             <transition on="proceed" to="TestAfterC14N" />
             <transition on="InvalidSubjectCanonicalizationContext" to="end" />
     </subflow-state>

Modified: trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml?rev=162&r1=161&r2=162&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml Wed Feb 26 14:53:06 2014
@@ -21,7 +21,7 @@
         <transition on="proceed" to="C14N" />
     </action-state>    
     
-    <subflow-state id="C14N" subflow="SubjectC14N">
+    <subflow-state id="C14N" subflow="SubjectC14N/SAML">
             <transition on="proceed" to="TestAfterC14N" />

[... 33 lines stripped ...]