svn commit: r424582 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2: TestConfigurationProvider.java interceptor/ExecuteAndWaitInterceptorTest.java

[tmjee]

Author: tmjee
Date: Sat Jul 22 07:25:40 2006
New Revision: 424582

URL: http://svn.apache.org/viewvc?rev=424582&view=rev
Log:
XW-386
  - fix test case failing due to (XW-386)


Modified:
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java?rev=424582&r1=424581&r2=424582&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
 Sat Jul 22 07:25:40 2006
@@ -68,7 +68,7 @@
         successParams.put("propertyName", "executionCount");
         successParams.put("expectedValue", "1");
 
-        ResultConfig successConfig = new ResultConfig(Action.SUCCESS, 
TestResult.class, successParams);
+        ResultConfig successConfig = new ResultConfig(Action.SUCCESS, 
TestResult.class.getName(), successParams);
 
         results.put(Action.SUCCESS, successConfig);
 
@@ -82,7 +82,7 @@
         successParams = new HashMap();
         successParams.put("location", "success.jsp");
 
-        successConfig = new ResultConfig(Action.SUCCESS, 
ServletDispatcherResult.class, successParams);
+        successConfig = new ResultConfig(Action.SUCCESS, 
ServletDispatcherResult.class.getName(), successParams);
 
         results.put(Action.SUCCESS, successConfig);
 
@@ -107,7 +107,7 @@
         successParams = new HashMap();
         successParams.put("actionName", EXECUTION_COUNT_ACTION_NAME);
 
-        successConfig = new ResultConfig(Action.SUCCESS, 
ActionChainResult.class, successParams);
+        successConfig = new ResultConfig(Action.SUCCESS, 
ActionChainResult.class.getName(), successParams);
 
         results.put(Action.SUCCESS, successConfig);
 
@@ -119,8 +119,8 @@
         configurationManager.addPackageConfig("", defaultPackageConfig);
 
         Map testActionTagResults = new HashMap();
-        testActionTagResults.put(Action.SUCCESS, new 
ResultConfig(Action.SUCCESS, TestActionTagResult.class, new HashMap()));
-        testActionTagResults.put(Action.INPUT, new ResultConfig(Action.INPUT, 
TestActionTagResult.class, new HashMap()));
+        testActionTagResults.put(Action.SUCCESS, new 
ResultConfig(Action.SUCCESS, TestActionTagResult.class.getName(), new 
HashMap()));
+        testActionTagResults.put(Action.INPUT, new ResultConfig(Action.INPUT, 
TestActionTagResult.class.getName(), new HashMap()));
         ActionConfig testActionTagActionConfig = new ActionConfig((String) 
null, TestAction.class, (Map) null, testActionTagResults, new ArrayList());
         defaultPackageConfig.addActionConfig("testActionTagAction", 
testActionTagActionConfig);
 

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java?rev=424582&r1=424581&r2=424582&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
 Sat Jul 22 07:25:40 2006
@@ -198,8 +198,8 @@
             PackageConfig wait = new PackageConfig("");
 
             Map results = new HashMap();
-            results.put(Action.SUCCESS, new ResultConfig(Action.SUCCESS, 
MockResult.class, null));
-            results.put(ExecuteAndWaitInterceptor.WAIT, new 
ResultConfig(ExecuteAndWaitInterceptor.WAIT, MockResult.class, null));
+            results.put(Action.SUCCESS, new ResultConfig(Action.SUCCESS, 
MockResult.class.getName(), null));
+            results.put(ExecuteAndWaitInterceptor.WAIT, new 
ResultConfig(ExecuteAndWaitInterceptor.WAIT, MockResult.class.getName(), null));
 
             // interceptors
             waitInterceptor = new ExecuteAndWaitInterceptor();