[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/Intercept...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  4 22:00:34 2014
New Revision: 6838

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6838&view=rev
Log:
IDP-506 - Add intercept/ prefix to test flow names, and add constant for the prefix.

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorFlowDescriptor.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContext.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/PopulateProfileInterceptorContextTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/SelectProfileInterceptorFlowTest.java

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java?rev=6838&r1=6837&r2=6838&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java Tue Nov  4 22:00:34 2014
@@ -68,9 +68,9 @@
      * Register test flows in parent registry so they can be called by the 'intercept' flow in the parent registry.
      */
     @BeforeMethod public void registerFlowsInParentRegistry() {
-        registerFlowsInParentRegistry("intercept/test-error-flow", TEST_FLOW_REGISTRY_ID);
-        registerFlowsInParentRegistry("intercept/test-proceed-1-flow", TEST_FLOW_REGISTRY_ID);
-        registerFlowsInParentRegistry("intercept/test-proceed-2-flow", TEST_FLOW_REGISTRY_ID);
+        registerFlowsInParentRegistry(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-error-flow", TEST_FLOW_REGISTRY_ID);
+        registerFlowsInParentRegistry(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-1-flow", TEST_FLOW_REGISTRY_ID);
+        registerFlowsInParentRegistry(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-2-flow", TEST_FLOW_REGISTRY_ID);
     }
 
     @Test public void testNoAvailableFlows() {
@@ -116,10 +116,10 @@
     @Test public void testTwoAvailableFlows() {
 
         final ProfileInterceptorFlowDescriptor flowDescriptor1 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor1.setId("intercept/test-proceed-1-flow");
+        flowDescriptor1.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-1-flow");
 
         final ProfileInterceptorFlowDescriptor flowDescriptor2 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor2.setId("intercept/test-proceed-2-flow");
+        flowDescriptor2.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-2-flow");
 
         final Flow flow = getFlow(TEST_PROFILE_FLOW_ID);
 
@@ -144,7 +144,7 @@
     @Test public void testErrorFlow() {
 
         final ProfileInterceptorFlowDescriptor flowDescriptor1 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor1.setId("intercept/test-error-flow");
+        flowDescriptor1.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-error-flow");
 
         final Flow flow = getFlow(TEST_PROFILE_FLOW_ID);
 
@@ -168,10 +168,10 @@
     @Test public void testProceedThenErrorFlow() {
 
         final ProfileInterceptorFlowDescriptor flowDescriptor1 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor1.setId("intercept/test-proceed-1-flow");
+        flowDescriptor1.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-1-flow");
 
         final ProfileInterceptorFlowDescriptor flowDescriptor2 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor2.setId("intercept/test-error-flow");
+        flowDescriptor2.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-error-flow");
 
         final Flow flow = getFlow(TEST_PROFILE_FLOW_ID);
 
@@ -196,11 +196,11 @@
     @Test public void testAttemptedFlow() {
 
         final ProfileInterceptorFlowDescriptor flowDescriptor1 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor1.setId("intercept/test-proceed-1-flow");
+        flowDescriptor1.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-1-flow");
         flowDescriptor1.setActivationCondition(new ConversationScopeAttributeCondition("testProceed2"));
 
         final ProfileInterceptorFlowDescriptor flowDescriptor2 = new ProfileInterceptorFlowDescriptor();
-        flowDescriptor2.setId("intercept/test-proceed-2-flow");
+        flowDescriptor2.setId(ProfileInterceptorFlowDescriptor.FLOW_ID_PREFIX + "test-proceed-2-flow");
 
         final Flow flow = getFlow(TEST_PROFILE_FLOW_ID);
 

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorFlowDescriptor.java

[... 112 lines stripped ...]