Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 31469 invoked from network); 22 Jul 2006 14:26:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Jul 2006 14:26:05 -0000 Received: (qmail 90276 invoked by uid 500); 22 Jul 2006 14:26:04 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 89631 invoked by uid 500); 22 Jul 2006 14:26:02 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 89620 invoked by uid 99); 22 Jul 2006 14:26:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Jul 2006 07:26:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Jul 2006 07:26:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 89A7A1A981A; Sat, 22 Jul 2006 07:25:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r424582 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2: TestConfigurationProvider.java interceptor/ExecuteAndWaitInterceptorTest.java Date: Sat, 22 Jul 2006 14:25:41 -0000 To: commits@struts.apache.org From: tmjee@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060722142541.89A7A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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();