You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/02/10 22:08:50 UTC
svn commit: r376852 [2/20] -
/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,256 +1,283 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
+<%@ page import="junit.framework.Assert" %>
<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrue">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAccesskey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" accesskey="a"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" accesskey="a" value="on" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" accesskey="a"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" accesskey="a" value="on"
+ checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAlt">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" alt="Testing alt attribute"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" alt="Testing alt attribute">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" alt="Testing alt attribute"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ alt="Testing alt attribute">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="no.such.key"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="no.such.key"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="alternate.bundle.message" bundle="alternate"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="alternate.bundle.message"
+ bundle="alternate"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey1_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" alt="Message D'Essai">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ alt="Message D'Essai">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey2_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="no.such.key"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueDisabled_True">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" disabled="true"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" disabled="disabled">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueDisabled_False1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" disabled="false"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueDisabled_False2">
- <!-- This was changed recently by overwhelming consensus. The prior functionality
- was very counter-intuitive. It used to be that putting disabled="false"
- was the same as putting disabled="true". Craig sited the confusion is due
- to the HTML spec.
- -->
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" disabled="anything but true"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="no.such.key"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueDisabled_True">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" disabled="true"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ disabled="disabled">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueDisabled_False1">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" disabled="false"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueDisabled_False2">
+ <!-- This was changed recently by overwhelming consensus. The prior
+ functionality
+ was very counter-intuitive. It used to be that putting disabled="false"
+ was the same as putting disabled="true". Craig sited the confusion is due
+ to the HTML spec.
+ -->
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" disabled="anything but true"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnblur">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onblur="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onblur="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onblur="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onblur="Put script here">
+ </bean:define>
</logic:equal>
-
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnchange">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onchange="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onchange="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onchange="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onchange="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onclick="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onclick="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOndblclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" ondblclick="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" ondblclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" ondblclick="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ ondblclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnfocus">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onfocus="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onfocus="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onfocus="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onfocus="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnkeydown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onkeydown="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onkeydown="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onkeydown="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onkeydown="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnkeypress">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onkeypress="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onkeypress="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onkeypress="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onkeypress="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnkeyup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onkeyup="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onkeyup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onkeyup="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onkeyup="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnmousedown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmousedown="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onmousedown="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueOnmousedown">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmousedown="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onmousedown="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnmousemove">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmousemove="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onmousemove="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueOnmousemove">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmousemove="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onmousemove="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnmouseout">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmouseout="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onmouseout="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmouseout="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onmouseout="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnmouseover">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmouseover="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onmouseover="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueOnmouseover">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmouseover="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onmouseover="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueOnmouseup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmouseup="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" onmouseup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmouseup="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ onmouseup="Put script here">
+ </bean:define>
</logic:equal>
-<%
-String expected = "";
-String compareTo = "";
-
-if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- 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();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
+<%
+ String expected = "";
+ String compareTo = "";
+
+ if (pageContext.getAttribute("EXPECTED_RESULTS") == null) {
+ 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();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag2.jsp Fri Feb 10 13:08:44 2006
@@ -1,213 +1,252 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
+<%@ page import="junit.framework.Assert" %>
<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueStyle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" style="Put something here" errorStyle="some error style"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" style="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" style="Put something here"
+ errorStyle="some error style"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ style="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueStyleClass">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" styleClass="Put something here" errorStyleClass="some error style class"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" class="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" styleClass="Put something here"
+ errorStyleClass="some error style class"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ class="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueStyleId">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" styleId="Put something here" errorStyleId="some error style id"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" id="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" styleId="Put something here"
+ errorStyleId="some error style id"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ id="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueTabindex">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" tabindex="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" tabindex="Put something here" value="on" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" tabindex="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" tabindex="Put something here"
+ value="on" checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueTitle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" title="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" title="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" title="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ title="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueTitleKey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" titleKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" title="Testing Message">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueTitleKey_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" titleKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked" title="Message D'Essai">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" titleKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ title="Testing Message">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueTitleKey_fr">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" titleKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked"
+ title="Message D'Essai">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueValue">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" value ="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="Put something here" checked="checked">
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueBodyContent">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked">Checkbox Value Here</html:checkbox>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">Checkbox Value Here
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueBodyContentMessageKey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked">
- <bean:message key="default.bundle.message"/>
- </html:checkbox>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">Testing Message
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueBodyContentMessageKey_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked">
- <bean:message key="default.bundle.message"/>
- </html:checkbox>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" checked="checked">Message D'Essai
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueIndexedArray">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on" checked="checked">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueIndexedArrayProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on" checked="checked">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" value="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="Put something here"
+ checked="checked">
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueBodyContent">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked">Checkbox Value Here</html:checkbox>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ Checkbox Value Here
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueBodyContentMessageKey">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked">
+ <bean:message key="default.bundle.message"/>
+ </html:checkbox>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ Testing Message
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueBodyContentMessageKey_fr">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked">
+ <bean:message key="default.bundle.message"/>
+ </html:checkbox>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" checked="checked">
+ Message D'Essai
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueIndexedArray">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked" value="on"
+ checked="checked">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueIndexedArrayProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked" value="on"
+ checked="checked">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueIndexedMap">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on" checked="checked">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueIndexedMapProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on" checked="checked">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueIndexedEnumeration">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on" checked="checked">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[1].checked" value="on" checked="checked">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueIndexedEnumerationProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on" checked="checked">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[1].checked" value="on" checked="checked">
-
- </bean:define>
-</logic:equal>
-
-
-
-<%
-String expected = "";
-String compareTo = "";
-
-if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- 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();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked" value="on"
+ checked="checked">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueIndexedMapProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked" value="on"
+ checked="checked">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueIndexedEnumeration">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked" value="on"
+ checked="checked">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[1].checked" value="on"
+ checked="checked">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanTrueIndexedEnumerationProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked" value="on"
+ checked="checked">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[1].checked" value="on"
+ checked="checked">
+
+ </bean:define>
+</logic:equal>
+
+
+<%
+ String expected = "";
+ String compareTo = "";
+
+ if (pageContext.getAttribute("EXPECTED_RESULTS") == null) {
+ 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();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag3.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag3.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag3.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag3.jsp Fri Feb 10 13:08:44 2006
@@ -1,247 +1,275 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
+<%@ page import="junit.framework.Assert" %>
<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalse">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseAccesskey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" accesskey="a"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" accesskey="a" value="on">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" accesskey="a"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" accesskey="a" value="on">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseAlt">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" alt="Testing alt attribute"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" alt="Testing alt attribute">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" alt="Testing alt attribute"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ alt="Testing alt attribute">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseAltKey1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseAltKey2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="no.such.key"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseAltKey1_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" alt="Message D'Essai">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseAltKey2_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" altKey="no.such.key"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseDisabled_True">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" disabled="true"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" disabled="disabled">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseDisabled_False1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" disabled="false"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseDisabled_False2">
- <!-- This was changed recently by overwhelming consensus. The prior functionality
- was very counter-intuitive. It used to be that putting disabled="false"
- was the same as putting disabled="true". Craig sited the confusion is due
- to the HTML spec.
- -->
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" disabled="anything but true"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="no.such.key"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseAltKey1_fr">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ alt="Message D'Essai">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseAltKey2_fr">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" altKey="no.such.key"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseDisabled_True">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" disabled="true"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on" disabled="disabled">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseDisabled_False1">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" disabled="false"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseDisabled_False2">
+ <!-- This was changed recently by overwhelming consensus. The prior
+ functionality
+ was very counter-intuitive. It used to be that putting disabled="false"
+ was the same as putting disabled="true". Craig sited the confusion is due
+ to the HTML spec.
+ -->
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" disabled="anything but true"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnblur">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onblur="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onblur="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onblur="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onblur="Put script here">
+ </bean:define>
</logic:equal>
-
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnchange">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onchange="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onchange="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onchange="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onchange="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onclick="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onclick="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onclick="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOndblclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" ondblclick="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" ondblclick="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseOndblclick">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" ondblclick="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ ondblclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnfocus">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onfocus="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onfocus="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onfocus="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onfocus="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnkeydown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onkeydown="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onkeydown="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onkeydown="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onkeydown="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnkeypress">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onkeypress="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onkeypress="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseOnkeypress">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onkeypress="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onkeypress="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnkeyup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onkeyup="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onkeyup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onkeyup="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onkeyup="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnmousedown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmousedown="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onmousedown="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseOnmousedown">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmousedown="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onmousedown="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnmousemove">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmousemove="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onmousemove="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseOnmousemove">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmousemove="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onmousemove="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnmouseout">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmouseout="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onmouseout="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseOnmouseout">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmouseout="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onmouseout="Put script here">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnmouseover">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmouseover="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onmouseover="Put script here">
- </bean:define>
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseOnmouseover">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmouseover="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onmouseover="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseOnmouseup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" onmouseup="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" onmouseup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" onmouseup="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ onmouseup="Put script here">
+ </bean:define>
</logic:equal>
-<%
-String expected = "";
-String compareTo = "";
-
-if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- 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();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
+<%
+ String expected = "";
+ String compareTo = "";
+
+ if (pageContext.getAttribute("EXPECTED_RESULTS") == null) {
+ 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();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag4.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag4.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag4.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestCheckboxTag4.jsp Fri Feb 10 13:08:44 2006
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@page import="org.apache.struts.Globals"%>
-<%@page import="org.apache.struts.action.ActionMessage"%>
-<%@page import="org.apache.struts.action.ActionMessages"%>
+<%@ page import="junit.framework.Assert" %>
+<%@ page import="org.apache.struts.Globals" %>
+<%@ page import="org.apache.struts.action.ActionMessage" %>
+<%@ page import="org.apache.struts.action.ActionMessages" %>
<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
@@ -10,226 +10,264 @@
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseStyle">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("checked",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute("ALT_ERROR_KEY", errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" style="Put something here" errorStyle="some error style" errorKey="ALT_ERROR_KEY"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" style="some error style">
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseStyleClass">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("checked",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute(Globals.ERROR_KEY, errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" styleClass="Put something here" errorStyleClass="some error class style"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" class="some error class style">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("checked",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute("ALT_ERROR_KEY", errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" style="Put something here"
+ errorStyle="some error style"
+ errorKey="ALT_ERROR_KEY"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ style="some error style">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseStyleClass">
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("checked",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute(Globals.ERROR_KEY, errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" styleClass="Put something here"
+ errorStyleClass="some error class style"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ class="some error class style">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseStyleId">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("checked",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute(Globals.ERROR_KEY, errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" styleId="Put something here" errorStyleId="some error style id"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" id="some error style id">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("checked",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute(Globals.ERROR_KEY, errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" styleId="Put something here"
+ errorStyleId="some error style id"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ id="some error style id">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseTabindex">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" tabindex="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" tabindex="Put something here" value="on">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" tabindex="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" tabindex="Put something here"
+ value="on">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseTitle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" title="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" title="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" title="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ title="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseTitleKey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" titleKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" title="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" titleKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ title="Testing Message">
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseTitleKey_fr">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" titleKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on"
+ title="Message D'Essai">
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseTitleKey_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" titleKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on" title="Message D'Essai">
- </bean:define>
+<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseValue">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked" value="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="Put something here">
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseBodyContent">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked">Checkbox Value Here</html:checkbox>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">Checkbox Value Here
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseBodyContentMessageKey">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked">
+ <bean:message key="default.bundle.message"/>
+ </html:checkbox>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">Testing Message
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseBodyContentMessageKey_fr">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:checkbox property="checked">
+ <bean:message key="default.bundle.message"/>
+ </html:checkbox>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="checkbox" name="checked" value="on">Message D'Essai
+ </bean:define>
+</logic:equal>
+
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseIndexedArray">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked"
+ value="on">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseIndexedArrayProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked"
+ value="on">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseIndexedMap">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked"
+ value="on">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseIndexedMapProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked"
+ value="on">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseIndexedEnumeration">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked"
+ value="on">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[1].checked"
+ value="on">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testCheckboxPropertybooleanFalseIndexedEnumerationProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:checkbox property="checked" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[0].checked"
+ value="on">
+
+ <input type="checkbox"
+ name="org.apache.struts.taglib.html.BEAN[1].checked"
+ value="on">
+
+ </bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseValue">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked" value ="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="Put something here">
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseBodyContent">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked">Checkbox Value Here</html:checkbox>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">Checkbox Value Here
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseBodyContentMessageKey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked">
- <bean:message key="default.bundle.message"/>
- </html:checkbox>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">Testing Message
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseBodyContentMessageKey_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:checkbox property="checked">
- <bean:message key="default.bundle.message"/>
- </html:checkbox>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="checkbox" name="checked" value="on">Message D'Essai
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseIndexedArray">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseIndexedArrayProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseIndexedMap">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseIndexedMapProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseIndexedEnumeration">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[1].checked" value="on">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testCheckboxPropertybooleanFalseIndexedEnumerationProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:checkbox property="checked" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[0].checked" value="on">
-
- <input type="checkbox" name="org.apache.struts.taglib.html.BEAN[1].checked" value="on">
-
- </bean:define>
-</logic:equal>
-
-
-
-<%
-String expected = "";
-String compareTo = "";
-
-if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- 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();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
-Assert.assertEquals(expected, compareTo);
+<%
+ String expected = "";
+ String compareTo = "";
+
+ if (pageContext.getAttribute("EXPECTED_RESULTS") == null) {
+ 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();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
+
+ Assert.assertEquals(expected, compareTo);
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org