Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 80392 invoked from network); 14 Jun 2008 04:40:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jun 2008 04:40:54 -0000 Received: (qmail 35805 invoked by uid 500); 14 Jun 2008 04:40:56 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 35765 invoked by uid 500); 14 Jun 2008 04:40:56 -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 35756 invoked by uid 99); 14 Jun 2008 04:40:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2008 21:40:55 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2008 04:40:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 057A52388A0A; Fri, 13 Jun 2008 21:40:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r667743 - in /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config: ClasspathPackageProviderTest.java cltest/OneResultAction.java Date: Sat, 14 Jun 2008 04:40:02 -0000 To: commits@struts.apache.org From: mrdon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080614044003.057A52388A0A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrdon Date: Fri Jun 13 21:40:02 2008 New Revision: 667743 URL: http://svn.apache.org/viewvc?rev=667743&view=rev Log: Adding tests to ensure results are overridden correctly WW-2559 Modified: struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java Modified: struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java?rev=667743&r1=667742&r2=667743&view=diff ============================================================================== --- struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java (original) +++ struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java Fri Jun 13 21:40:02 2008 @@ -147,7 +147,14 @@ assertEquals("/cltest", pkg.getNamespace()); ActionConfig acfg = pkg.getActionConfigs().get("twoResult"); assertNotNull(acfg); - assertEquals(3, acfg.getResults().size()); + assertEquals(2, acfg.getResults().size()); + assertEquals("input.jsp", acfg.getResults().get("input").getParams().get("location")); + assertEquals("bob", acfg.getResults().get("chain").getParams().get("location")); + + acfg = pkg.getActionConfigs().get("oneResult"); + assertNotNull(acfg); + assertEquals(1, acfg.getResults().size()); + assertEquals("input-parent.jsp", acfg.getResults().get("input").getParams().get("location")); } public void testActionImplementation() { Modified: struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java?rev=667743&r1=667742&r2=667743&view=diff ============================================================================== --- struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java (original) +++ struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java Fri Jun 13 21:40:02 2008 @@ -23,7 +23,7 @@ import org.apache.struts2.config.Result; -@Result("foo.jsp") +@Result(name="input", value="input-parent.jsp") public class OneResultAction { }