struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r376852 [19/20] - /struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/
Date Fri, 10 Feb 2006 21:08:50 GMT
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,256 +1,276 @@
 <%@ 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="testResetProperty">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAccesskey">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" accesskey="a"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" accesskey="a" value="Reset">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" accesskey="a"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" accesskey="a" value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAlt">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" alt="Testing alt attribute"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" alt="Testing alt attribute">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" alt="Testing alt attribute"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               alt="Testing alt attribute">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAltKey1">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" altKey="default.bundle.message"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" alt="Testing Message">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" altKey="default.bundle.message"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               alt="Testing Message">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAltKey2">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" altKey="no.such.key"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" altKey="no.such.key"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAltKey3">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" altKey="alternate.bundle.message" bundle="alternate"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" alt="Testing Message">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" altKey="alternate.bundle.message"
+                    bundle="alternate"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               alt="Testing Message">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAltKey1_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" altKey="default.bundle.message"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" alt="Message D'Essai">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" altKey="default.bundle.message"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               alt="Message D'Essai">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyAltKey2_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" altKey="no.such.key"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" altKey="no.such.key"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyDisabled_True">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" disabled="true"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" disabled="disabled">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" disabled="true"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               disabled="disabled">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyDisabled_False1">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" disabled="false"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" disabled="false"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyDisabled_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:reset property="propertyName" disabled="anything but true"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset">
-	</bean:define>
+    <!-- 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:reset property="propertyName" disabled="anything but true"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyOnblur">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onblur="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onblur="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onblur="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onblur="Put script here">
+    </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testResetPropertyOnchange">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onchange="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onchange="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onchange="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onchange="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnclick">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onclick="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onclick="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onclick="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onclick="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOndblclick">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" ondblclick="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" ondblclick="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" ondblclick="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               ondblclick="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnfocus">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onfocus="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onfocus="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onfocus="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onfocus="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnkeydown">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onkeydown="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onkeydown="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onkeydown="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onkeydown="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnkeypress">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onkeypress="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onkeypress="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onkeypress="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onkeypress="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnkeyup">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onkeyup="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onkeyup="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onkeyup="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onkeyup="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnmousedown">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onmousedown="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onmousedown="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onmousedown="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onmousedown="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnmousemove">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onmousemove="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onmousemove="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onmousemove="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onmousemove="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnmouseout">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onmouseout="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onmouseout="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onmouseout="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onmouseout="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnmouseover">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onmouseover="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onmouseover="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onmouseover="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               onmouseover="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyOnmouseup">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" onmouseup="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" onmouseup="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" onmouseup="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               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/TestResetTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestResetTag2.jsp Fri Feb 10 13:08:44 2006
@@ -1,128 +1,138 @@
 <%@ 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="testResetPropertyStyle">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" style="Put something here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" style="Put something here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" style="Put something here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               style="Put something here">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyStyleClass">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" styleClass="Put something here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" class="Put something here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" styleClass="Put something here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               class="Put something here">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyStyleId">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" styleId="Put something here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" id="Put something here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" styleId="Put something here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               id="Put something here">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyTabindex">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" tabindex="Put something here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" tabindex="Put something here" value="Reset">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" tabindex="Put something here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" tabindex="Put something here"
+               value="Reset">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyTitle">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" title="Put something here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" title="Put something here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" title="Put something here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               title="Put something here">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyTitleKey">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" titleKey="default.bundle.message"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" title="Testing Message">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName"
+                    titleKey="default.bundle.message"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               title="Testing Message">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyTitleKey_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" titleKey="default.bundle.message"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset" title="Message D'Essai">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName"
+                    titleKey="default.bundle.message"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset"
+               title="Message D'Essai">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testResetPropertyValue">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName" value ="Put something here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Put something here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName" value="Put something here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Put something here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyBodyContent">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName">Reset Value Here</html:reset>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Reset Value Here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName">Reset Value Here</html:reset>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Reset Value Here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyBodyContentMessageKey">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName">
-			<bean:message key="default.bundle.message"/>
-		</html:reset>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Testing Message">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName">
+            <bean:message key="default.bundle.message"/>
+        </html:reset>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Testing Message">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testResetPropertyBodyContentMessageKey_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:reset property="propertyName">
-			<bean:message key="default.bundle.message"/>
-		</html:reset>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="reset" name="propertyName" value="Message D'Essai">
-	</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();
-}
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:reset property="propertyName">
+            <bean:message key="default.bundle.message"/>
+        </html:reset>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="reset" name="propertyName" value="Message D'Essai">
+    </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();
+    }
 
