Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,240 +1,261 @@
<%@ 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="testPasswordProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAccesskey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" accesskey="a"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" accesskey="a" value="Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" accesskey="a"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" accesskey="a" value="Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAlt">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" alt="Testing alt attribute"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" alt="Testing alt attribute">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" alt="Testing alt attribute"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ alt="Testing alt attribute">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAltKey1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" altKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" altKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAltKey2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" altKey="no.such.key"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" altKey="no.such.key"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAltKey3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" altKey="alternate.bundle.message" bundle="alternate"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" altKey="alternate.bundle.message"
+ bundle="alternate"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAltKey1_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" altKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" alt="Message D'Essai">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" altKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ alt="Message D'Essai">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyAltKey2_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" altKey="no.such.key"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" altKey="no.such.key"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyDisabled">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" disabled="true"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" disabled="disabled">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" disabled="true"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ disabled="disabled">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyMaxlength">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" maxlength="10"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" maxlength="10" value="Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" maxlength="10"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" maxlength="10"
+ value="Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnblur">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onblur="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onblur="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onblur="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onblur="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnchange">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onchange="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onchange="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onchange="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onchange="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onclick="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onclick="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOndblclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" ondblclick="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" ondblclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" ondblclick="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ ondblclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnfocus">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onfocus="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onfocus="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onfocus="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onfocus="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnkeydown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onkeydown="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onkeydown="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onkeydown="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onkeydown="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnkeypress">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onkeypress="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onkeypress="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onkeypress="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onkeypress="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnkeyup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onkeyup="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onkeyup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onkeyup="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onkeyup="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnmousedown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onmousedown="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onmousedown="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onmousedown="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onmousedown="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnmousemove">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onmousemove="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onmousemove="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onmousemove="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onmousemove="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnmouseout">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onmouseout="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onmouseout="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onmouseout="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onmouseout="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnmouseover">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onmouseover="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onmouseover="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onmouseover="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ onmouseover="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyOnmouseup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" onmouseup="Put script here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" onmouseup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" onmouseup="Put script here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ 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("EXPECTED_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("TEST_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("EXPECTED_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("TEST_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestPasswordTag2.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,227 +10,261 @@
<logic:equal name="runTest" value="testPasswordPropertyReadonly">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" readonly="true"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" readonly="readonly">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" readonly="true"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ readonly="readonly">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertySize">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" size="10"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" size="10" value="Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" size="10"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" size="10" value="Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyStyle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" style="Put something here" errorStyle="some error style"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" style="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" style="Put something here"
+ errorStyle="some error style"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ style="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyErrorStyle">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("string",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute("ALT_ERROR_KEY", errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" style="Put something here" errorStyle="some error style" errorKey="ALT_ERROR_KEY"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" style="some error style">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("string",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute("ALT_ERROR_KEY", errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" style="Put something here"
+ errorStyle="some error style"
+ errorKey="ALT_ERROR_KEY"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ style="some error style">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyStyleClass">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" styleClass="Put something here" errorStyleClass="some error style class"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" class="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" styleClass="Put something here"
+ errorStyleClass="some error style class"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ class="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyErrorStyleClass">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("string",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute(Globals.ERROR_KEY, errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" styleClass="Put something here" errorStyleClass="some error style class"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" class="some error style class">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("string",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute(Globals.ERROR_KEY, errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" styleClass="Put something here"
+ errorStyleClass="some error style class"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ class="some error style class">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyStyleId">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" styleId="Put something here" errorStyleId="some error style id"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" id="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" styleId="Put something here"
+ errorStyleId="some error style id"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ id="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyErrorStyleId">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("string",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute(Globals.ERROR_KEY, errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" styleId="Put something here" errorStyleId="some error style id"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" id="some error style id">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("string",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute(Globals.ERROR_KEY, errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" styleId="Put something here"
+ errorStyleId="some error style id"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ id="some error style id">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyTitle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" title="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" title="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" title="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ title="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyTitleKey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" titleKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" title="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" titleKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ title="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyTitleKey_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" titleKey="default.bundle.message"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Test Value" title="Message D'Essai">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" titleKey="default.bundle.message"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Test Value"
+ title="Message D'Essai">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyValue">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:password property="string" value ="Put something here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="password" name="string" value="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:password property="string" value="Put something here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="password" name="string" value="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyIndexedArray">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:password property="string" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:password property="string" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyIndexedArrayProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:password property="string" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:password property="string" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyIndexedMap">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:password property="string" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:password property="string" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyIndexedMapProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:password property="string" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:password property="string" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testPasswordPropertyIndexedEnumeration">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:password property="string" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[1].string" value="Test Value">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testPasswordPropertyIndexedEnumerationProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:password property="string" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value">
-
- <input type="password" name="org.apache.struts.taglib.html.BEAN[1].string" value="Test Value">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:password property="string" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[1].string"
+ value="Test Value">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testPasswordPropertyIndexedEnumerationProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:password property="string" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value">
+
+ <input type="password"
+ name="org.apache.struts.taglib.html.BEAN[1].string"
+ value="Test Value">
+
+ </bean:define>
</logic:equal>
+<%
+ String expected = "";
+ String 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("EXPECTED_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("TEST_RESULTS").toString();
-}
+ 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("EXPECTED_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("TEST_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,231 +1,273 @@
<%@ 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="testRadioProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" value="Test Value"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Test Value" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" value="Test Value"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Test Value"
+ checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAccesskey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" accesskey="a" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" accesskey="a" value="Put Some Value Here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" accesskey="a"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" accesskey="a"
+ value="Put Some Value Here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAlt">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" alt="Testing alt attribute" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" alt="Testing alt attribute">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" alt="Testing alt attribute"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ alt="Testing alt attribute">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAltKey1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" altKey="default.bundle.message" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" altKey="default.bundle.message"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAltKey2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" altKey="no.such.key" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" altKey="no.such.key"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAltKey3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" altKey="alternate.bundle.message" value="Put Some Value Here" bundle="alternate"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" alt="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" altKey="alternate.bundle.message"
+ value="Put Some Value Here" bundle="alternate"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ alt="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAltKey1_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" altKey="default.bundle.message" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" alt="Message D'Essai">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" altKey="default.bundle.message"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ alt="Message D'Essai">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyAltKey2_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" altKey="no.such.key" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" altKey="no.such.key"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyDisabled">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" disabled="true" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" disabled="disabled">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" disabled="true"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ disabled="disabled">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnblur">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onblur="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onblur="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onblur="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onblur="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnchange">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onchange="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onchange="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onchange="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onchange="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onclick="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onclick="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOndblclick">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" ondblclick="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" ondblclick="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" ondblclick="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ ondblclick="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnfocus">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onfocus="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onfocus="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onfocus="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onfocus="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnkeydown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onkeydown="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onkeydown="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onkeydown="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onkeydown="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnkeypress">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onkeypress="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onkeypress="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onkeypress="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onkeypress="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnkeyup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onkeyup="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onkeyup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onkeyup="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onkeyup="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnmousedown">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onmousedown="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onmousedown="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onmousedown="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onmousedown="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnmousemove">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onmousemove="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onmousemove="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onmousemove="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onmousemove="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnmouseout">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onmouseout="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onmouseout="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onmouseout="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onmouseout="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnmouseover">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onmouseover="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onmouseover="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onmouseover="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ onmouseover="Put script here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyOnmouseup">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" onmouseup="Put script here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" onmouseup="Put script here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" onmouseup="Put script here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ 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("EXPECTED_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("TEST_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("EXPECTED_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("TEST_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestRadioTag2.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,218 +10,260 @@
<logic:equal name="runTest" value="testRadioPropertyStyle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" style="Put something here" errorStyle="some error style" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" style="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" style="Put something here"
+ errorStyle="some error style"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ style="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyErrorStyle">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("string",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute("ALT_ERROR_KEY", errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" style="Put something here" errorStyle="some error style" errorKey="ALT_ERROR_KEY" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" style="some error style">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("string",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute("ALT_ERROR_KEY", errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" style="Put something here"
+ errorStyle="some error style" errorKey="ALT_ERROR_KEY"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ style="some error style">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyStyleClass">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" styleClass="Put something here" errorStyleClass="some error style class" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" class="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" styleClass="Put something here"
+ errorStyleClass="some error style class"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ class="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyErrorStyleClass">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("string",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute(Globals.ERROR_KEY, errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" styleClass="Put something here" errorStyleClass="some error style class" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" class="some error style class">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("string",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute(Globals.ERROR_KEY, errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" styleClass="Put something here"
+ errorStyleClass="some error style class"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ class="some error style class">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyStyleId">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" styleId="Put something here" errorStyleId="some error style id" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" id="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" styleId="Put something here"
+ errorStyleId="some error style id"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ id="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyErrorStyleId">
-<%
- ActionMessages errors = new ActionMessages();
- errors.add("string",
- new ActionMessage("default.testing.errors.tag"));
- request.setAttribute(Globals.ERROR_KEY, errors);
-%>
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" styleId="Put something here" errorStyleId="some error style id" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" id="some error style id">
- </bean:define>
+ <%
+ ActionMessages errors = new ActionMessages();
+ errors.add("string",
+ new ActionMessage("default.testing.errors.tag"));
+ request.setAttribute(Globals.ERROR_KEY, errors);
+ %>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" styleId="Put something here"
+ errorStyleId="some error style id"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ id="some error style id">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyTitle">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" title="Put something here" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" title="Put something here">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" title="Put something here"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ title="Put something here">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyTitleKey">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" titleKey="default.bundle.message" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" title="Testing Message">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" titleKey="default.bundle.message"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ title="Testing Message">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyTitleKey_fr">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" titleKey="default.bundle.message" value="Put Some Value Here"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Put Some Value Here" title="Message D'Essai">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" titleKey="default.bundle.message"
+ value="Put Some Value Here"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Put Some Value Here"
+ title="Message D'Essai">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyValueMatch">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" value ="Test Value"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Test Value" checked="checked">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" value="Test Value"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Test Value"
+ checked="checked">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyValueNotMatch">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:radio property="string" value ="Not Test Value"/>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="radio" name="string" value="Not Test Value">
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:radio property="string" value="Not Test Value"/>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="radio" name="string" value="Not Test Value">
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyIndexedArray">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:radio property="string" indexed="true" value="Test Value"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value" checked="checked">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:radio property="string" indexed="true" value="Test Value"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value" checked="checked">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyIndexedArrayProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:radio property="string" indexed="true" value ="Test Value"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value" checked="checked">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:radio property="string" indexed="true" value="Test Value"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value" checked="checked">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyIndexedMap">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:radio property="string" indexed="true" value ="Test Value"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value" checked="checked">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:radio property="string" indexed="true" value="Test Value"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value" checked="checked">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyIndexedMapProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:radio property="string" indexed="true" value ="Test Value"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value" checked="checked">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:radio property="string" indexed="true" value="Test Value"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value" checked="checked">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testRadioPropertyIndexedEnumeration">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:radio property="string" indexed="true" value ="Test Value"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value" checked="checked">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[1].string" value="Test Value" checked="checked">
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testRadioPropertyIndexedEnumerationProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:radio property="string" indexed="true" value ="Test Value"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[0].string" value="Test Value" checked="checked">
-
- <input type="radio" name="org.apache.struts.taglib.html.BEAN[1].string" value="Test Value" checked="checked">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:radio property="string" indexed="true" value="Test Value"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value" checked="checked">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[1].string"
+ value="Test Value" checked="checked">
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testRadioPropertyIndexedEnumerationProperty">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:radio property="string" indexed="true" value="Test Value"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[0].string"
+ value="Test Value" checked="checked">
+
+ <input type="radio"
+ name="org.apache.struts.taglib.html.BEAN[1].string"
+ value="Test Value" checked="checked">
+
+ </bean:define>
</logic:equal>
+<%
+ String expected = "";
+ String 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("EXPECTED_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("TEST_RESULTS").toString();
-}
+ 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("EXPECTED_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("TEST_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
|