jmitchell 2003/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 Changes Path
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 -0000 1.1
+++ TestButtonTag2.java 27 Feb 2003 04:39:43 -0000 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.jsp 27 Feb 2003 02:18:45 -0000 1.1
+++ TestButtonTag2.jsp 27 Feb 2003 04:39:43 -0000 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 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="testButtonPropertyIndexedMapProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <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="testButtonPropertyIndexedEnumeration">
+ <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">
+
+ <input type="button" name="propertyName[1]" value="Click">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest" value="testButtonPropertyIndexedEnumerationProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <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">
+
+ <input type="button" name="propertyName[1]" value="Click">
+
+ </bean:define>
+</logic:equal>
+
+
<%
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