-Assert.assertEquals(expected, compareTo);
+    Assert.assertEquals(expected, compareTo);
 %>

Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,222 +1,257 @@
 <%@ 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="testSelectPropertyAlt">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" alt="Testing alt attribute">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" alt="Testing alt attribute">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" alt="Testing alt attribute">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" alt="Testing alt attribute">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyAltKey1">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" altKey="default.bundle.message">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" alt="Testing Message">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" altKey="default.bundle.message">Some
+            Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" alt="Testing Message">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyAltKey2">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" altKey="no.such.key">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" altKey="no.such.key">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyAltKey3">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" altKey="alternate.bundle.message" bundle="alternate">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" alt="Testing Message">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" altKey="alternate.bundle.message"
+                     bundle="alternate">Some Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" alt="Testing Message">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyAltKey1_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" altKey="default.bundle.message">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" alt="Message D'Essai">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" altKey="default.bundle.message">Some
+            Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" alt="Message D'Essai">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyAltKey2_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" altKey="no.such.key">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" altKey="no.such.key">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyDisabled">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" disabled="true">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" disabled="disabled">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" disabled="true">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" disabled="disabled">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyMultiple">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" multiple="true">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" multiple="multiple">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" multiple="true">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" multiple="multiple">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyOnblur">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onblur="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onblur="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onblur="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onblur="Put script here">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyOnchange">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onchange="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onchange="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onchange="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onchange="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnclick">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onclick="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onclick="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onclick="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onclick="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOndblclick">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" ondblclick="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" ondblclick="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" ondblclick="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" ondblclick="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnfocus">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onfocus="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onfocus="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onfocus="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onfocus="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnkeydown">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onkeydown="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onkeydown="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onkeydown="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onkeydown="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnkeypress">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onkeypress="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onkeypress="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onkeypress="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onkeypress="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnkeyup">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onkeyup="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onkeyup="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onkeyup="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onkeyup="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnmousedown">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onmousedown="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onmousedown="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onmousedown="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onmousedown="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnmousemove">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onmousemove="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onmousemove="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onmousemove="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onmousemove="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnmouseout">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onmouseout="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onmouseout="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onmouseout="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onmouseout="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnmouseover">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onmouseover="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onmouseover="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onmouseover="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onmouseover="Put script here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSelectPropertyOnmouseup">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select property="string" onmouseup="Put script here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" onmouseup="Put script here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" onmouseup="Put script here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" onmouseup="Put script here">Some Body
+            Here</select>
+    </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/TestSelectTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSelectTag2.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,262 @@
 
 
 <logic:equal name="runTest" value="testSelectPropertyStyle">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" style="Put something here" errorStyle="some error style" >Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" style="Put something here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" style="Put something here"
