[java-idp-testbed COMMIT] in /trunk/src/test: java/idp/c14n/TestC14N.java resources/c14n/test-webflow-config.xml reso...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 05:35:37 2014
New Revision: 156

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=156&view=rev
Log:
IdP 359  Tests for Transient, CryptoTransient and Directr NameIdentifier C14N

Added:
    trunk/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml   (with props)
    trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml   (with props)
Modified:
    trunk/src/test/java/idp/c14n/TestC14N.java
    trunk/src/test/resources/c14n/test-webflow-config.xml
    trunk/src/test/resources/c14n/webflows/beans.xml
    trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/directNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/transientNameID-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=156&r1=155&r2=156&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestC14N.java Sat Feb 22 05:35:37 2014
@@ -36,12 +36,11 @@
 public class TestC14N extends AbstractFlowTest {
     
     static {
-        System.setProperty("idp.c14n.flows", "SAML2.*|Simple|Legacy.*");
+        System.setProperty("idp.c14n.flows", "SAML2.*|Simple|Legacy.*|SAML1.*");
     }
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(TestC14N.class);
-
 
     @Test public void testTransientNameID() {
 
@@ -53,7 +52,6 @@
         Assert.assertNotNull(outcome);
         Assert.assertEquals(outcome.getId(), "end");
         Assert.assertTrue(result.isEnded());
-
     }
     
     @Test public void testCryptoTransientNameID() {
@@ -66,7 +64,6 @@
         Assert.assertNotNull(outcome);
         Assert.assertEquals(outcome.getId(), "end");
         Assert.assertTrue(result.isEnded());
-
     }
     
     @Test public void testDirectNameID() {
@@ -79,7 +76,41 @@
         Assert.assertNotNull(outcome);
         Assert.assertEquals(outcome.getId(), "end");
         Assert.assertTrue(result.isEnded());
-
     }
 
+    @Test public void testTransientNameIdentifier() {
+
+        FlowExecutionResult result = flowExecutor.launchExecution("transientNameIdentifier", null, externalContext);
+        Assert.assertEquals("transientNameIdentifier", result.getFlowId());
+
+        FlowExecutionOutcome outcome = result.getOutcome();
+        log.debug("flow outcome {}", outcome);
+        Assert.assertNotNull(outcome);
+        Assert.assertEquals(outcome.getId(), "end");
+        Assert.assertTrue(result.isEnded());
+    }
+    
+    @Test public void testCryptoTransientNameIdentifier() {
+
+        FlowExecutionResult result = flowExecutor.launchExecution("cryptoTransientNameIdentifier", null, externalContext);
+        Assert.assertEquals("cryptoTransientNameIdentifier", result.getFlowId());
+
+        FlowExecutionOutcome outcome = result.getOutcome();
+        log.debug("flow outcome {}", outcome);
+        Assert.assertNotNull(outcome);
+        Assert.assertEquals(outcome.getId(), "end");
+        Assert.assertTrue(result.isEnded());
+    }
+    
+    @Test public void testDirectNameIdentifier() {
+
+        FlowExecutionResult result = flowExecutor.launchExecution("directNameIdentifier", null, externalContext);
+        Assert.assertEquals("directNameIdentifier", result.getFlowId());
+
+        FlowExecutionOutcome outcome = result.getOutcome();
+        log.debug("flow outcome {}", outcome);
+        Assert.assertNotNull(outcome);
+        Assert.assertEquals(outcome.getId(), "end");
+        Assert.assertTrue(result.isEnded());
+    }
 }

Modified: trunk/src/test/resources/c14n/test-webflow-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/test-webflow-config.xml?rev=156&r1=155&r2=156&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/test-webflow-config.xml (original)
+++ trunk/src/test/resources/c14n/test-webflow-config.xml Sat Feb 22 05:35:37 2014
@@ -12,6 +12,8 @@
         <webflow:flow-location id="directNameID" path="/directNameID-flow.xml" />
 
         <webflow:flow-location id="transientNameIdentifier" path="/transientNameIdentifier-flow.xml" />
+        <webflow:flow-location id="cryptoTransientNameIdentifier" path="/cryptoTransientNameIdentifier-flow.xml" />
+        <webflow:flow-location id="directNameIdentifier" path="/directNameIdentifier-flow.xml" />
     </webflow:flow-registry>      
     
     <webflow:flow-executor id="flowExecutor" flow-registry="testFlowRegistry"/>

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

[... 83 lines stripped ...]