Test Test
Testing new mail setup ... sorry for the noise. Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFrameTag1.jsp TestFrameTag3.jsp
martinc 2004/03/21 16:45:28 Modified:web/test/test/org/apache/struts/taglib/html TestFrameTag1.jsp TestFrameTag3.jsp Log: Fix some tests that were broken when module support was added to TagUtils.computeURL(). Revision ChangesPath 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp Index: TestFrameTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestFrameTag1.jsp 26 Dec 2003 22:08:01 - 1.3 +++ TestFrameTag1.jsp 22 Mar 2004 00:45:28 - 1.4 @@ -87,7 +87,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -98,7 +98,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -108,7 +108,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -118,7 +118,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -128,7 +128,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -138,7 +138,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -148,7 +148,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -158,7 +158,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFrameTag3.jsp TestFrameTag5.jsp TestFrameTag7.jsp TestImgTag1a.jsp TestImgTag3a.jsp TestImgTag5a.jsp TestImgTag7a.jsp TestLinkTag1.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp
martinc 2004/03/21 22:06:58 Modified:web/test/test/org/apache/struts/taglib/html TestFrameTag3.jsp TestFrameTag5.jsp TestFrameTag7.jsp TestImgTag1a.jsp TestImgTag3a.jsp TestImgTag5a.jsp TestImgTag7a.jsp TestLinkTag1.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp Log: Fix remaining tests that were broken when module support was added to TagUtils.computeURL(). (Man, I wish Java had named parameters!) Revision ChangesPath 1.5 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag3.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag3.jsp.diff?r1=1.4r2=1.5 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag5.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag5.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag7.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag7.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag1a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag1a.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag3a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag3a.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag5a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag5a.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag7a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag7a.jsp.diff?r1=1.3r2=1.4 1.5 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp.diff?r1=1.4r2=1.5 1.5 +10 -10 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp.diff?r1=1.4r2=1.5 1.5 +28 -28 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp.diff?r1=1.4r2=1.5 1.5 +27 -27 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp.diff?r1=1.4r2=1.5 1.5 +28 -28 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag6.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag6.jsp.diff?r1=1.4r2=1.5 1.5 +27 -27 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag7.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag7.jsp.diff?r1=1.4r2=1.5 1.5 +28 -28 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag8.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag8.jsp.diff?r1=1.4r2=1.5 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestOptionsTag1.jsp
On Sun, 4 Jan 2004, Robert Leland wrote: [EMAIL PROTECTED] wrote: * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. This is clearly an old apache 1.0 license instead of 1.1, note the Apache Group instead of the Apache Foundation in the wording. Use the License.txt in the top level of struts as a template. Ah, I see, cp got me again. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- James Mitchell Software Developer / Struts Evangelist http://www.struts-atlanta.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestOptionsTag1.jsp
[EMAIL PROTECTED] wrote: * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. This is clearly an old apache 1.0 license instead of 1.1, note the Apache Group instead of the Apache Foundation in the wording. Use the License.txt in the top level of struts as a template. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestOptionsTag1.jsp
jmitchell2004/01/02 22:07:56
Added: src/test/org/apache/struts/taglib/html TestOptionsTag1.java
web/test/test/org/apache/struts/taglib/html
TestOptionsTag1.jsp
Log:
Add 10 new tests that cover some of the functionality
provided by html:options. I'll add additional tests for complete
coverage soon.
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestOptionsTag1.java
Index: TestOptionsTag1.java
===
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestOptionsTag1.java,v
1.1 2004/01/03 06:07:56 jmitchell Exp $
* $Revision: 1.1 $
* $Date: 2004/01/03 06:07:56 $
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
import org.apache.struts.util.LabelValueBean;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.html.OptionsTag/code class.
*
* @author James Mitchell
*/
public class TestOptionsTag1 extends JspTestCase {
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestOptionsTag1(String theName) {
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
junit.awtui.TestRunner.main(new String[] {TestOptionsTag1.class.getName()});
}
/**
* @return a test suite (codeTestSuite/code) that includes all methods
* starting with test
*/
public static Test suite() {
return new TestSuite(TestOptionsTag1.class);
}
private void runTest(String whichTest, String locale) throws Exception {
pageContext.setAttribute(Globals.LOCALE_KEY,
new Locale(locale, locale
[test] test
test 1 2 3 4 -- Peter Pilgrim, Struts/J2EE Consultant, RBoS FM, Risk IT Tel: +44 (0)207-375-4923 *** This e-mail is intended only for the addressee named above. As this e-mail may contain confidential or privileged information, if you are not the named addressee, you are not authorised to retain, read, copy or disseminate this message or any part of it. The Royal Bank of Scotland plc is registered in Scotland No 90312 Registered Office: 36 St Andrew Square, Edinburgh EH2 2YB Regulated by the Financial Services Authority Visit our website at http://www.rbs.co.uk/CBFM/ *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestIncludeTag.jsp
jmitchell2003/10/11 16:18:17
Modified:src/test/org/apache/struts/taglib/bean TestIncludeTag.java
web/test/test/org/apache/struts/taglib/bean
TestIncludeTag.jsp
Log:
Modified to fit the latest testing schema that guarantees a success or failure
and (I'm 99.5% sure) will not give false positives.
There are other tags that need this change, but I'm working on bigger fish at
the moment. (The testing container port issue)
The tests are still failing and that's my top priority (at the moment)
Revision ChangesPath
1.7 +12 -30
jakarta-struts/src/test/org/apache/struts/taglib/bean/TestIncludeTag.java
Index: TestIncludeTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestIncludeTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestIncludeTag.java 30 Sep 2003 00:15:47 - 1.6
+++ TestIncludeTag.java 11 Oct 2003 23:18:17 - 1.7
@@ -63,8 +63,6 @@
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
-import org.apache.cactus.WebResponse;
-import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -74,8 +72,6 @@
*/
public class TestIncludeTag extends JspTestCase {
-protected final static String TEST_VAL = Test Value;
-
/**
* Defines the testcase name for JUnit.
*
@@ -108,52 +104,38 @@
private void runMyTest(String whichTest){
request.setAttribute(runTest, whichTest);
try {
-
pageContext.forward(/test/org/apache/struts/taglib/bean/TestIncludeTag.jsp);
+ pageContext.forward(
+ request.getRequestURI() +
/org/apache/struts/taglib/bean/TestIncludeTag.jsp);
}
catch (Exception e) {
e.printStackTrace();
fail(There is a problem that is preventing the tests to
continue!);
}
}
-
- private void formatAndTest(String compare, String output) {
- //fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,\r,);
- output = StringUtils.replace(output,\n,);
- output = output.trim();
- //System.out.println(Testing [ + compare + ] == [ + output + ]);
- assertEquals(compare, output);
- }
-
/*
- * Testing IncludeTag using forward=something
+ * Testing IncludeTag using the forward attribute.
*/
public void testIncludeTagForward(){
+//
System.out.println([TestIncludeTag.java]request.getServerPort(): +
request.getServerPort());
+//
System.out.println([TestIncludeTag.java]request.getRequestURI(): +
request.getRequestURI());
+//
System.out.println([TestIncludeTag.java]request.getRequestURL(): +
request.getRequestURL());
+//
System.out.println([TestIncludeTag.java]request.getQueryString(): +
request.getQueryString());
runMyTest(testIncludeTagForward);
}
- public void endIncludeTagForward(WebResponse response){
- formatAndTest(TEST_VAL, response.getText());
- }
/*
- * Testing IncludeTag
+ * Testing IncludeTag using the href attribute.
*/
public void testIncludeTagHref(){
runMyTest(testIncludeTagHref);
}
- public void endIncludeTagHref(WebResponse response){
- formatAndTest(TEST_VAL, response.getText());
- }
/*
- * Testing IncludeTag using page=/something
+ * Testing IncludeTag using the page attribute
*/
public void testIncludeTagPage(){
runMyTest(testIncludeTagPage);
- }
- public void endIncludeTagPage(WebResponse response){
- formatAndTest(TEST_VAL, response.getText());
}
1.3 +48 -8
jakarta-struts/web/test/test/org/apache/struts/taglib/bean/TestIncludeTag.jsp
Index: TestIncludeTag.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/bean/TestIncludeTag.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestIncludeTag.jsp9 Mar 2003 16:04:52 - 1.2
+++ TestIncludeTag.jsp11 Oct 2003 23:18:17 - 1.3
@@ -1,25 +1,65 @@
%@ page contentType=text/html;charset=UTF-8 language=java %
+[EMAIL PROTECTED] import=junit.framework.Assert%
%@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic %
%@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean %
%@ taglib uri=/WEB-INF/struts-html.tld prefix=html
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestIncludeTag.jsp
jmitchell2003/10/11 19:31:42 Modified:web/test/test/org/apache/struts/taglib/bean TestIncludeTag.jsp Log: Oops, forgot to remove some debug stuff. Revision ChangesPath 1.4 +0 -12 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/TestIncludeTag.jsp Index: TestIncludeTag.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/bean/TestIncludeTag.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestIncludeTag.jsp11 Oct 2003 23:18:17 - 1.3 +++ TestIncludeTag.jsp12 Oct 2003 02:31:42 - 1.4 @@ -12,18 +12,6 @@ bean:define id=EXPECTED_RESULTS toScope=page Test Value /bean:define - -% -System.out.println(=Request: + request); -System.out.println(=request.getServerPort(): + request.getServerPort()); -System.out.println(=request.getRequestURI(): + request.getRequestURI()); -System.out.println(=INCLUDE_TAG_KEY: + pageContext.getAttribute(INCLUDE_TAG_KEY)); -System.out.println(=EXPECTED_RESULTS: + pageContext.getAttribute(EXPECTED_RESULTS)); - -if (true) - throw new Exception(); -% - /logic:equal logic:equal name=runTest value=testIncludeTagHref - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp
Yes, I'm seeing the same thing. I'll take a look at it later today as well. Are you able to run all the tests under 3.3? -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: Robert Leland [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Tuesday, September 30, 2003 12:16 AM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp James Mitchell wrote: Well, I was in the middle of a reply on another thread (about this), so I'll just put it here instead. With the latest changes I just committed, the tests pass on Tomcat 3.3.x However, I still cannot get them to pass on 4.0.x or 4.1.x. It seems that the container (in both cases), while running on port 8080 in my configuration, thinks it is running on port 80, which is causing the bean:include tests to fail. I'm not sure where in the configuration of the tests that we need to make changes or if that's even the problem, so I'm still checking into it...just thought I would drop a quick note. Thats what I discovered when I filed the bug report originally. Since no one replied to teh reports I figured it was me. At first I suspected the token substitution that I had did so that none of the server.xml files would have to be hard coded. However looking at the generated files under target/test/tomcat41 they look ok. Look at the cactus logs do you see the serialization error message ? So I am glad to see we're both having the same problem :), but unhappy about that also :( -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: Chris Gastin [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Monday, September 29, 2003 10:49 PM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp James: You committed the following file: * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.j s p. * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.j s p. Are these unit tests working for you. I am trying to find at least one taglib unit test that works,so I can determine if it my local environment or or the tests which are blowing up. I am not to familiar with Cactus, and its setup. Thanks, Chris Gastin - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, September 29, 2003 7:49 PM Subject: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp jmitchell2003/09/29 17:49:11 Modified:web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp Log: Update taglib tests. I suspect that many of the failures are due to changes in whitespace output (or lack of it). Revision ChangesPath 1.4 +16 -64 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.j s p Index: TestErrorsTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestEr r orsTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestErrorsTag1.jsp 10 Mar 2003 17:29:52 - 1.3 +++ TestErrorsTag1.jsp 30 Sep 2003 00:49:11 - 1.4 @@ -34,10 +34,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header -default_errors_prefixMy Errors Text -default_errors_suffixdefault_errors_prefixMy Errors Text 2 -default_errors_suffixdefault_errors_footer + My Errors go here:default_errors_headerdefault_errors_prefixMy Errors Textdefault_errors_suffixdefault_errors_prefixMy Errors Text 2default_errors_suffixdefault_errors_footer /bean:define /logic:equal @@ -68,10 +65,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header -alternate_errors_prefixMy Alternate Errors Text -alternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2 -alternate_errors_suffixalternate_errors_footer + My Errors go here:alternate_errors_headeralternate_errors_prefixMy Alternate Errors Textalternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2alternate_errors_suffixalternate_errors_footer /bean:define /logic:equal @@ -101,10 +95,7 @@ My Errors go here:html:errors/ /bean:define
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp
Sorry for the late response...beenwellbusy busy. This problem is definitely within cactus (or our mis-configuration of it) as the tags work fine in a normal application. I have tried 13-1.4 and 13-1.4.1, both fail with the same issue (wrong port) Just to make sure that I'm not going insane, I: - grabbed a new (not update) checkout from cvs - changed cactus.contextPort to run on 8082 - added a few System.out.println() statements to the TestIncludeTag.jsp that print out the server.getServerPort() to the console. I even went so far as to add a reference to the /examples app in the Host element of the /conf/test/tomcat41/server.xml, and as the tests were running I hit http://localhost:8082/examples directly from a browser and checked out the jsp snoop page...guess what..request.getServerPort() shows 8082. I vaguely remember this happening to me quite a ways back. IIRC, there were some incompatibilities between some of the jars in one or more of the cactus distributions. I believe that was one of the reasons that I added all of the different cactus configurations to the build.properties.sample file. So, as a last resort, I changed the tests to run on port 80 (cactus.contextPort = 80). With that the TestIncludeTag now passes, but then the test fails on TestBaseTag, which expects: http://localhost:80/test/blah/blah ...however, the test outputs (which is actually correct): http://localhost/blah/blah Jeez! I can't win any way I try!!! So, at this point, we need to figure out why or how the configuration is screwed. Well, I can't waste any more time on this, I hope someone with a better understanding of Cactus can figure this out...Bill...you out there? Peace! -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: James Mitchell [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Tuesday, September 30, 2003 6:59 AM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp Yes, I'm seeing the same thing. I'll take a look at it later today as well. Are you able to run all the tests under 3.3? -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: Robert Leland [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Tuesday, September 30, 2003 12:16 AM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp James Mitchell wrote: Well, I was in the middle of a reply on another thread (about this), so I'll just put it here instead. With the latest changes I just committed, the tests pass on Tomcat 3.3.x However, I still cannot get them to pass on 4.0.x or 4.1.x. It seems that the container (in both cases), while running on port 8080 in my configuration, thinks it is running on port 80, which is causing the bean:include tests to fail. I'm not sure where in the configuration of the tests that we need to make changes or if that's even the problem, so I'm still checking into it...just thought I would drop a quick note. Thats what I discovered when I filed the bug report originally. Since no one replied to teh reports I figured it was me. At first I suspected the token substitution that I had did so that none of the server.xml files would have to be hard coded. However looking at the generated files under target/test/tomcat41 they look ok. Look at the cactus logs do you see the serialization error message ? So I am glad to see we're both having the same problem :), but unhappy about that also :( -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: Chris Gastin [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Monday, September 29, 2003 10:49 PM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp James: You committed the following file: * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.j s p. * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.j s p. Are these unit tests working for you. I am trying to find at least one taglib unit test that works,so I can determine if it my local environment or or the tests which are blowing up. I am not to familiar with Cactus, and its setup. Thanks, Chris Gastin - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, September
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp
jmitchell2003/09/29 17:49:11 Modified:web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp Log: Update taglib tests. I suspect that many of the failures are due to changes in whitespace output (or lack of it). Revision ChangesPath 1.4 +16 -64 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.jsp Index: TestErrorsTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestErrorsTag1.jsp10 Mar 2003 17:29:52 - 1.3 +++ TestErrorsTag1.jsp30 Sep 2003 00:49:11 - 1.4 @@ -34,10 +34,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header -default_errors_prefixMy Errors Text -default_errors_suffixdefault_errors_prefixMy Errors Text 2 -default_errors_suffixdefault_errors_footer + My Errors go here:default_errors_headerdefault_errors_prefixMy Errors Textdefault_errors_suffixdefault_errors_prefixMy Errors Text 2default_errors_suffixdefault_errors_footer /bean:define /logic:equal @@ -68,10 +65,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header -alternate_errors_prefixMy Alternate Errors Text -alternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2 -alternate_errors_suffixalternate_errors_footer + My Errors go here:alternate_errors_headeralternate_errors_prefixMy Alternate Errors Textalternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2alternate_errors_suffixalternate_errors_footer /bean:define /logic:equal @@ -101,10 +95,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header_fr -default_errors_prefix_frMy Errors Text (fr) -default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr) -default_errors_suffix_frdefault_errors_footer_fr + My Errors go here:default_errors_header_frdefault_errors_prefix_frMy Errors Text (fr)default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr)default_errors_suffix_frdefault_errors_footer_fr /bean:define /logic:equal @@ -132,10 +123,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header_fr -alternate_errors_prefix_frMy Alternate Errors Text (fr) -alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr) -alternate_errors_suffix_fralternate_errors_footer_fr + My Errors go here:alternate_errors_header_fralternate_errors_prefix_frMy Alternate Errors Text (fr)alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr)alternate_errors_suffix_fralternate_errors_footer_fr /bean:define /logic:equal @@ -166,10 +154,7 @@ My Errors go here:html:errors locale=MY_LOCALE_KEY/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header_fr -default_errors_prefix_frMy Errors Text (fr) -default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr) -default_errors_suffix_frdefault_errors_footer_fr + My Errors go here:default_errors_header_frdefault_errors_prefix_frMy Errors Text (fr)default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr)default_errors_suffix_frdefault_errors_footer_fr /bean:define /logic:equal @@ -196,10 +181,7 @@ My Errors go here:html:errors locale=MY_LOCALE_KEY bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header_fr -alternate_errors_prefix_frMy Alternate Errors Text (fr) -alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr) -alternate_errors_suffix_fralternate_errors_footer_fr + My Errors go here:alternate_errors_header_fralternate_errors_prefix_frMy Alternate Errors Text (fr)alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr)alternate_errors_suffix_fralternate_errors_footer_fr /bean:define /logic:equal @@ -226,10 +208,7 @@ My Errors go here:html:errors locale=MY_LOCALE_KEY/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFormTag1.jsp
jmitchell2003/09/29 17:50:26
Modified:web/test/test/org/apache/struts/taglib/html TestFormTag1.jsp
Log:
Update taglib tests to match recent changes.
Revision ChangesPath
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFormTag1.jsp
Index: TestFormTag1.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFormTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestFormTag1.jsp 10 Mar 2003 01:57:31 - 1.2
+++ TestFormTag1.jsp 30 Sep 2003 00:50:26 - 1.3
@@ -41,7 +41,7 @@
!--
var focusControl = document.forms[testFormBean].elements[string];
- if (focusControl.type != hidden) {
+ if (focusControl.type != hidden !focusControl.disabled) {
focusControl.focus();
}
// --
@@ -62,7 +62,7 @@
!--
var focusControl = document.forms[testFormBean].elements[stringIndexed];
- if (focusControl.type != hidden) {
+ if (focusControl.type != hidden !focusControl.disabled) {
focusControl[2].focus();
}
// --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestMessagesTag1.jsp TestMessagesTag2.jsp TestMessagesTag3.jsp TestMessagesTag4.jsp TestMessagesTag5.jsp TestMessagesTag6.jsp TestMessagesTag7.jsp TestMessagesTag8.jsp
jmitchell2003/09/29 18:14:48 Modified:web/test/test/org/apache/struts/taglib/html TestMessagesTag1.jsp TestMessagesTag2.jsp TestMessagesTag3.jsp TestMessagesTag4.jsp TestMessagesTag5.jsp TestMessagesTag6.jsp TestMessagesTag7.jsp TestMessagesTag8.jsp Log: Update taglib tests so that they pass. Revision ChangesPath 1.2 +11 -11 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag1.jsp Index: TestMessagesTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag1.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestMessagesTag1.jsp 3 Apr 2003 04:24:50 - 1.1 +++ TestMessagesTag1.jsp 30 Sep 2003 01:14:48 - 1.2 @@ -2,7 +2,7 @@ [EMAIL PROTECTED] import=junit.framework.Assert% [EMAIL PROTECTED] import=java.util.HashMap% [EMAIL PROTECTED] import=org.apache.struts.util.MessageResources% -[EMAIL PROTECTED] import=org.apache.struts.action.Action% +[EMAIL PROTECTED] import=org.apache.struts.Globals% [EMAIL PROTECTED] import=org.apache.struts.action.ActionError% [EMAIL PROTECTED] import=org.apache.struts.action.ActionMessage% [EMAIL PROTECTED] import=org.apache.struts.action.ActionMessages% @@ -23,13 +23,13 @@ * will be rendered. * * The tests are setup to test all possible scenarios with each ojbect listed. - * Using Action.ERROR_KEY in the request + * Using Globals.ERROR_KEY in the request * TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing * TestMessagesTag2.jsp - uses a String to store any keys for testing * TestMessagesTag3.jsp - uses a String Array to store any keys for testing * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing * - * Using Action.MESSAGE_KEY in the request + * Using Globals.MESSAGE_KEY in the request * TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing * TestMessagesTag6.jsp - uses a String to store any keys for testing * TestMessagesTag7.jsp - uses a String Array to store any keys for testing @@ -58,7 +58,7 @@ /bean:define % ActionMessages messages = new ActionMessages(); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages); % bean:define id=TEST_RESULTS toScope=page Messages: @@ -82,7 +82,7 @@ ActionMessages messages = new ActionMessages(); messages.add(myproperty1, new ActionMessage(default.bundle.message)); messages.add(myproperty2, new ActionMessage(default.bundle.message)); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages); % bean:define id=TEST_RESULTS toScope=page Messages: @@ -106,7 +106,7 @@ ActionMessages messages = new ActionMessages(); messages.add(myproperty1, new ActionMessage(default.bundle.message)); messages.add(myproperty2, new ActionMessage(default.bundle.message)); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages); % bean:define id=TEST_RESULTS toScope=page Messages: @@ -131,7 +131,7 @@ ActionMessages messages = new ActionMessages(); messages.add(myproperty1, new ActionMessage(default.bundle.message)); messages.add(myproperty2, new ActionMessage(default.bundle.message)); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages); % bean:define id=TEST_RESULTS toScope=page Messages: @@ -332,7 +332,7 @@ % ActionMessages messages = new ActionMessages(); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages); % bean:define id=TEST_RESULTS toScope=page Messages: @@ -356,7 +356,7 @@ ActionMessages messages = new ActionMessages(); messages.add(myproperty1, new ActionMessage(alternate.bundle.message)); messages.add(myproperty2, new ActionMessage(alternate.bundle.message)); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages); % bean:define id=TEST_RESULTS toScope=page Messages: @@ -380,7 +380,7 @@ ActionMessages messages = new ActionMessages(); messages.add(myproperty1, new ActionMessage(alternate.bundle.message)); messages.add(myproperty2, new ActionMessage(alternate.bundle.message)); - request.setAttribute(Action.ERROR_KEY, messages); + request.setAttribute(Globals.ERROR_KEY, messages
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp
James: You committed the following file: * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.js p. * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.js p. Are these unit tests working for you. I am trying to find at least one taglib unit test that works,so I can determine if it my local environment or or the tests which are blowing up. I am not to familiar with Cactus, and its setup. Thanks, Chris Gastin - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, September 29, 2003 7:49 PM Subject: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp jmitchell2003/09/29 17:49:11 Modified:web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp Log: Update taglib tests. I suspect that many of the failures are due to changes in whitespace output (or lack of it). Revision ChangesPath 1.4 +16 -64 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.js p Index: TestErrorsTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErr orsTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestErrorsTag1.jsp 10 Mar 2003 17:29:52 - 1.3 +++ TestErrorsTag1.jsp 30 Sep 2003 00:49:11 - 1.4 @@ -34,10 +34,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header -default_errors_prefixMy Errors Text -default_errors_suffixdefault_errors_prefixMy Errors Text 2 -default_errors_suffixdefault_errors_footer + My Errors go here:default_errors_headerdefault_errors_prefixMy Errors Textdefault_errors_suffixdefault_errors_prefixMy Errors Text 2default_errors_suffixdefault_errors_footer /bean:define /logic:equal @@ -68,10 +65,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header -alternate_errors_prefixMy Alternate Errors Text -alternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2 -alternate_errors_suffixalternate_errors_footer + My Errors go here:alternate_errors_headeralternate_errors_prefixMy Alternate Errors Textalternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2alternate_errors_suffixalternate_errors_footer /bean:define /logic:equal @@ -101,10 +95,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header_fr -default_errors_prefix_frMy Errors Text (fr) -default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr) -default_errors_suffix_frdefault_errors_footer_fr + My Errors go here:default_errors_header_frdefault_errors_prefix_frMy Errors Text (fr)default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr)default_errors_suffix_frdefault_errors_footer_fr /bean:define /logic:equal @@ -132,10 +123,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header_fr -alternate_errors_prefix_frMy Alternate Errors Text (fr) -alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr) -alternate_errors_suffix_fralternate_errors_footer_fr + My Errors go here:alternate_errors_header_fralternate_errors_prefix_frMy Alternate Errors Text (fr)alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr)alternate_errors_suffix_fralternate_errors_footer_fr /bean:define /logic:equal @@ -166,10 +154,7 @@ My Errors go here:html:errors locale=MY_LOCALE_KEY/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header_fr -default_errors_prefix_frMy Errors Text (fr) -default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr) -default_errors_suffix_frdefault_errors_footer_fr + My Errors go here:default_errors_header_frdefault_errors_prefix_frMy Errors Text (fr)default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr)default_errors_suffix_frdefault_errors_footer_fr /bean:define /logic:equal @@ -196,10 +181,7 @@ My Errors go here:html:errors locale=MY_LOCALE_KEY bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header_fr -alternate_errors_prefix_frMy Alternate Errors Text (fr) -alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr) -alternate_errors_suffix_fralternate_errors_footer_fr + My Errors go
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp
Well, I was in the middle of a reply on another thread (about this), so I'll just put it here instead. With the latest changes I just committed, the tests pass on Tomcat 3.3.x However, I still cannot get them to pass on 4.0.x or 4.1.x. It seems that the container (in both cases), while running on port 8080 in my configuration, thinks it is running on port 80, which is causing the bean:include tests to fail. I'm not sure where in the configuration of the tests that we need to make changes or if that's even the problem, so I'm still checking into it...just thought I would drop a quick note. -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: Chris Gastin [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Monday, September 29, 2003 10:49 PM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp James: You committed the following file: * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.js p. * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.js p. Are these unit tests working for you. I am trying to find at least one taglib unit test that works,so I can determine if it my local environment or or the tests which are blowing up. I am not to familiar with Cactus, and its setup. Thanks, Chris Gastin - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, September 29, 2003 7:49 PM Subject: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp jmitchell2003/09/29 17:49:11 Modified:web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp Log: Update taglib tests. I suspect that many of the failures are due to changes in whitespace output (or lack of it). Revision ChangesPath 1.4 +16 -64 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.js p Index: TestErrorsTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErr orsTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestErrorsTag1.jsp 10 Mar 2003 17:29:52 - 1.3 +++ TestErrorsTag1.jsp 30 Sep 2003 00:49:11 - 1.4 @@ -34,10 +34,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header -default_errors_prefixMy Errors Text -default_errors_suffixdefault_errors_prefixMy Errors Text 2 -default_errors_suffixdefault_errors_footer + My Errors go here:default_errors_headerdefault_errors_prefixMy Errors Textdefault_errors_suffixdefault_errors_prefixMy Errors Text 2default_errors_suffixdefault_errors_footer /bean:define /logic:equal @@ -68,10 +65,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header -alternate_errors_prefixMy Alternate Errors Text -alternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2 -alternate_errors_suffixalternate_errors_footer + My Errors go here:alternate_errors_headeralternate_errors_prefixMy Alternate Errors Textalternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2alternate_errors_suffixalternate_errors_footer /bean:define /logic:equal @@ -101,10 +95,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header_fr -default_errors_prefix_frMy Errors Text (fr) -default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr) -default_errors_suffix_frdefault_errors_footer_fr + My Errors go here:default_errors_header_frdefault_errors_prefix_frMy Errors Text (fr)default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr)default_errors_suffix_frdefault_errors_footer_fr /bean:define /logic:equal @@ -132,10 +123,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header_fr -alternate_errors_prefix_frMy Alternate Errors Text (fr) -alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr) -alternate_errors_suffix_fralternate_errors_footer_fr + My Errors go here:alternate_errors_header_fralternate_errors_prefix_frMy Alternate Errors Text (fr)alternate_errors_suffix_fralternate_errors_prefix_frMy Alternate Errors Text 2 (fr
Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp
James Mitchell wrote: Well, I was in the middle of a reply on another thread (about this), so I'll just put it here instead. With the latest changes I just committed, the tests pass on Tomcat 3.3.x However, I still cannot get them to pass on 4.0.x or 4.1.x. It seems that the container (in both cases), while running on port 8080 in my configuration, thinks it is running on port 80, which is causing the bean:include tests to fail. I'm not sure where in the configuration of the tests that we need to make changes or if that's even the problem, so I'm still checking into it...just thought I would drop a quick note. Thats what I discovered when I filed the bug report originally. Since no one replied to teh reports I figured it was me. At first I suspected the token substitution that I had did so that none of the server.xml files would have to be hard coded. However looking at the generated files under target/test/tomcat41 they look ok. Look at the cactus logs do you see the serialization error message ? So I am glad to see we're both having the same problem :), but unhappy about that also :( -- James Mitchell Software Engineer / Struts Evangelist http://www.struts-atlanta.org 678.910.8017 770.822.3359 AIM:jmitchtx - Original Message - From: Chris Gastin [EMAIL PROTECTED] To: Struts Developers List [EMAIL PROTECTED] Sent: Monday, September 29, 2003 10:49 PM Subject: Re: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp James: You committed the following file: * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.js p. * jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.js p. Are these unit tests working for you. I am trying to find at least one taglib unit test that works,so I can determine if it my local environment or or the tests which are blowing up. I am not to familiar with Cactus, and its setup. Thanks, Chris Gastin - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, September 29, 2003 7:49 PM Subject: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp jmitchell2003/09/29 17:49:11 Modified:web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp Log: Update taglib tests. I suspect that many of the failures are due to changes in whitespace output (or lack of it). Revision ChangesPath 1.4 +16 -64 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.js p Index: TestErrorsTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErr orsTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestErrorsTag1.jsp 10 Mar 2003 17:29:52 - 1.3 +++ TestErrorsTag1.jsp 30 Sep 2003 00:49:11 - 1.4 @@ -34,10 +34,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header -default_errors_prefixMy Errors Text -default_errors_suffixdefault_errors_prefixMy Errors Text 2 -default_errors_suffixdefault_errors_footer + My Errors go here:default_errors_headerdefault_errors_prefixMy Errors Textdefault_errors_suffixdefault_errors_prefixMy Errors Text 2default_errors_suffixdefault_errors_footer /bean:define /logic:equal @@ -68,10 +65,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header -alternate_errors_prefixMy Alternate Errors Text -alternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2 -alternate_errors_suffixalternate_errors_footer + My Errors go here:alternate_errors_headeralternate_errors_prefixMy Alternate Errors Textalternate_errors_suffixalternate_errors_prefixMy Alternate Errors Text 2alternate_errors_suffixalternate_errors_footer /bean:define /logic:equal @@ -101,10 +95,7 @@ My Errors go here:html:errors/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:default_errors_header_fr -default_errors_prefix_frMy Errors Text (fr) -default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr) -default_errors_suffix_frdefault_errors_footer_fr + My Errors go here:default_errors_header_frdefault_errors_prefix_frMy Errors Text (fr)default_errors_suffix_frdefault_errors_prefix_frMy Errors Text 2 (fr)default_errors_suffix_frdefault_errors_footer_fr /bean:define /logic:equal @@ -132,10 +123,7 @@ My Errors go here:html:errors bundle=alternate/ /bean:define bean:define id=TEST_RESULTS toScope=page - My Errors go here:alternate_errors_header_fr
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/htmlTestFrameTag1.jsp TestFrameTag3.jsp TestFrameTag5.jsp TestFrameTag7.jsp TestImgTag1a.jspTestImgTag3a.jsp TestImgTag5a.jsp TestImgTag7a.jsp TestLinkTag1.jsp TestLinkTag3.jspTestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp
FYI I updated the unit tests but the commit message was too large, here is an example of the change. rleland 2003/07/26 23:29:11 Modified:web/test/test/org/apache/struts/taglib/html TestFrameTag1.jsp TestFrameTag3.jsp TestFrameTag5.jsp TestFrameTag7.jsp TestImgTag1a.jsp TestImgTag3a.jsp TestImgTag5a.jsp TestImgTag7a.jsp TestLinkTag1.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp Log: Update jsp tests to use TagUtils.computeURL methods. Revision ChangesPath 1.2 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp Index: TestFrameTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestFrameTag1.jsp 7 Mar 2003 05:39:10 - 1.1 +++ TestFrameTag1.jsp 27 Jul 2003 06:29:11 - 1.2 @@ -87,7 +87,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -98,7 +98,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -108,7 +108,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -118,7 +118,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -128,7 +128,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -138,7 +138,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -148,7 +148,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -158,7 +158,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.util.RequestUtils.computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% /bean:define /logic:equal -- Rob Leland
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestMultiboxTag2.jsp
jmitchell2003/06/06 20:43:00
Added: src/test/org/apache/struts/taglib/html TestMultiboxTag2.java
web/test/test/org/apache/struts/taglib/html
TestMultiboxTag2.jsp
Log:
More tests.fun fun!!
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestMultiboxTag2.java
Index: TestMultiboxTag2.java
===
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestMultiboxTag2.java,v
1.1 2003/06/07 03:43:00 jmitchell Exp $
* $Revision: 1.1 $
* $Date: 2003/06/07 03:43:00 $
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.html.MultiboxTag/code class.
* NOTE - These tests were separated into 4 files each because of the
* size of the jsp. (not playing well with Tomcat 3.3
*
* These tests are numbered as such:
*
* 1 thru 4 test a single checkbox
* TestMultiboxTag1 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag2 - Same as 1, but using BodyContent instead of value attribute
*
* TestMultiboxTag3 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag4 - Same as 3, but using BodyContent instead of value attribute
*
* 5 thru 8 test multiple checkboxes
* TestMultiboxTag5 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag6 - Same as 5, but using BodyContent instead of value attribute
*
* TestMultiboxTag7 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag8 - Same as 7, but using BodyContent instead of value attribute
*
*
* @author James Mitchell
*/
public class TestMultiboxTag2 extends JspTestCase {
/**
* Defines the testcase name for JUnit
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestMultiboxTag4.jsp
jmitchell2003/06/06 20:44:53
Added: src/test/org/apache/struts/taglib/html TestMultiboxTag4.java
web/test/test/org/apache/struts/taglib/html
TestMultiboxTag4.jsp
Log:
More tests.fun fun!!
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestMultiboxTag4.java
Index: TestMultiboxTag4.java
===
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestMultiboxTag4.java,v
1.1 2003/06/07 03:44:53 jmitchell Exp $
* $Revision: 1.1 $
* $Date: 2003/06/07 03:44:53 $
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.html.MultiboxTag/code class.
* NOTE - These tests were separated into 4 files each because of the
* size of the jsp. (not playing well with Tomcat 3.3
*
* These tests are numbered as such:
*
* 1 thru 4 test a single checkbox
* TestMultiboxTag1 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag2 - Same as 1, but using BodyContent instead of value attribute
*
* TestMultiboxTag3 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag4 - Same as 3, but using BodyContent instead of value attribute
*
* 5 thru 8 test multiple checkboxes
* TestMultiboxTag5 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag6 - Same as 5, but using BodyContent instead of value attribute
*
* TestMultiboxTag7 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag8 - Same as 7, but using BodyContent instead of value attribute
*
*
* @author James Mitchell
*/
public class TestMultiboxTag4 extends JspTestCase {
/**
* Defines the testcase name for JUnit
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestOptionTag1.jsp
jmitchell2003/06/06 20:53:23
Added: src/test/org/apache/struts/taglib/html TestOptionTag1.java
web/test/test/org/apache/struts/taglib/html
TestOptionTag1.jsp
Log:
More tests.fun fun!!
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestOptionTag1.java
Index: TestOptionTag1.java
===
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestOptionTag1.java,v
1.1 2003/06/07 03:53:23 jmitchell Exp $
* $Revision: 1.1 $
* $Date: 2003/06/07 03:53:23 $
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.html.MultiboxTag/code class.
* NOTE - These tests were separated into 4 files each because of the
* size of the jsp. (not playing well with Tomcat 3.3
*
* These tests are numbered as such:
*
* 1 thru 4 test a single checkbox
* TestOptionTag1 - These test validate true (a value was in the array) on our form.
* TestMultiboxTag2 - Same as 1, but using BodyContent instead of value attribute
*
* TestMultiboxTag3 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag4 - Same as 3, but using BodyContent instead of value attribute
*
* 5 thru 8 test multiple checkboxes
* TestMultiboxTag5 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag6 - Same as 5, but using BodyContent instead of value attribute
*
* TestMultiboxTag7 - These test validate true (a value was in the array) on our
form.
* TestMultiboxTag8 - Same as 7, but using BodyContent instead of value attribute
*
* @author James Mitchell
*/
public class TestOptionTag1 extends JspTestCase {
/**
* Defines the testcase name for JUnit
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestLinkTag1.jsp TestLinkTag2.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp
jmitchell2003/03/23 06:50:22
Modified:web/test/test/org/apache/struts/taglib/html TestLinkTag1.jsp
TestLinkTag2.jsp TestLinkTag3.jsp TestLinkTag4.jsp
TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp
TestLinkTag8.jsp
Log:
Fix a bit of some bad logic
Revision ChangesPath
1.2 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp
Index: TestLinkTag1.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestLinkTag1.jsp 14 Mar 2003 01:20:19 - 1.1
+++ TestLinkTag1.jsp 23 Mar 2003 14:50:22 - 1.2
@@ -303,7 +303,7 @@
String expected = (String) pageContext.getAttribute(EXPECTED_RESULTS);
String compareTo = (String) pageContext.getAttribute(TEST_RESULTS);
-if ((expected == null) || (expected == null)){
+if ((expected == null) || (compareTo == null)){
Assert.fail(An invalid (or mispelled) test on this page was called. Please
verify that you've setup the tests (and spellings) correctly.);
}
1.2 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag2.jsp
Index: TestLinkTag2.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestLinkTag2.jsp 14 Mar 2003 01:20:19 - 1.1
+++ TestLinkTag2.jsp 23 Mar 2003 14:50:22 - 1.2
@@ -288,7 +288,7 @@
String expected = (String) pageContext.getAttribute(EXPECTED_RESULTS);
String compareTo = (String) pageContext.getAttribute(TEST_RESULTS);
-if ((expected == null) || (expected == null)){
+if ((expected == null) || (compareTo == null)){
Assert.fail(An invalid (or mispelled) test on this page was called. Please
verify that you've setup the tests (and spellings) correctly.);
}
1.2 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp
Index: TestLinkTag3.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestLinkTag3.jsp 14 Mar 2003 01:20:33 - 1.1
+++ TestLinkTag3.jsp 23 Mar 2003 14:50:22 - 1.2
@@ -305,7 +305,7 @@
String expected = (String) pageContext.getAttribute(EXPECTED_RESULTS);
String compareTo = (String) pageContext.getAttribute(TEST_RESULTS);
-if ((expected == null) || (expected == null)){
+if ((expected == null) || (compareTo == null)){
Assert.fail(An invalid (or mispelled) test on this page was called. Please
verify that you've setup the tests (and spellings) correctly.);
}
1.2 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp
Index: TestLinkTag4.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestLinkTag4.jsp 14 Mar 2003 01:20:33 - 1.1
+++ TestLinkTag4.jsp 23 Mar 2003 14:50:22 - 1.2
@@ -289,7 +289,7 @@
String expected = (String) pageContext.getAttribute(EXPECTED_RESULTS);
String compareTo = (String) pageContext.getAttribute(TEST_RESULTS);
-if ((expected == null) || (expected == null)){
+if ((expected == null) || (compareTo == null)){
Assert.fail(An invalid (or mispelled) test on this page was called. Please
verify that you've setup the tests (and spellings) correctly.);
}
1.2 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp
Index: TestLinkTag5.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestLinkTag5.jsp 14 Mar 2003 01:20:55 - 1.1
+++ TestLinkTag5.jsp 23 Mar 2003 14:50:22 - 1.2
@@ -304,7 +304,7 @@
String expected = (String) pageContext.getAttribute(EXPECTED_RESULTS);
String compareTo = (String) pageContext.getAttribute(TEST_RESULTS);
-if ((expected == null) || (expected == null)){
+if ((expected == null) || (compareTo == null)){
Assert.fail(An invalid (or mispelled) test on this page was called. Please
verify that you've setup
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestLinkTag1.jsp TestLinkTag2.jsp
jmitchell2003/03/13 17:20:19 Added: web/test/test/org/apache/struts/taglib/html TestLinkTag1.jsp TestLinkTag2.jsp Log: New tests Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp Index: TestLinkTag1.jsp === %@ page contentType=text/html;charset=UTF-8 language=java % [EMAIL PROTECTED] import=junit.framework.Assert% [EMAIL PROTECTED] import=java.util.HashMap% %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % !-- Testing attributes using forward-- -- logic:equal name=runTest value=testLinkForward bean:define id=EXPECTED_RESULTS toScope=page html:link forward=simpleForwardTest Link/html:link /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardAccesskey bean:define id=EXPECTED_RESULTS toScope=page html:link forward=simpleForward accesskey=XXXTest Link/html:link /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp)% accesskey=XXXTest Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardAnchor bean:define id=EXPECTED_RESULTS toScope=page html:link forward=simpleForward anchor=XXXTest Link/html:link /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp#XXX)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardIndexedArray bean:define id=EXPECTED_RESULTS toScope=page logic:iterate id=indivItem name=lst html:link forward=simpleForward indexed=trueTest Link/html:link /logic:iterate /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp?index=0)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardIndexedArrayProperty bean:define id=EXPECTED_RESULTS toScope=page logic:iterate id=indivItem name=lst property=list html:link forward=simpleForward indexed=trueTest Link/html:link /logic:iterate /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp?index=0)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardIndexedMap bean:define id=EXPECTED_RESULTS toScope=page logic:iterate id=indivItem name=lst html:link forward=simpleForward indexed=trueTest Link/html:link /logic:iterate /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp?index=0)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardIndexedMapProperty bean:define id=EXPECTED_RESULTS toScope=page logic:iterate id=indivItem name=lst property=map html:link forward=simpleForward indexed=trueTest Link/html:link /logic:iterate /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp?index=0)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardIndexedEnumeration bean:define id=EXPECTED_RESULTS toScope=page logic:iterate id=indivItem name=lst html:link forward=simpleForward indexed=trueTest Link/html:link /logic:iterate /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp?index=0)%Test Link/a a href=%=response.encodeURL(/test/path/to/non/existing/jsp.jsp?index=1)%Test Link/a /bean:define /logic:equal logic:equal name=runTest value=testLinkForwardIndexedEnumerationProperty bean:define id=EXPECTED_RESULTS toScope=page logic:iterate id=indivItem name=lst property=enumeration html:link forward=simpleForward indexed=trueTest Link/html:link /logic:iterate /bean:define bean:define id=TEST_RESULTS toScope=page a href=%=response.encodeURL(/test/path/to/non
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestImageTag2.jsp TestImageTag4.jsp
jmitchell2003/03/11 15:46:05
Modified:src/test/org/apache/struts/taglib/html TestImageTag2.java
TestImageTag4.java
web/test/test/org/apache/struts/taglib/html
TestImageTag2.jsp TestImageTag4.jsp
Log:
Oops. Somebody can't spell today!!
Revision ChangesPath
1.3 +5 -5
jakarta-struts/src/test/org/apache/struts/taglib/html/TestImageTag2.java
Index: TestImageTag2.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestImageTag2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestImageTag2.java8 Mar 2003 19:31:55 - 1.2
+++ TestImageTag2.java11 Mar 2003 23:46:05 - 1.3
@@ -182,8 +182,8 @@
runMyTest(testImagePageTitleKeyDefaultBundle_fr, fr);
}
-public void testImagePageTitleKeyAlterateBundle_fr(){
-runMyTest(testImagePageTitleKeyAlterateBundle_fr, fr);
+public void testImagePageTitleKeyAlternateBundle_fr(){
+runMyTest(testImagePageTitleKeyAlternateBundle_fr, fr);
}
public void testImagePageIndexedArray(){
1.3 +5 -5
jakarta-struts/src/test/org/apache/struts/taglib/html/TestImageTag4.java
Index: TestImageTag4.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestImageTag4.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestImageTag4.java8 Mar 2003 19:31:55 - 1.2
+++ TestImageTag4.java11 Mar 2003 23:46:05 - 1.3
@@ -182,8 +182,8 @@
runMyTest(testImagePageKeyTitleKeyDefaultBundle_fr, fr);
}
-public void testImagePageKeyTitleKeyAlterateBundle_fr(){
-runMyTest(testImagePageKeyTitleKeyAlterateBundle_fr, fr);
+public void testImagePageKeyTitleKeyAlternateBundle_fr(){
+runMyTest(testImagePageKeyTitleKeyAlternateBundle_fr, fr);
}
public void testImagePageKeyIndexedArray(){
1.3 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag2.jsp
Index: TestImageTag2.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestImageTag2.jsp 10 Mar 2003 17:29:52 - 1.2
+++ TestImageTag2.jsp 11 Mar 2003 23:46:05 - 1.3
@@ -150,7 +150,7 @@
/logic:equal
-logic:equal name=runTest value=testImagePageTitleKeyAlterateBundle_fr
+logic:equal name=runTest value=testImagePageTitleKeyAlternateBundle_fr
bean:define id=TEST_RESULTS toScope=page
html:image page=/some/image.gif titleKey=alternate.bundle.message
bundle=alternate/
/bean:define
1.3 +1 -1
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag4.jsp
Index: TestImageTag4.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag4.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestImageTag4.jsp 10 Mar 2003 17:29:52 - 1.2
+++ TestImageTag4.jsp 11 Mar 2003 23:46:05 - 1.3
@@ -146,7 +146,7 @@
/logic:equal
-logic:equal name=runTest value=testImagePageKeyTitleKeyAlterateBundle_fr
+logic:equal name=runTest value=testImagePageKeyTitleKeyAlternateBundle_fr
bean:define id=TEST_RESULTS toScope=page
html:image pageKey=alternate.testing.image
titleKey=alternate.bundle.message bundle=alternate/
/bean:define
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestImageTag5.jsp TestImageTag6.jsp TestImageTag7.jsp TestImageTag8.jsp
jmitchell2003/03/11 16:33:10 Added: web/test/test/org/apache/struts/taglib/html TestImageTag5.jsp TestImageTag6.jsp TestImageTag7.jsp TestImageTag8.jsp Log: New tests Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag5.jsp Index: TestImageTag5.jsp === %@ page contentType=text/html;charset=UTF-8 language=java % [EMAIL PROTECTED] import=junit.framework.Assert% %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % !-- Testing attributes using page-- -- logic:equal name=runTest value=testImageSrcAccesskey bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif accesskey=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% accesskey=XXX /bean:define /logic:equal logic:equal name=runTest value=testImageSrcAlign bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif align=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% align=XXX /bean:define /logic:equal logic:equal name=runTest value=testImageSrcAlt bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif alt=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% alt=XXX /bean:define /logic:equal logic:equal name=runTest value=testImageSrcAltKeyDefaultBundle bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif altKey=default.bundle.message/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% alt=Testing Message /bean:define /logic:equal logic:equal name=runTest value=testImageSrcAltKeyAlternateBundle bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif altKey=alternate.bundle.message bundle=alternate/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% alt=Testing Message /bean:define /logic:equal logic:equal name=runTest value=testImageSrcAltKeyDefaultBundle_fr bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif altKey=default.bundle.message/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% alt=Message D'Essai /bean:define /logic:equal logic:equal name=runTest value=testImageSrcAltKeyAlternateBundle_fr bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif altKey=alternate.bundle.message bundle=alternate/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% alt=Message D'Essai /bean:define /logic:equal logic:equal name=runTest value=testImageSrcBorder bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif border=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% border=XXX /bean:define /logic:equal logic:equal name=runTest value=testImageSrcDisabled1 bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif disabled=true/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% disabled=disabled /bean:define /logic:equal logic:equal name=runTest value=testImageSrcDisabled2 bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif disabled=True/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% disabled=disabled /bean:define /logic:equal logic:equal name=runTest value=testImageSrcDisabled3 bean:define id=TEST_RESULTS toScope=page html:image src=/test/some/image.gif disabled=TRUE/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=image name= src=%=response.encodeURL(/test/some/image.gif)% disabled=disabled /bean:define /logic:equal
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestImgTag1.jsp TestImgTag1a.jsp TestImgTag2.jsp TestImgTag3.jsp TestImgTag3a.jsp TestImgTag4.jsp
jmitchell2003/03/11 16:33:59 Added: web/test/test/org/apache/struts/taglib/html TestImgTag1.jsp TestImgTag1a.jsp TestImgTag2.jsp TestImgTag3.jsp TestImgTag3a.jsp TestImgTag4.jsp Log: New tests Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag1.jsp Index: TestImgTag1.jsp === %@ page contentType=text/html;charset=UTF-8 language=java % [EMAIL PROTECTED] import=junit.framework.Assert% %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % !-- Testing attributes using page-- -- logic:equal name=runTest value=testImgPageAlign1 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=left/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=left /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign2 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=right/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=right /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign3 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=top/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=top /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign4 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=middle/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=middle /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign5 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=bottom/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=bottom /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign6 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=texttop/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=texttop /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign7 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=absmiddle/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=absmiddle /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign8 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=absbottom/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=absbottom /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign9 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=any value/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=any value /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlign10 bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif align=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% align=XXX /bean:define /logic:equal logic:equal name=runTest value=testImgPageAlt bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif alt=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% alt=XXX /bean:define /logic:equal logic:equal name=runTest value=testImgPageAltKeyDefaultBundle bean:define id=TEST_RESULTS toScope=page html:img page=/some/image.gif altKey=default.bundle.message/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=%=response.encodeURL(/test/some/image.gif)% alt=Testing Message /bean:define /logic:equal logic:equal name=runTest value=testImgPageAltKeyAlternateBundle bean:define id=TEST_RESULTS toScope=page html:img page
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestImgTag5.jsp TestImgTag5a.jsp TestImgTag6.jsp TestImgTag7.jsp TestImgTag7a.jsp TestImgTag8.jsp
jmitchell2003/03/11 16:34:24 Added: web/test/test/org/apache/struts/taglib/html TestImgTag5.jsp TestImgTag5a.jsp TestImgTag6.jsp TestImgTag7.jsp TestImgTag7a.jsp TestImgTag8.jsp Log: New tests Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag5.jsp Index: TestImgTag5.jsp === %@ page contentType=text/html;charset=UTF-8 language=java % [EMAIL PROTECTED] import=junit.framework.Assert% %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % !-- Testing attributes using src -- -- logic:equal name=runTest value=testImgSrcAlign1 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=left/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=left /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign2 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=right/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=right /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign3 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=top/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=top /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign4 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=middle/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=middle /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign5 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=bottom/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=bottom /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign6 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=texttop/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=texttop /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign7 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=absmiddle/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=absmiddle /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign8 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=absbottom/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=absbottom /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign9 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=any value/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=any value /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlign10 bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif align=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif align=XXX /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAlt bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif alt=XXX/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif alt=XXX /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAltKeyDefaultBundle bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif altKey=default.bundle.message/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif alt=Testing Message /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAltKeyAlternateBundle bean:define id=TEST_RESULTS toScope=page html:img src=/some/image.gif altKey=alternate.bundle.message bundle=alternate/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page img src=/some/image.gif alt=Testing Message /bean:define /logic:equal logic:equal name=runTest value=testImgSrcAltKeyDefaultBundle_fr bean:define id=TEST_RESULTS toScope=page html:img src
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestBaseTag.jsp TestButtonTag1.jsp TestButtonTag2.jsp TestCancelTag1.jsp TestCancelTag2.jsp TestCheckboxTag1.jsp TestCheckboxTag2.jsp TestCheckboxTag3.jsp TestCheckboxTag4.jsp TestErrorsTag1.jsp TestErrorsTag2.jsp TestFileTag1.jsp TestFileTag2.jsp TestHiddenTag1.jsp TestHiddenTag2.jsp TestHtmlTag.jsp TestImageTag1.jsp TestImageTag2.jsp TestImageTag3.jsp TestImageTag4.jsp
craigmcc2003/03/10 09:29:53
Modified:web/test/test/org/apache/struts/taglib/html TestBaseTag.jsp
TestButtonTag1.jsp TestButtonTag2.jsp
TestCancelTag1.jsp TestCancelTag2.jsp
TestCheckboxTag1.jsp TestCheckboxTag2.jsp
TestCheckboxTag3.jsp TestCheckboxTag4.jsp
TestErrorsTag1.jsp TestErrorsTag2.jsp
TestFileTag1.jsp TestFileTag2.jsp
TestHiddenTag1.jsp TestHiddenTag2.jsp
TestHtmlTag.jsp TestImageTag1.jsp TestImageTag2.jsp
TestImageTag3.jsp TestImageTag4.jsp
Log:
Make the Cactus tests run successfully under Tomcat 4.0.6, when running the
test.tomcat.40 target.
The problem is a bug in Tomcat 4.0.6, where the JSP page compiler incorrectly
does an implicit import org.apache.jasper.runtime.* in the generated code
for each page. Unfortunately, that makes the class name JspException
ambiguous. I corrected this by fully qualifying the exception class we
really want (javax.servlet.jsp.JspException), which runs on 4.0 and 4.1.
I have't tried these on 3.3 yet -- that will be later.
Revision ChangesPath
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp
Index: TestBaseTag.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestBaseTag.jsp 7 Mar 2003 05:27:19 - 1.2
+++ TestBaseTag.jsp 10 Mar 2003 17:29:52 - 1.3
@@ -52,7 +52,7 @@
String compareTo = ;
if (pageContext.getAttribute(EXPECTED_RESULTS) == null){
-throw new JspException(No tests on this page were called. Please verify that
you've setup the tests correctly.);
+throw new javax.servlet.jsp.JspException(No tests on this page were called.
Please verify that you've setup the tests correctly.);
}else{
expected=pageContext.getAttribute(TEST_RESULTS).toString();
}
@@ -61,4 +61,4 @@
}
Assert.assertEquals(compareTo, expected);
-%
\ No newline at end of file
+%
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag1.jsp
Index: TestButtonTag1.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestButtonTag1.jsp7 Mar 2003 05:27:19 - 1.2
+++ TestButtonTag1.jsp10 Mar 2003 17:29:52 - 1.3
@@ -235,7 +235,7 @@
String compareTo = ;
if (pageContext.getAttribute(EXPECTED_RESULTS) == null){
-throw new JspException(No tests on this page were called. Please verify that
you've setup the tests correctly.);
+throw new javax.servlet.jsp.JspException(No tests on this page were called.
Please verify that you've setup the tests correctly.);
}else{
expected=pageContext.getAttribute(TEST_RESULTS).toString();
}
@@ -244,4 +244,4 @@
}
Assert.assertEquals(compareTo, expected);
-%
\ No newline at end of file
+%
1.4 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag2.jsp
Index: TestButtonTag2.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag2.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestButtonTag2.jsp7 Mar 2003 05:27:19 - 1.3
+++ TestButtonTag2.jsp10 Mar 2003 17:29:52 - 1.4
@@ -201,7 +201,7 @@
String compareTo = ;
if (pageContext.getAttribute(EXPECTED_RESULTS) == null){
-throw new JspException(No tests on this page were called. Please verify that
you've setup the tests correctly.);
+throw new javax.servlet.jsp.JspException(No tests on this page were called.
Please verify that you've setup the tests correctly.);
}else{
expected=pageContext.getAttribute(TEST_RESULTS).toString();
}
@@ -210,4 +210,4 @@
}
Assert.assertEquals(compareTo, expected);
-%
\ No newline at end of file
+%
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag1.jsp
Index: TestCancelTag1.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCancelTag1.jsp7 Mar 2003 05:27:19 - 1.2
+++ TestCancelTag1.jsp
RE: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestIncludeTag.jsp
Fix Include to to assume the context is '/test' Should have been... Fix Include to not assume the context is '/test' ^^^ -- James Mitchell Software Developer/Struts Evangelist http://jakarta.apache.org/struts People demand freedom of speech to make up for the freedom of thought which they avoid. - Soren Aabye Kierkegaard (1813-1855) -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Sunday, March 09, 2003 11:05 AM To: [EMAIL PROTECTED] Subject: cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestIncludeTag.jsp jmitchell2003/03/09 08:04:53 Modified:web/test/test/org/apache/struts/taglib/bean TestIncludeTag.jsp Log: Fix Include to to assume the context is '/test' Revision ChangesPath 1.2 +2 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/Tes tIncludeTag.jsp Index: TestIncludeTag.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/tagli b/bean/TestIncludeTag.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestIncludeTag.jsp 22 Feb 2003 02:57:36 - 1.1 +++ TestIncludeTag.jsp 9 Mar 2003 16:04:52 - 1.2 @@ -1,6 +1,7 @@ %@ page contentType=text/html;charset=UTF-8 language=java % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % +%@ taglib uri=/WEB-INF/struts-html.tld prefix=html % logic:equal name=runTest value=testIncludeTagForward bean:include id=INCLUDE_TAG_KEY forward=testIncludeTagForward/ @@ -9,7 +10,7 @@ logic:equal name=runTest value=testIncludeTagHref bean:define id=serverAddress - http://%=request.getServerName()%:%=request.getServerPort() %/test/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp + http://%=request.getServerName()%:%=request.getServerPort()%html:re write page=/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp/ /bean:define bean:include id=INCLUDE_TAG_KEY href=%=serverAddress%/ /logic:equal - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test redirector.jsp
jmitchell2003/03/09 16:50:39 Removed: web/test/test redirector.jsp Log: This file is not used for any tests that we have. Even if it was, it is just a copy of jspRedirector.jsp at /web/test/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFormTag1.jsp
craigmcc2003/03/09 17:57:31
Modified:src/share/org/apache/struts/taglib/html FormTag.java
JavascriptValidatorTag.java
web/test/test/org/apache/struts/taglib/html TestFormTag1.jsp
Log:
Clean up the JavaScript code generation to not use string concatenation,
and make the line-end generation platform independent so that Cactus tests
can pass on Linux.
Revision ChangesPath
1.45 +46 -21
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
Index: FormTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- FormTag.java 8 Mar 2003 19:23:49 - 1.44
+++ FormTag.java 10 Mar 2003 01:57:30 - 1.45
@@ -125,6 +125,11 @@
protected String focusIndex = null;
/**
+ * The line ending string.
+ */
+protected static String lineEnd = System.getProperty(line.separator);
+
+/**
* The ActionMapping defining where we will be submitting this form
*/
protected ActionMapping mapping = null;
@@ -629,35 +634,56 @@
// Render JavaScript to set the input focus if required
if (this.focus != null) {
-results.append(\r\n);
+
+results.append(lineEnd);
results.append(this.getJsStartElement());
// xhtml script content shouldn't use the browser hiding trick
if (!this.isXhtml()) {
-results.append( !--\r\n);
+results.append( !--);
+results.append(lineEnd);
}
// Construct the control name that will receive focus.
// This does not include any index.
-String focusControl =
-document.forms[\ + beanName + \].elements[\ + this.focus +
\];
+StringBuffer focusControl = new StringBuffer(document.forms[\);
+focusControl.append(beanName);
+focusControl.append(\].elements[\);
+focusControl.append(this.focus);
+focusControl.append(\]);
+
+results.append( var focusControl = );
+results.append(focusControl.toString());
+results.append(;);
+results.append(lineEnd);
+results.append(lineEnd);
-results.append( var focusControl = + focusControl + ;\r\n\r\n);
-
-results.append( if (focusControl.type != \hidden\) {\r\n);
+results.append( if (focusControl.type != \hidden\) {);
+results.append(lineEnd);
// Construct the index if needed and insert into focus statement
String index = ;
if (this.focusIndex != null) {
-index = [ + this.focusIndex + ];
+StringBuffer sb = new StringBuffer([);
+sb.append(this.focusIndex);
+sb.append(]);
+index = sb.toString();
}
-results.append( focusControl + index + .focus();\r\n } \r\n);
+results.append( focusControl);
+results.append(index);
+results.append(.focus(););
+results.append(lineEnd);
+
+results.append( });
+results.append(lineEnd);
if (!this.isXhtml()) {
-results.append( // --\r\n);
+results.append( // --);
+results.append(lineEnd);
}
-results.append(/script\r\n);
+results.append(/script);
+results.append(lineEnd);
}
// Print this value to our output writer
@@ -763,14 +789,13 @@
* Returns the starting javascript element formatted for xhtml if needed.
*/
private String getJsStartElement() {
-String start = script type=\text/javascript\;
-
+StringBuffer sb = new StringBuffer(script type=\text/javascript\);
if (!this.isXhtml()) {
-start += language=\JavaScript\;
+sb.append( language=\JavaScript\);
}
-start += \r\n;
-
-return start;
+sb.append();
+sb.append(lineEnd);
+return sb.toString();
}
/**
1.24 +9 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Index: JavascriptValidatorTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFileTag1.jsp TestFileTag2.jsp
jmitchell2003/03/06 21:28:51
Modified:web/test/test/org/apache/struts/taglib/html TestFileTag1.jsp
TestFileTag2.jsp
Log:
fix to help better determine what errors are when tests fail...but
we all know that's not going to happen ;D
Revision ChangesPath
1.2 +13 -8
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag1.jsp
Index: TestFileTag1.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFileTag1.jsp 1 Mar 2003 06:00:13 - 1.1
+++ TestFileTag1.jsp 7 Mar 2003 05:28:51 - 1.2
@@ -13,9 +13,6 @@
/bean:define
/logic:equal
- enctype=multipart/form-data
- accept=image/jpeg, image/gif
-
logic:equal name=runTest value=testFilePropertyAccept
bean:define id=TEST_RESULTS toScope=page
html:file property=string accept=image/jpeg, image/gif/
@@ -242,10 +239,18 @@
/logic:equal
-
%
-Assert.assertEquals(
- pageContext.getAttribute(TEST_RESULTS).toString(),
- pageContext.getAttribute(EXPECTED_RESULTS).toString()
- );
+String expected = ;
+String compareTo = ;
+
+if (pageContext.getAttribute(EXPECTED_RESULTS) == null){
+throw new JspException(No tests on this page were called. Please verify that
you've setup the tests correctly.);
+}else{
+ expected=pageContext.getAttribute(TEST_RESULTS).toString();
+}
+if (pageContext.getAttribute(TEST_RESULTS) != null){
+ compareTo=pageContext.getAttribute(EXPECTED_RESULTS).toString();
+}
+
+Assert.assertEquals(compareTo, expected);
%
1.2 +12 -5
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag2.jsp
Index: TestFileTag2.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFileTag2.jsp 1 Mar 2003 06:00:13 - 1.1
+++ TestFileTag2.jsp 7 Mar 2003 05:28:51 - 1.2
@@ -195,11 +195,18 @@
/logic:equal
+%
+String expected = ;
+String compareTo = ;
+if (pageContext.getAttribute(EXPECTED_RESULTS) == null){
+throw new JspException(No tests on this page were called. Please verify that
you've setup the tests correctly.);
+}else{
+ expected=pageContext.getAttribute(TEST_RESULTS).toString();
+}
+if (pageContext.getAttribute(TEST_RESULTS) != null){
+ compareTo=pageContext.getAttribute(EXPECTED_RESULTS).toString();
+}
-%
-Assert.assertEquals(
- pageContext.getAttribute(TEST_RESULTS).toString(),
- pageContext.getAttribute(EXPECTED_RESULTS).toString()
- );
+Assert.assertEquals(compareTo, expected);
%
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestParameterTag.jsp
jmitchell2003/03/06 21:31:30
Modified:src/test/org/apache/struts/taglib SimpleBeanForTesting.java
src/test/org/apache/struts/taglib/bean TestParameterTag.java
src/test/org/apache/struts/taglib/html TestErrorsTag1.java
TestErrorsTag2.java
src/test/org/apache/struts/taglib/logic
TestGreaterEqualTag.java TestGreaterThanTag.java
TestLessEqualTag.java TestLessThanTag.java
TestPresentTag.java
web/test/test/org/apache/struts/taglib/bean
TestParameterTag.jsp
Log:
copyright and other needed additions for tests
Revision ChangesPath
1.4 +52 -16
jakarta-struts/src/test/org/apache/struts/taglib/SimpleBeanForTesting.java
Index: SimpleBeanForTesting.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/SimpleBeanForTesting.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleBeanForTesting.java 28 Feb 2003 01:11:32 - 1.3
+++ SimpleBeanForTesting.java 7 Mar 2003 05:31:30 - 1.4
@@ -60,39 +60,43 @@
import java.util.List;
import java.util.Map;
+import org.apache.struts.action.ActionForm;
+
/**
* Simple bean for unit tests.
*
* @author James Mitchell
*/
-public class SimpleBeanForTesting {
- public SimpleBeanForTesting(){
+public class SimpleBeanForTesting extends ActionForm {
+ public SimpleBeanForTesting() {
super();
}
- public SimpleBeanForTesting(List lst){
+ public SimpleBeanForTesting(List lst) {
this.lst = lst;
}
- public SimpleBeanForTesting(boolean checked){
+ public SimpleBeanForTesting(boolean checked) {
this.checked = checked;
}
- public SimpleBeanForTesting(Boolean checked){
+ public SimpleBeanForTesting(Boolean checked) {
this.checkedWrapper = checkedWrapper;
}
- public SimpleBeanForTesting(Map map){
+ public SimpleBeanForTesting(Map map) {
this.map = map;
}
- public SimpleBeanForTesting(String string){
+ public SimpleBeanForTesting(String string) {
this.string = string;
}
- public SimpleBeanForTesting(Integer integerValue){
+ public SimpleBeanForTesting(Integer integerValue) {
this.integerValue = integerValue;
}
- private String string;
+ private String string;
private Integer integerValue;
private Double doubleValue;
private List lst;
private Map map;
+ private String x;
+ private String y;
private Object nestedObject;
private Object[] array;
private Enumeration enumeration;
@@ -102,14 +106,14 @@
//Copied right from the FAQ
private String strAry[] =
- { String 0, String 1, String 2, String 3, String 4 };
+ { String 0, String 1, String 2, String 3, String 4 };
-public String getStringIndexed(int index) {
- return (strAry[index]);
-}
-public void setStringIndexed(int index, String value){
- strAry[index] = value;
-}
+ public String getStringIndexed(int index) {
+ return (strAry[index]);
+ }
+ public void setStringIndexed(int index, String value) {
+ strAry[index] = value;
+ }
/**
* Returns the lst.
@@ -301,6 +305,38 @@
*/
public void setCheckedWrapper(Boolean checkedWrapper) {
this.checkedWrapper = checkedWrapper;
+ }
+
+ /**
+ * Returns the x.
+ * @return String
+ */
+ public String getX() {
+ return x;
+ }
+
+ /**
+ * Returns the y.
+ * @return String
+ */
+ public String getY() {
+ return y;
+ }
+
+ /**
+ * Sets the x.
+ * @param x The x to set
+ */
+ public void setX(String x) {
+ this.x = x;
+ }
+
+ /**
+ * Sets the y.
+ * @param y The y to set
+ */
+ public void setY(String y) {
+ this.y = y;
}
}
1.4 +5 -1
jakarta-struts/src/test/org/apache/struts/taglib/bean/TestParameterTag.java
Index: TestParameterTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestParameterTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestParameterTag.java 6 Mar 2003 02:42:17 - 1.3
+++ TestParameterTag.java 7 Mar 2003 05:31:30 - 1.4
@@ -61,6 +61,7 @@
import
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFormTag1.jsp
jmitchell2003/03/06 21:38:24
Added: src/test/org/apache/struts/taglib/html TestFormTag1.java
web/test/test/org/apache/struts/taglib/html TestFormTag1.jsp
Log:
Adding more tests
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestFormTag1.java
Index: TestFormTag1.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.bean.FormTag/code class.
*
* @author James Mitchell
*/
public class TestFormTag1 extends JspTestCase {
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestFormTag1(String theName) {
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
junit.awtui.TestRunner.main(new String[] {TestFormTag1.class.getName()});
}
/**
* @return a test suite (codeTestSuite/code) that includes all methods
* starting with test
*/
public static Test suite() {
// All methods starting with test will be executed in the test suite.
return new TestSuite(TestFormTag1.class);
}
private void runMyTest(String whichTest, String locale){
pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale),
PageContext.SESSION_SCOPE);
pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(Test
Value), PageContext.REQUEST_SCOPE);
request.setAttribute(runTest, whichTest);
try {
pageContext.forward(/test/org/apache/struts/taglib/html/TestFormTag1.jsp);
}
catch (Exception e) {
e.printStackTrace
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestHiddenTag1.jsp TestHiddenTag2.jsp
jmitchell2003/03/06 21:40:38
Added: src/test/org/apache/struts/taglib/html TestHiddenTag1.java
TestHiddenTag2.java
web/test/test/org/apache/struts/taglib/html
TestHiddenTag1.jsp TestHiddenTag2.jsp
Log:
Adding more tests
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestHiddenTag1.java
Index: TestHiddenTag1.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.bean.HiddenTag/code class.
*
* @author James Mitchell
*/
public class TestHiddenTag1 extends JspTestCase {
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestHiddenTag1(String theName) {
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
junit.awtui.TestRunner.main(new String[] {TestHiddenTag1.class.getName()});
}
/**
* @return a test suite (codeTestSuite/code) that includes all methods
* starting with test
*/
public static Test suite() {
// All methods starting with test will be executed in the test suite.
return new TestSuite(TestHiddenTag1.class);
}
private void runMyTest(String whichTest, String locale){
pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale),
PageContext.SESSION_SCOPE);
pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(Test
Value), PageContext.REQUEST_SCOPE);
request.setAttribute(runTest, whichTest);
try {
pageContext.forward(/test/org/apache/struts/taglib/html/TestHiddenTag1.jsp);
}
catch
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestHtmlTag.jsp
jmitchell2003/03/06 21:40:59
Added: src/test/org/apache/struts/taglib/html TestHtmlTag.java
web/test/test/org/apache/struts/taglib/html TestHtmlTag.jsp
Log:
Adding more tests
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestHtmlTag.java
Index: TestHtmlTag.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.bean.HtmlTag/code class.
*
* @author James Mitchell
*/
public class TestHtmlTag extends JspTestCase {
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestHtmlTag(String theName) {
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
junit.awtui.TestRunner.main(new String[] {TestHtmlTag.class.getName()});
}
/**
* @return a test suite (codeTestSuite/code) that includes all methods
* starting with test
*/
public static Test suite() {
// All methods starting with test will be executed in the test suite.
return new TestSuite(TestHtmlTag.class);
}
private void runMyTest(String whichTest, String locale){
pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale),
PageContext.SESSION_SCOPE);
pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(Test
Value), PageContext.REQUEST_SCOPE);
request.setAttribute(runTest, whichTest);
try {
pageContext.forward(/test/org/apache/struts/taglib/html/TestHtmlTag.jsp);
}
catch (Exception e) {
e.printStackTrace();
fail(There is a problem
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestImageTag1.jsp TestImageTag2.jsp TestImageTag3.jsp TestImageTag4.jsp
jmitchell2003/03/06 21:41:28
Added: src/test/org/apache/struts/taglib/html TestImageTag1.java
TestImageTag2.java TestImageTag3.java
TestImageTag4.java
web/test/test/org/apache/struts/taglib/html
TestImageTag1.jsp TestImageTag2.jsp
TestImageTag3.jsp TestImageTag4.jsp
Log:
Adding more tests
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestImageTag1.java
Index: TestImageTag1.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Locale;
import java.util.StringTokenizer;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.bean.ImageTag/code class.
*
* @author James Mitchell
*/
public class TestImageTag1 extends JspTestCase {
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestImageTag1(String theName) {
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
junit.awtui.TestRunner.main(new String[] {TestImageTag1.class.getName()});
}
/**
* @return a test suite (codeTestSuite/code) that includes all methods
* starting with test
*/
public static Test suite() {
// All methods starting with test will be executed in the test suite.
return new TestSuite(TestImageTag1.class);
}
private void runMyTest(String whichTest, String locale){
pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale),
PageContext.SESSION_SCOPE);
pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(Test
Value), PageContext.REQUEST_SCOPE
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestCheckboxTag5.jsp TestCheckboxTag6.jsp TestCheckboxTag7.jsp TestCheckboxTag8.jsp
jmitchell2003/02/28 16:40:51 Modified:src/test/org/apache/struts/taglib/html TestCheckboxTag1.java Removed: src/test/org/apache/struts/taglib/html TestCheckboxTag5.java TestCheckboxTag7.java web/test/test/org/apache/struts/taglib/html TestCheckboxTag5.jsp TestCheckboxTag6.jsp TestCheckboxTag7.jsp TestCheckboxTag8.jsp Log: I incorrectly assumed that checkbox would work with a boolean wrapper Revision ChangesPath 1.2 +0 -6 jakarta-struts/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java Index: TestCheckboxTag1.java === RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestCheckboxTag1.java 28 Feb 2003 01:11:33 - 1.1 +++ TestCheckboxTag1.java 1 Mar 2003 00:40:51 - 1.2 @@ -77,12 +77,6 @@ * * TestCheckboxTag(3 and 4) - These test using a boolean property * set to false on our form. - * - * TestCheckboxTag(5 and 6) - These test using a java.lang.Boolean property - * set to true on our form. - * - * TestCheckboxTag(7 and 8) - These test using a java.lang.Boolean property - * set to false on our form. * * @author James Mitchell */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestErrorsTag1.jsp TestErrorsTag2.jsp TestFileTag1.jsp TestFileTag2.jsp
jmitchell2003/02/28 22:00:13
Added: src/test/org/apache/struts/taglib/html TestErrorsTag1.java
TestErrorsTag2.java TestFileTag1.java
TestFileTag2.java
web/test/test/org/apache/struts/taglib/html
TestErrorsTag1.jsp TestErrorsTag2.jsp
TestFileTag1.jsp TestFileTag2.jsp
Log:
New tests
Revision ChangesPath
1.1
jakarta-struts/src/test/org/apache/struts/taglib/html/TestErrorsTag1.java
Index: TestErrorsTag1.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Struts, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.struts.taglib.html;
import java.util.Locale;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
/**
* Suite of unit tests for the
* codeorg.apache.struts.taglib.bean.ErrorsTag/code class.
*
* @author James Mitchell
*/
public class TestErrorsTag1 extends JspTestCase {
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestErrorsTag1(String theName) {
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
junit.awtui.TestRunner.main(new String[] {TestErrorsTag1.class.getName()});
}
/**
* @return a test suite (codeTestSuite/code) that includes all methods
* starting with test
*/
public static Test suite() {
// All methods starting with test will be executed in the test suite.
return new TestSuite(TestErrorsTag1.class);
}
private void runMyTest(String whichTest, String locale){
request.setAttribute(runTest, whichTest);
pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale),
PageContext.SESSION_SCOPE);
try {
pageContext.forward(/test/org/apache/struts/taglib/html/TestErrorsTag1.jsp
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestWriteTag.jsp
jmitchell2003/02/26 16:02:05
Modified:src/test/org/apache/struts/taglib/bean TestWriteTag.java
web/test/test/org/apache/struts/taglib/bean TestWriteTag.jsp
Log:
Fix tests where users locale is fr.
Revision ChangesPath
1.2 +36 -38
jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
Index: TestWriteTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWriteTag.java 22 Feb 2003 02:48:09 - 1.1
+++ TestWriteTag.java 27 Feb 2003 00:02:04 - 1.2
@@ -122,124 +122,122 @@
assertEquals(compare, output);
}
+private void runMyTest(String whichTest, String locale){
+ pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale),
PageContext.SESSION_SCOPE);
+ request.setAttribute(runTest, whichTest);
+try {
+
pageContext.forward(/test/org/apache/struts/taglib/bean/TestWriteTag.jsp);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail(There is a problem that is preventing the tests to
continue!);
+ }
+}
+
// Name
-public void testWriteTagName() throws IOException, ServletException{
- request.setAttribute(runTest, testWriteTagName);
+public void testWriteTagName(){
pageContext.setAttribute(REQUEST_KEY,TEST_STRING_VAL,PageContext.REQUEST_SCOPE);
-
pageContext.forward(/test/org/apache/struts/taglib/bean/TestWriteTag.jsp);
+ runMyTest(testWriteTagName, );
}
public void endWriteTagName(WebResponse response){
formatAndTest(TEST_STRING_VAL, response.getText());
}
// Property
-public void testWriteTagNameProperty() throws IOException, ServletException{
+public void testWriteTagNameProperty() {
SimpleBeanForTesting sbft = new SimpleBeanForTesting(TEST_STRING_VAL);
- request.setAttribute(runTest, testWriteTagNameProperty);
pageContext.setAttribute(REQUEST_KEY, sbft,PageContext.REQUEST_SCOPE);
-
pageContext.forward(/test/org/apache/struts/taglib/bean/TestWriteTag.jsp);
+ runMyTest(testWriteTagNameProperty, );
}
public void endWriteTagNameProperty(WebResponse response){
formatAndTest(TEST_STRING_VAL, response.getText());
}
// Name and Format
-public void testWriteTagNameFormat() throws IOException, ServletException{
- request.setAttribute(runTest, testWriteTagNameFormat);
+public void testWriteTagNameFormat(){
pageContext.setAttribute(REQUEST_KEY,TEST_INTEGER_VAL,PageContext.REQUEST_SCOPE);
-
pageContext.forward(/test/org/apache/struts/taglib/bean/TestWriteTag.jsp);
+ runMyTest(testWriteTagNameFormat, );
}
public void endWriteTagNameFormat(WebResponse response){
formatAndTest(1,234 , response.getText());
}
// Name, Format, and FormatKey (default bundle)
-public void testWriteTagNameFormatKeyDefaultBundle() throws IOException,
ServletException{
- request.setAttribute(runTest,
testWriteTagNameFormatKeyDefaultBundle);
+public void testWriteTagNameFormatKeyDefaultBundle(){
pageContext.setAttribute(REQUEST_KEY,TEST_INTEGER_VAL,PageContext.REQUEST_SCOPE);
-
pageContext.forward(/test/org/apache/struts/taglib/bean/TestWriteTag.jsp);
+ runMyTest(testWriteTagNameFormatKeyDefaultBundle, );
}
public void endWriteTagNameFormatKeyDefaultBundle(WebResponse response){
formatAndTest($1,234 , response.getText());
}
// Name, Format, and FormatKey (alternate bundle)
-public void testWriteTagNameFormatKeyAlternateBundle() throws IOException,
ServletException{
- request.setAttribute(runTest,
testWriteTagNameFormatKeyAlternateBundle);
+public void testWriteTagNameFormatKeyAlternateBundle(){
pageContext.setAttribute(REQUEST_KEY,TEST_INTEGER_VAL,PageContext.REQUEST_SCOPE);
-
pageContext.forward(/test/org/apache/struts/taglib/bean/TestWriteTag.jsp);
+ runMyTest(testWriteTagNameFormatKeyAlternateBundle, );
}
public void endWriteTagNameFormatKeyAlternateBundle(WebResponse response){
formatAndTest($1,234 , response.getText());
}
// Name, Format, and FormatKey (default bundle) (Double)
-public void testWriteTagNameFormatKeyDefaultBundleDouble() throws IOException,
ServletException
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html - New directory
jmitchell2003/02/26 18:18:17 jakarta-struts/web/test/test/org/apache/struts/taglib/html - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestBaseTag.jsp TestButtonTag.jsp TestButtonTag2.jsp
jmitchell2003/02/26 18:18:45 Added: web/test/test/org/apache/struts/taglib/html TestBaseTag.jsp TestButtonTag.jsp TestButtonTag2.jsp Log: Initial checkin. Many more will follow. Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp Index: TestBaseTag.jsp === %@ page contentType=text/html;charset=UTF-8 language=java % [EMAIL PROTECTED] import=junit.framework.Assert% %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % % String server = request.getServerName(); int port = request.getServerPort(); % logic:equal name=runTest value=testBase bean:define id=TEST_RESULTS toScope=page html:base/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page base href=http://%=server%:%=port%/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp /bean:define /logic:equal logic:equal name=runTest value=testBaseTarget bean:define id=TEST_RESULTS toScope=page html:base target=My-Other-Frame/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page base href=http://%=server%:%=port%/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp target=My-Other-Frame /bean:define /logic:equal logic:equal name=runTest value=testBaseServer bean:define id=TEST_RESULTS toScope=page html:base server=www.my-server-name.com/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page base href=http://www.my-server-name.com:%=port%/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp /bean:define /logic:equal logic:equal name=runTest value=testBaseServerTarget bean:define id=TEST_RESULTS toScope=page html:base server=www.my-server-name.com target=My-Other-Frame/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page base href=http://www.my-server-name.com:%=port%/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp target=My-Other-Frame /bean:define /logic:equal % Assert.assertEquals( pageContext.getAttribute(TEST_RESULTS).toString(), pageContext.getAttribute(EXPECTED_RESULTS).toString() ); % 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag.jsp Index: TestButtonTag.jsp === %@ page contentType=text/html;charset=UTF-8 language=java % [EMAIL PROTECTED] import=junit.framework.Assert% %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % logic:equal name=runTest value=testButtonProperty bean:define id=TEST_RESULTS toScope=page html:button property=propertyName/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=button name=propertyName value=Click /bean:define /logic:equal logic:equal name=runTest value=testButtonPropertyAccesskey bean:define id=TEST_RESULTS toScope=page html:button property=propertyName accesskey=a/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=button name=propertyName accesskey=a value=Click /bean:define /logic:equal logic:equal name=runTest value=testButtonPropertyAlt bean:define id=TEST_RESULTS toScope=page html:button property=propertyName alt=Testing alt attribute/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=button name=propertyName value=Click alt=Testing alt attribute /bean:define /logic:equal logic:equal name=runTest value=testButtonPropertyAltKey1 bean:define id=TEST_RESULTS toScope=page html:button property=propertyName altKey=default.bundle.message/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=button name=propertyName value=Click alt=Testing Message /bean:define /logic:equal logic:equal name=runTest value=testButtonPropertyAltKey2 bean:define id=TEST_RESULTS toScope=page html:button property=propertyName altKey=no.such.key/ /bean:define bean:define id=EXPECTED_RESULTS toScope=page input type=button name=propertyName value=Click /bean:define /logic:equal logic:equal name=runTest value=testButtonPropertyAltKey1_fr bean:define id=TEST_RESULTS toScope=page
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestButtonTag2.jsp
jmitchell2003/02/26 20:39:43
Modified:src/test/org/apache/struts/taglib/html TestButtonTag2.java
web/test/test/org/apache/struts/taglib/html
TestButtonTag2.jsp
Log:
Add tests for indexed buttons.
Revision ChangesPath
1.2 +49 -0
jakarta-struts/src/test/org/apache/struts/taglib/html/TestButtonTag2.java
Index: TestButtonTag2.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestButtonTag2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestButtonTag2.java 27 Feb 2003 02:17:50 - 1.1
+++ TestButtonTag2.java 27 Feb 2003 04:39:43 - 1.2
@@ -54,7 +54,10 @@
*/
package org.apache.struts.taglib.html;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Locale;
+import java.util.StringTokenizer;
import javax.servlet.jsp.PageContext;
import junit.framework.Test;
@@ -62,6 +65,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.struts.Globals;
+import org.apache.struts.taglib.SimpleBeanForTesting;
/**
* Suite of unit tests for the
@@ -158,6 +162,51 @@
runMyTest(testButtonPropertyBodyContentMessageKey_fr, fr);
}
+public void testButtonPropertyIndexedArray(){
+ ArrayList lst = new ArrayList();
+ lst.add(Test Message);
+ pageContext.setAttribute(lst, lst, PageContext.REQUEST_SCOPE);
+ runMyTest(testButtonPropertyIndexedArray, );
+ }
+
+public void testButtonPropertyIndexedArrayProperty(){
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting();
+ ArrayList lst = new ArrayList();
+ lst.add(Test Message);
+ sbft.setList(lst);
+ pageContext.setAttribute(lst, sbft, PageContext.REQUEST_SCOPE);
+ runMyTest(testButtonPropertyIndexedArrayProperty, );
+ }
+
+public void testButtonPropertyIndexedMap(){
+ HashMap map = new HashMap();
+ map.put(tst1, Test Message);
+ pageContext.setAttribute(lst, map, PageContext.REQUEST_SCOPE);
+ runMyTest(testButtonPropertyIndexedMap, );
+ }
+
+public void testButtonPropertyIndexedMapProperty(){
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting();
+ HashMap map = new HashMap();
+ map.put(tst1, Test Message);
+ sbft.setMap(map);
+ pageContext.setAttribute(lst, sbft, PageContext.REQUEST_SCOPE);
+ runMyTest(testButtonPropertyIndexedMapProperty, );
+ }
+
+public void testButtonPropertyIndexedEnumeration(){
+ StringTokenizer st = new StringTokenizer(Test Message);
+ pageContext.setAttribute(lst, st, PageContext.REQUEST_SCOPE);
+ runMyTest(testButtonPropertyIndexedEnumeration, );
+ }
+
+public void testButtonPropertyIndexedEnumerationProperty(){
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting();
+ StringTokenizer st = new StringTokenizer(Test Message);
+ sbft.setEnumeration(st);
+ pageContext.setAttribute(lst, sbft, PageContext.REQUEST_SCOPE);
+ runMyTest(testButtonPropertyIndexedEnumerationProperty, );
+ }
1.2 +83 -0
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag2.jsp
Index: TestButtonTag2.jsp
===
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestButtonTag2.jsp27 Feb 2003 02:18:45 - 1.1
+++ TestButtonTag2.jsp27 Feb 2003 04:39:43 - 1.2
@@ -112,6 +112,89 @@
/logic:equal
+logic:equal name=runTest value=testButtonPropertyIndexedArray
+ bean:define id=TEST_RESULTS toScope=page
+ logic:iterate id=indivItem name=lst
+ html:button property=propertyName indexed=true/
+ /logic:iterate
+ /bean:define
+ bean:define id=EXPECTED_RESULTS toScope=page
+
+ input type=button name=propertyName[0] value=Click
+
+ /bean:define
+/logic:equal
+
+logic:equal name=runTest value=testButtonPropertyIndexedArrayProperty
+ bean:define id=TEST_RESULTS toScope=page
+ logic:iterate id=indivItem name=lst property=list
+ html:button property=propertyName indexed=true/
+ /logic:iterate
+ /bean:define
+ bean:define id=EXPECTED_RESULTS toScope=page
+
+ input type=button name=propertyName[0] value=Click
+
+ /bean:define
+/logic:equal
+
+logic:equal name=runTest value=testButtonPropertyIndexedMap
+ bean:define id=TEST_RESULTS toScope=page
+ logic:iterate id=indivItem name=lst
+ html:button
cvs commit: jakarta-struts/web/test/test/org - New directory
jmitchell2003/02/21 18:53:50 jakarta-struts/web/test/test/org - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache - New directory
jmitchell2003/02/21 18:54:17 jakarta-struts/web/test/test/org/apache - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts - New directory
jmitchell2003/02/21 18:54:39 jakarta-struts/web/test/test/org/apache/struts - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib - New directory
jmitchell2003/02/21 18:54:53 jakarta-struts/web/test/test/org/apache/struts/taglib - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean - New directory
jmitchell2003/02/21 18:55:37 jakarta-struts/web/test/test/org/apache/struts/taglib/bean - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/logic - New directory
jmitchell2003/02/21 18:55:51 jakarta-struts/web/test/test/org/apache/struts/taglib/logic - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean/resources - New directory
jmitchell2003/02/21 18:56:06 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/resources - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean TestCookieTag.jsp TestDefineTag.jsp TestHeaderTag.jsp TestIncludeTag.jsp TestMessageTag.jsp TestMessageTag1.jsp TestMessageTag2.jsp TestMessageTag3.jsp TestMessageTag4.jsp TestPageTag.jsp TestParameterTag.jsp TestResourceTag.jsp TestSizeTag.jsp TestStrutsTag.jsp TestWriteTag.jsp
jmitchell2003/02/21 18:57:36 Added: web/test/test/org/apache/struts/taglib/bean TestCookieTag.jsp TestDefineTag.jsp TestHeaderTag.jsp TestIncludeTag.jsp TestMessageTag.jsp TestMessageTag1.jsp TestMessageTag2.jsp TestMessageTag3.jsp TestMessageTag4.jsp TestPageTag.jsp TestParameterTag.jsp TestResourceTag.jsp TestSizeTag.jsp TestStrutsTag.jsp TestWriteTag.jsp Log: Initial checkin. These jsp files correspond 1 for 1 with the Cactus tests under /src/test Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/TestCookieTag.jsp Index: TestCookieTag.jsp === % page contentType=text/html;charset=UTF-8 language=java % % taglib uri=/WEB-INF/struts-logic.tld prefix=logic % % taglib uri=/WEB-INF/struts-bean.tld prefix=bean % logic:equal name=runTest value=testCookieTagName bean:cookie id=cookie name=COOKIE_KEY/ bean:define id=COOKIE_TAG_KEY name=cookie property=value/ /logic:equal logic:equal name=runTest value=testCookieTagNameMultiple bean:cookie id=cookie name=COOKIE_KEY multiple=any value here/ bean:define id=COOKIE_TAG_KEY logic:iterate id=cookieValue name=cookie type=javax.servlet.http.Cookie bean:write name=cookieValue property=value //logic:iterate /bean:define /logic:equal logic:equal name=runTest value=testCookieTagNameValue bean:cookie id=cookie name=COOKIE_KEY value=COOKIE_VAL/ bean:define id=COOKIE_TAG_KEY name=cookie property=value/ /logic:equal bean:write name=COOKIE_TAG_KEY/ 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/TestDefineTag.jsp Index: TestDefineTag.jsp === % page contentType=text/html;charset=UTF-8 language=java % % taglib uri=/WEB-INF/struts-logic.tld prefix=logic % % taglib uri=/WEB-INF/struts-bean.tld prefix=bean % logic:equal name=runTest value=testDefineNameApplicationScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag scope=application/ /logic:equal logic:equal name=runTest value=testDefineNamePropertyApplicationScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag property=value scope=application/ /logic:equal logic:equal name=runTest value=testDefineValueApplicationScope bean:define id=DEFINE_TAG_KEY value=Test Value scope=application/ /logic:equal logic:equal name=runTest value=testDefineBodyApplicationScope bean:define id=DEFINE_TAG_KEY scope=application Test Value /bean:define /logic:equal logic:equal name=runTest value=testDefineNameSessionScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag scope=session/ /logic:equal logic:equal name=runTest value=testDefineNamePropertySessionScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag property=value scope=session/ /logic:equal logic:equal name=runTest value=testDefineValueSessionScope bean:define id=DEFINE_TAG_KEY value=Test Value scope=session/ /logic:equal logic:equal name=runTest value=testDefineBodySessionScope bean:define id=DEFINE_TAG_KEY scope=session Test Value /bean:define /logic:equal logic:equal name=runTest value=testDefineNameRequestScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag scope=request/ /logic:equal logic:equal name=runTest value=testDefineNamePropertyRequestScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag property=value scope=request/ /logic:equal logic:equal name=runTest value=testDefineValueRequestScope bean:define id=DEFINE_TAG_KEY value=Test Value scope=request/ /logic:equal logic:equal name=runTest value=testDefineBodyRequestScope bean:define id=DEFINE_TAG_KEY scope=request Test Value /bean:define /logic:equal logic:equal name=runTest value=testDefineNameNoScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag/ /logic:equal logic:equal name=runTest value=testDefineNamePropertyNoScope bean:define id=DEFINE_TAG_KEY name=TestDefineTag property=value/ /logic:equal logic:equal name=runTest value=testDefineValueNoScope bean:define id=DEFINE_TAG_KEY value=Test Value/ /logic:equal logic:equal name=runTest value=testDefineBodyNoScope bean:define id=DEFINE_TAG_KEY Test Value /bean:define /logic:equal bean:write name=DEFINE_TAG_KEY/ 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/bean
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/bean/resources IncludeTagTest.jsp TextFileForTesting.txt
jmitchell2003/02/21 18:58:14 Added: web/test/test/org/apache/struts/taglib/bean/resources IncludeTagTest.jsp TextFileForTesting.txt Log: A few more items Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp Index: IncludeTagTest.jsp === % page contentType=text/html;charset=UTF-8 language=java % Test Value 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/bean/resources/TextFileForTesting.txt Index: TextFileForTesting.txt === Test Value - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/logic TestIterateTag.jsp
jmitchell2003/02/21 18:59:12 Added: web/test/test/org/apache/struts/taglib/logic TestIterateTag.jsp Log: Initial checkin. These jsp files correspond 1 for 1 with the Cactus tests under /src/test Revision ChangesPath 1.1 jakarta-struts/web/test/test/org/apache/struts/taglib/logic/TestIterateTag.jsp Index: TestIterateTag.jsp === % page contentType=text/html;charset=UTF-8 language=java % % page import=junit.framework.Assert% % taglib uri=/WEB-INF/struts-logic.tld prefix=logic % % taglib uri=/WEB-INF/struts-bean.tld prefix=bean % logic:equal name=runTest value=testRequestScopePropertyIterateArray logic:iterate id=iteration name=testRequestScopePropertyIterateArray scope=request bean:write name=iteration/ /logic:iterate /logic:equal - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-el/web/test/test - New directory
dmkarr 2002/09/25 21:39:06 jakarta-struts/contrib/struts-el/web/test/test - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test redirector.jsp
craigmcc2002/06/15 21:02:38
Modified:.build-tests.xml build.xml
conf/test cactus.properties web.xml
conf/test/tomcat40 server.xml
src/test/org/apache/struts/taglib/logic
TestNotPresentTag.java TestPresentTag.java
web/test/test redirector.jsp
Added: conf/test log_client.properties
conf/test/tomcat41 server.xml
web/test jspRedirector.jsp
Log:
Bring the test harness for Struts 1.1 up to date with respect to changes
in both the Struts classes and changes required by switching to Cactus 1.3
(which is now required).
All test execution is now in build-tests.xml, but there are convenient
execution triggers in build.xml itself:
test.junit Execute non-Cactus JUnit tests
test.tomcat.32 Execute Cactus tests on Tomcat 3.2
test.tomcat.40 Execute Cactus tests on Tomcat 4.0
test.tomcat.41 Execute Cactus tests on Tomcat 4.1
test tomcat.allExecute Cactus tests on all Tomcats for which
you have a tomcat.home.XX property defined
NOTE: You will need to define a couple of new properties to execute tests:
cactus.home Pathname to install directory for Cactus 1.3
aspectjrt.jar AspectJ runtime Jar (usually you can set this to
${cactus.home}/lib/aspectjrt.jar)
cactus.jarCactus JAR file
cactus.ant.jarCactus Ant JAR file
log4j.jar Log4J JAR file
In addition, you'll need to follow the Cactus 1.3 installation rules about
putting the necessary files into your $ANT_HOME/lib directory, or use the
prepackaged Cactus Ant download that has what you need.
NOTE: I don't have Tomcat 3.2 installed any more, so I don't know for
sure if the tests will really pass on it. They pass on 4.0 and 4.1
(head of each CVS branch).
NOTE: On 4.0 and 4.1, Jasper complains a lot about Stream closed
problems, but it doesn't seem to cause the tests to fail. To get this
output out of the way, I've put a Logger in the server.xml file for
these two versions, that writes to a file in the
target/tests/server/tomcatXX subdirectory.
NOTE: Cactus logging is configured to write to cactus_client.log and
cactus_server.log in your top level source directory.
Now it's time to write a whole bunch of unit tests ...
Revision ChangesPath
1.3 +161 -11 jakarta-struts/build-tests.xml
Index: build-tests.xml
===
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests.xml 11 Jul 2001 01:57:44 - 1.2
+++ build-tests.xml 16 Jun 2002 04:02:38 - 1.3
@@ -20,8 +20,14 @@
servlet.jar The servlet jar (either 2.2 or 2.3)
+cactus.home The home directory of your Cactus
+ installation (version 1.3 required)
+
+aspectjrt.jar The AspectJ runtime jar that is
+ included with Cactus 1.3
+
cactus.jarThe Cactus jar (either for Servlet API
- 2.2 or 2.3)
+ 2.2 or 2.3).
cactus.ant.jarThe Cactus custom Ant tasks jar
@@ -33,6 +39,9 @@
tomcat.home.40The home directory of where Tomcat 4.0
is installed
+tomcat.home.41The home directory of where Tomcat 4.1
+ is installed
+
compile.debug The debug mode for compilation
compile.deprecation The deprecation mode for compilation
@@ -75,9 +84,20 @@
!-- Compilation Classpath --
path id=compile.classpath
pathelement location=${build.home}/library/${app.name}.jar/
- pathelement location=${servlet.jar}/
+ pathelement location=${build.home}/test/classes/
+ pathelement location=${commons-beanutils.jar}/
+ pathelement location=${commons-collections.jar}/
+ pathelement location=${commons-dbcp.jar}/
+ pathelement location=${commons-digester.jar}/
+ pathelement location=${commons-httpclient.jar}/
+ pathelement location=${commons-logging.jar}/
+ pathelement location=${commons-pool.jar}/
+ pathelement location=${commons-services.jar}/
+ pathelement location=${commons-validator.jar}/
+ pathelement location=${aspectjrt.jar}/
pathelement location=${cactus.jar}/
pathelement location=${junit.jar}/
+ pathelement location=${servlet.jar}/
/path
cvs commit: jakarta-struts/web/test/test - New directory
dwinterfeldt01/07/10 18:58:09 jakarta-struts/web/test/test - New directory
cvs commit: jakarta-struts/web/test/test redirector.jsp
dwinterfeldt01/07/10 18:59:10 Added: web/test/test redirector.jsp Log: Component of Cactus for JSP Unit Testing. Modified from distribution to set session to true. Revision ChangesPath 1.1 jakarta-struts/web/test/test/redirector.jsp Index: redirector.jsp === %@page import=org.apache.commons.cactus.server.* session=true %% /** * * Note: * It is very important not to put any character between the end * of the page tag and the beginning of the java code expression, otherwise, * the generated servlet containss a 'out.println(\r\n);' and this breaks * our mechanism ! */ /** * This JSP is used as a proxy to call your server-side unit tests. We use * a JSP rather than a servlet because for testing custom JSP tags for * example we need access to JSP implicit objects (PageContext and * JspWriter). */ JspTestCaller caller = new JspTestCaller(); JspImplicitObjects objects = new JspImplicitObjects(); objects.m_Config = config; objects.m_Request = request; objects.m_Response = response; objects.m_PageContext = pageContext; objects.m_JspWriter = out; caller.doTest(objects); %