+                     errorStyle="some error style">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" style="Put something here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyErrorStyle">
-<%
-    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:select  property="string" style="Put something here" errorStyle="some error style" errorKey="ALT_ERROR_KEY">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" style="some error style">Some Body Here</select>
-	</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:select property="string" style="Put something here"
+                     errorStyle="some error style" errorKey="ALT_ERROR_KEY">
+            Some Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" style="some error style">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyStyleClass">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" styleClass="Put something here" errorStyleClass="some error style class" >Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" class="Put something here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" styleClass="Put something here"
+                     errorStyleClass="some error style class">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" class="Put something here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyErrorStyleClass">
-<%
-    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:select  property="string" styleClass="Put something here" errorStyleClass="some error style class" >Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" class="some error style class">Some Body Here</select>
-	</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:select property="string" styleClass="Put something here"
+                     errorStyleClass="some error style class">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" class="some error style class">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyStyleId">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" styleId="Put something here" errorStyleId="some error style id" >Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" id="Put something here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" styleId="Put something here"
+                     errorStyleId="some error style id">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" id="Put something here">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyErrorStyleId">
-<%
-    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:select  property="string" styleId="Put something here" errorStyleId="some error style id" >Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" id="some error style id">Some Body Here</select>
-	</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:select property="string" styleId="Put something here"
+                     errorStyleId="some error style id">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" id="some error style id">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyTitle">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" title="Put something here">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" title="Put something here">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" title="Put something here">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" title="Put something here">Some Body
+            Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyTitleKey">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" titleKey="default.bundle.message">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" title="Testing Message">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" titleKey="default.bundle.message">Some
+            Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" title="Testing Message">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyTitleKey_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" titleKey="default.bundle.message">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" title="Message D'Essai">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" titleKey="default.bundle.message">Some
+            Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" title="Message D'Essai">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectTabindex">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" tabindex="8">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" tabindex="8">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" tabindex="8">Some Body
+            Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" tabindex="8">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectSize">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string" size="5">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string" size="5">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string" size="5">Some Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string" size="5">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyValue">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:select  property="string">Some Body Here</html:select>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<select name="string">Some Body Here</select>
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:select property="string">Some Body Here</html:select>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <select name="string">Some Body Here</select>
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyIndexedArray">
-	<bean:define id="TEST_RESULTS" toScope="page">
-	  <logic:iterate id="indivItem" name="lst">
-		<html:select  property="string" indexed="true">Some Body Here</html:select>
-	  </logic:iterate>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-	
-		<select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body Here</select>
-		
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <logic:iterate id="indivItem" name="lst">
+            <html:select property="string" indexed="true">Some Body
+                Here</html:select>
+        </logic:iterate>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+        <select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body
+            Here</select>
+
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyIndexedArrayProperty">
-	<bean:define id="TEST_RESULTS" toScope="page">
-	  <logic:iterate id="indivItem" name="lst" property="list">
-		<html:select property="string" indexed="true">Some Body Here</html:select>
-	  </logic:iterate>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-	
-		<select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body Here</select>
-		
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <logic:iterate id="indivItem" name="lst" property="list">
+            <html:select property="string" indexed="true">Some Body
+                Here</html:select>
+        </logic:iterate>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+        <select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body
+            Here</select>
+
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyIndexedMap">
-	<bean:define id="TEST_RESULTS" toScope="page">
-	  <logic:iterate id="indivItem" name="lst">
-		<html:select  property="string" indexed="true">Some Body Here</html:select>
-	  </logic:iterate>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-	
-		<select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body Here</select>
-		
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <logic:iterate id="indivItem" name="lst">
+            <html:select property="string" indexed="true">Some Body
+                Here</html:select>
+        </logic:iterate>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+        <select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body
+            Here</select>
+
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyIndexedMapProperty">
-	<bean:define id="TEST_RESULTS" toScope="page">
-	  <logic:iterate id="indivItem" name="lst" property="map">
-		<html:select  property="string" indexed="true">Some Body Here</html:select>
-	  </logic:iterate>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-	
-		<select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body Here</select>
-		
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <logic:iterate id="indivItem" name="lst" property="map">
+            <html:select property="string" indexed="true">Some Body
+                Here</html:select>
+        </logic:iterate>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+        <select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body
+            Here</select>
+
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSelectPropertyIndexedEnumeration">
-	<bean:define id="TEST_RESULTS" toScope="page">
-	<logic:iterate id="indivItem" name="lst">
-		<html:select  property="string" indexed="true">Some Body Here</html:select>
-	</logic:iterate>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-	
-		<select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body Here</select>
-	
-		<select name="org.apache.struts.taglib.html.BEAN[1].string">Some Body Here</select>
-	
-	</bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testSelectPropertyIndexedEnumerationProperty">
-	<bean:define id="TEST_RESULTS" toScope="page">
-	<logic:iterate id="indivItem" name="lst" property="enumeration">
-		<html:select  property="string" indexed="true">Some Body Here</html:select>
-	</logic:iterate>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-	
-		<select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body Here</select>
-	
-		<select name="org.apache.struts.taglib.html.BEAN[1].string">Some Body Here</select>
-	
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <logic:iterate id="indivItem" name="lst">
+            <html:select property="string" indexed="true">Some Body
+                Here</html:select>
+        </logic:iterate>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+        <select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body
+            Here</select>
+
+        <select name="org.apache.struts.taglib.html.BEAN[1].string">Some Body
+            Here</select>
+
+    </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+             value="testSelectPropertyIndexedEnumerationProperty">
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <logic:iterate id="indivItem" name="lst" property="enumeration">
+            <html:select property="string" indexed="true">Some Body
+                Here</html:select>
+        </logic:iterate>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+        <select name="org.apache.struts.taglib.html.BEAN[0].string">Some Body
+            Here</select>
+
+        <select name="org.apache.struts.taglib.html.BEAN[1].string">Some Body
+            Here</select>
+
+    </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/TestSubmitTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSubmitTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSubmitTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestSubmitTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,256 +1,276 @@
 <%@ 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="testSubmitProperty">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAccesskey">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" accesskey="a"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" accesskey="a" value="Submit">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" accesskey="a"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" accesskey="a" value="Submit">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAlt">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" alt="Testing alt attribute"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" alt="Testing alt attribute">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" alt="Testing alt attribute"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               alt="Testing alt attribute">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAltKey1">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" altKey="default.bundle.message"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" alt="Testing Message">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" altKey="default.bundle.message"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               alt="Testing Message">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAltKey2">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" altKey="no.such.key"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" altKey="no.such.key"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAltKey3">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" altKey="alternate.bundle.message"  bundle="alternate"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" alt="Testing Message">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" altKey="alternate.bundle.message"
