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

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 28 15:46:08 2014
New Revision: 243

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=243&view=rev
Log:
Convert Direct c14n flows into Transform flows with no transforms.

Added:
    trunk/src/test/resources/c14n/webflows/transformNameID-flow.xml
      - copied, changed from r241, trunk/src/test/resources/c14n/webflows/directNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/transformNameIdentifier-flow.xml
      - copied, changed from r241, trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml
Modified:
    trunk/src/test/java/idp/AbstractFlowTest.java
    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/directNameID-flow.xml
    trunk/src/test/resources/c14n/webflows/directNameIdentifier-flow.xml

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=243&r1=242&r2=243&view=diff
==============================================================================
--- trunk/src/test/java/idp/AbstractFlowTest.java (original)
+++ trunk/src/test/java/idp/AbstractFlowTest.java Wed May 28 15:46:08 2014
@@ -124,10 +124,10 @@
     @Nonnull public final static String IP_ADDRESS_AUTHN_FLOW_ID = "authn/IPAddress";
     
     /** The name of the bean defining the SAML 1 Direct c14n descriptor. */
-    @Nonnull public final static String SAML1_DIRECT_C14N_BEAN_NAME = "c14n/SAML1Direct";
+    @Nonnull public final static String SAML1_TRANSFORM_C14N_BEAN_NAME = "c14n/SAML1Transform";
 
     /** The name of the bean defining the SAML 2 Direct c14n descriptor. */
-    @Nonnull public final static String SAML2_DIRECT_C14N_BEAN_NAME = "c14n/SAML2Direct";
+    @Nonnull public final static String SAML2_TRANSFORM_C14N_BEAN_NAME = "c14n/SAML2Transform";
     
     /** In-memory directory server. */
     @NonnullAfterInit protected InMemoryDirectory directoryServer;
@@ -335,14 +335,14 @@
                 new RelyingPartyIdPredicate(Collections.singletonList(SP_ENTITY_ID)));
         
         SubjectCanonicalizationFlowDescriptor c14n =
-                applicationContext.getBean(SAML1_DIRECT_C14N_BEAN_NAME, SubjectCanonicalizationFlowDescriptor.class);
+                applicationContext.getBean(SAML1_TRANSFORM_C14N_BEAN_NAME, SubjectCanonicalizationFlowDescriptor.class);
         c14n.setActivationCondition(condition);
 
         condition = Predicates.and(
                 new NameIDCanonicalization.ActivationCondition(),
                 new RelyingPartyIdPredicate(Collections.singletonList(SP_ENTITY_ID)));
         
-        c14n = applicationContext.getBean(SAML2_DIRECT_C14N_BEAN_NAME, SubjectCanonicalizationFlowDescriptor.class);
+        c14n = applicationContext.getBean(SAML2_TRANSFORM_C14N_BEAN_NAME, SubjectCanonicalizationFlowDescriptor.class);
         c14n.setActivationCondition(condition);
     }
     

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=243&r1=242&r2=243&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestC14N.java Wed May 28 15:46:08 2014
@@ -52,11 +52,11 @@
         assertFlowExecutionOutcome(result.getOutcome());
     }
 
-    @Test public void testDirectNameID() {
+    @Test public void testTransformNameID() {
 
-        final FlowExecutionResult result = flowExecutor.launchExecution("directNameID", null, externalContext);
+        final FlowExecutionResult result = flowExecutor.launchExecution("transformNameID", null, externalContext);
 
-        assertFlowExecutionResult(result, "directNameID");
+        assertFlowExecutionResult(result, "transformNameID");
         assertFlowExecutionOutcome(result.getOutcome());
     }
 
@@ -78,11 +78,11 @@
         assertFlowExecutionOutcome(result.getOutcome());
     }
 
-    @Test public void testDirectNameIdentifier() {
+    @Test public void testTransformNameIdentifier() {
 
-        final FlowExecutionResult result = flowExecutor.launchExecution("directNameIdentifier", null, externalContext);
+        final FlowExecutionResult result = flowExecutor.launchExecution("transformNameIdentifier", null, externalContext);
 
-        assertFlowExecutionResult(result, "directNameIdentifier");
+        assertFlowExecutionResult(result, "transformNameIdentifier");
         assertFlowExecutionOutcome(result.getOutcome());
     }
     

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=243&r1=242&r2=243&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/test-webflow-config.xml (original)

[... 70 lines stripped ...]