Index: com/opensymphony/webwork/TestConfigurationProvider.java
===================================================================
RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/TestConfigurationProvider.java,v
retrieving revision 1.9
diff -u -r1.9 TestConfigurationProvider.java
--- com/opensymphony/webwork/TestConfigurationProvider.java	17 Nov 2005 07:09:33 -0000	1.9
+++ com/opensymphony/webwork/TestConfigurationProvider.java	6 Mar 2006 22:48:30 -0000
@@ -14,6 +14,7 @@
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.config.entities.PackageConfig;
 import com.opensymphony.xwork.config.entities.ResultConfig;
+import com.opensymphony.xwork.config.entities.InterceptorMapping;
 import com.opensymphony.xwork.interceptor.ParametersInterceptor;
 
 import java.util.ArrayList;
@@ -73,13 +74,13 @@
 
         results.put(Action.SUCCESS, successConfig);
 
-        interceptors.add(new ParametersInterceptor());
+        interceptors.add(new InterceptorMapping("params", new ParametersInterceptor()));
 
         ActionConfig testActionConfig = new ActionConfig(null, TestAction.class, null, results, interceptors);
         defaultPackageConfig.addActionConfig(TEST_ACTION_NAME, testActionConfig);
 
         interceptors = new ArrayList();
-        interceptors.add(new TokenInterceptor());
+        interceptors.add(new InterceptorMapping("token", new TokenInterceptor()));
 
         results = new HashMap();
 
@@ -87,7 +88,7 @@
         defaultPackageConfig.addActionConfig(TOKEN_ACTION_NAME, tokenActionConfig);
 
         interceptors = new ArrayList();
-        interceptors.add(new TokenSessionStoreInterceptor());
+        interceptors.add(new InterceptorMapping("token-session", new TokenSessionStoreInterceptor()));
 
         results = new HashMap();
 
Index: com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
===================================================================
RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java,v
retrieving revision 1.2
diff -u -r1.2 ExecuteAndWaitInterceptorTest.java
--- com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java	1 Mar 2006 20:14:03 -0000	1.2
+++ com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java	6 Mar 2006 22:48:30 -0000
@@ -18,6 +18,7 @@
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.config.entities.PackageConfig;
 import com.opensymphony.xwork.config.entities.ResultConfig;
+import com.opensymphony.xwork.config.entities.InterceptorMapping;
 import com.opensymphony.xwork.interceptor.ParametersInterceptor;
 
 import javax.servlet.http.HttpSession;
@@ -189,9 +190,10 @@
             results.put(ExecuteAndWaitInterceptor.WAIT, new ResultConfig(ExecuteAndWaitInterceptor.WAIT, MockResult.class, null));
 
             // interceptors
+            waitInterceptor = new ExecuteAndWaitInterceptor();
             List interceptors = new ArrayList();
-            interceptors.add(new ParametersInterceptor());
-            interceptors.add(waitInterceptor = new ExecuteAndWaitInterceptor());
+            interceptors.add(new InterceptorMapping("params", new ParametersInterceptor()));
+            interceptors.add(new InterceptorMapping("execAndWait", waitInterceptor));
 
             ActionConfig ac = new ActionConfig(null, ExecuteAndWaitDelayAction.class, null, results, interceptors);
             wait.addActionConfig("action1", ac);