+                     bundle="alternate"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               alt="Testing Message">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAltKey1_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" altKey="default.bundle.message"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" alt="Message D'Essai">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" altKey="default.bundle.message"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               alt="Message D'Essai">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyAltKey2_fr">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" altKey="no.such.key"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" altKey="no.such.key"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyDisabled_True">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" disabled="true"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" disabled="disabled">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" disabled="true"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               disabled="disabled">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyDisabled_False1">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" disabled="false"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" disabled="false"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyDisabled_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:submit property="propertyName" disabled="anything but true"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit">
-	</bean:define>
+    <!-- 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:submit property="propertyName" disabled="anything but true"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit">
+    </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testSubmitPropertyOnblur">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onblur="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onblur="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onblur="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onblur="Put script here">
+    </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testSubmitPropertyOnchange">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onchange="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onchange="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onchange="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onchange="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnclick">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onclick="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onclick="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onclick="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onclick="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOndblclick">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" ondblclick="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" ondblclick="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" ondblclick="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               ondblclick="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnfocus">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onfocus="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onfocus="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onfocus="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onfocus="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnkeydown">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onkeydown="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onkeydown="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onkeydown="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onkeydown="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnkeypress">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onkeypress="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onkeypress="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onkeypress="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onkeypress="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnkeyup">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onkeyup="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onkeyup="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onkeyup="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onkeyup="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnmousedown">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onmousedown="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onmousedown="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onmousedown="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onmousedown="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnmousemove">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onmousemove="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onmousemove="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onmousemove="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onmousemove="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnmouseout">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onmouseout="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onmouseout="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onmouseout="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onmouseout="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnmouseover">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onmouseover="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onmouseover="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onmouseover="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               onmouseover="Put script here">
+    </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testSubmitPropertyOnmouseup">
-	<bean:define id="TEST_RESULTS" toScope="page">
-		<html:submit property="propertyName" onmouseup="Put script here"/>
-	</bean:define>
-	<bean:define id="EXPECTED_RESULTS" toScope="page">
-		<input type="submit" name="propertyName" value="Submit" onmouseup="Put script here">
-	</bean:define>
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:submit property="propertyName" onmouseup="Put script here"/>
+    </bean:define>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <input type="submit" name="propertyName" value="Submit"
+               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);
 %>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message