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

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  6 20:29:53 2014
New Revision: 216

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=216&view=rev
Log:
Rework c14n flow naming.

Modified:
    trunk/src/test/java/idp/c14n/TestC14N.java
    trunk/src/test/java/idp/c14n/TestLegacyC14N.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=216&r1=215&r2=216&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestC14N.java Tue May  6 20:29:53 2014
@@ -25,8 +25,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.webflow.executor.FlowExecutionResult;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /**
@@ -37,15 +35,6 @@
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(TestC14N.class);
-
-    @BeforeClass public void setPerClassProperties() {
-        // System.setProperty("idp.c14n.flows", "SAML2.*|Legacy.*|SAML1.*");
-    }
-
-    @AfterClass public void resetPerClassProperties() {
-        // Taken from idp.properties
-        // System.setProperty("idp.c14n.flows", "Simple");
-    }
 
     @Test public void testTransientNameID() {
 
@@ -96,4 +85,5 @@
         assertFlowExecutionResult(result, "directNameIdentifier");
         assertFlowExecutionOutcome(result.getOutcome());
     }
-}
+    
+}

Modified: trunk/src/test/java/idp/c14n/TestLegacyC14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/TestLegacyC14N.java?rev=216&r1=215&r2=216&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestLegacyC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestLegacyC14N.java Tue May  6 20:29:53 2014
@@ -26,8 +26,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.webflow.executor.FlowExecutionResult;
 import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /**
@@ -35,14 +33,6 @@
  */
 @ContextConfiguration({"classpath:/c14n/test-webflow-config.xml", "classpath:/c14n/locate-legacy-resolver.xml"})
 public class TestLegacyC14N extends AbstractFlowTest {
-
-    @BeforeClass public void setPerClassProperties() {
-        // System.setProperty("idp.c14n.flows", "Simple|Legacy.*");
-    }
-
-    @AfterClass public void resetPerClassProperties() {
-        // System.setProperty("idp.c14n.flows", "Simple");
-    }
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(TestLegacyC14N.class);
@@ -64,4 +54,4 @@
         assertFlowExecutionResult(result, "transientNameIdentifier");
         assertFlowExecutionOutcome(result.getOutcome());
     }
-}
+}

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=216&r1=215&r2=216&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml Tue May  6 20:29:53 2014
@@ -1,6 +1,5 @@
 <flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/webflow classpath:/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd"
-    >
+    xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
     <on-start>
         <evaluate expression="InitializeProfileRequestContext" />
@@ -15,7 +14,7 @@
         <transition on="proceed" to="C14N" />
     </action-state>
 
-    <subflow-state id="C14N" subflow="SubjectC14N/SAML">
+    <subflow-state id="C14N" subflow="c14n/saml">
         <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="TestAfterC14N" />
         <transition on="InvalidSubjectCanonicalizationContext" to="end" />

Modified: trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml

[... 114 lines stripped ...]